Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-21 23:47:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add mosquitto_broker_publish_copy()

Browse Source 
Rename mosquitto_plugin_publish() to mosquitto_broker_publish().

These two functions achieve the same thing. *_publish() publishes the payload and frees it later. *_publish_copy() takes a copy of the payload, so the plugin still owns the memory it passed to the function.
This commit is contained in:
Roger A. Light
2020-08-12 15:18:17 +01:00
parent de5a820fe2
commit d6f4f4e0bc
4 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin.c
+29 -13
View File
@@ -111,10 +111,10 @@ const char *mosquitto_client_username(const struct mosquitto *context)
}
int mosquitto_plugin_publish(
int mosquitto_broker_publish(
const char *topic,
int payloadlen,
const void *payload,
void *payload,
int qos,
bool retain,
mosquitto_property *properties)
@@ -128,18 +128,8 @@ int mosquitto_plugin_publish(
msg->next = NULL;
msg->prev = NULL;
msg->topic = mosquitto__strdup(topic);
if(msg->topic == NULL){
mosquitto__free(msg);
return MOSQ_ERR_NOMEM;
}
msg->payloadlen = payloadlen;
msg->payload = mosquitto__calloc(1, payloadlen+1);
if(msg->payload == NULL){
mosquitto__free(msg->topic);
mosquitto__free(msg);
return MOSQ_ERR_NOMEM;
}
memcpy(msg->payload, payload, payloadlen);
msg->payload = payload;
msg->qos = qos;
msg->retain = retain;
msg->properties = properties;
@@ -152,6 +142,32 @@ int mosquitto_plugin_publish(
}
int mosquitto_broker_publish_copy(
const char *topic,
int payloadlen,
const void *payload,
int qos,
bool retain,
mosquitto_property *properties)
{
void *payload_out;
payload_out = calloc(1, payloadlen+1);
if(payload_out == NULL){
return MOSQ_ERR_NOMEM;
}
memcpy(payload_out, payload, payloadlen);
return mosquitto_broker_publish(
topic,
payloadlen,
payload_out,
qos,
retain,
properties);
}
int mosquitto_set_username(struct mosquitto *client, const char *username)
{
char *u_dup;