GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-28 22:59:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add command field to MQTT request response data

Browse Source 
- Modify the test script of ft
- Fix parameter error in setting command
- Fix json_mqtt_t instance not released
This commit is contained in:
gc87
2022-02-14 10:13:31 +08:00
committed by Parker Liu
parent 97744161ec
commit ab3a12c4d5
9 changed files with 101 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser/neu_json_fn.c
+5 -3
View File
@@ -121,18 +121,20 @@ int neu_json_encode_setting_with_mqtt(uint32_t node_id, char *setting,
// the current implementation.
const char *fmt = "{\"node_id\": %u, \"function\": %d, \"uuid\": \"%s\", "
"\"command\":\"%s\", "
"%.*s, \"error\": 0}";
// plus 1 for '\0'
int size = 1 +
snprintf(NULL, 0, fmt, node_id, mqtt->function, mqtt->uuid, i, params);
snprintf(NULL, 0, fmt, node_id, mqtt->function, mqtt->uuid,
mqtt->command, i, params);
*result = calloc(size, sizeof(char));
if (NULL == *result) {
return -1;
}
snprintf(*result, size, fmt, node_id, mqtt->function, mqtt->uuid, i,
params);
snprintf(*result, size, fmt, node_id, mqtt->function, mqtt->uuid,
mqtt->command, i, params);
return 0;
}
src/parser/neu_json_mqtt.c
+20 -1
View File
@@ -41,6 +41,10 @@ int neu_json_decode_mqtt_req(char *buf, neu_json_mqtt_t **result)
{
.name = "function",
.t = NEU_JSON_INT,
},
{
.name = "command",
.t = NEU_JSON_STR,
} };
ret = neu_json_decode(buf, NEU_JSON_ELEM_SIZE(req_elems), req_elems);
if (ret != 0) {
@@ -49,6 +53,7 @@ int neu_json_decode_mqtt_req(char *buf, neu_json_mqtt_t **result)
req->uuid = req_elems[0].v.val_str;
req->function = req_elems[1].v.val_int;
req->command = req_elems[2].v.val_str;
*result = req;
return ret;
@@ -62,8 +67,17 @@ decode_fail:
void neu_json_decode_mqtt_req_free(neu_json_mqtt_t *req)
{
if (NULL == req) {
return;
}
free(req->uuid);
if (NULL != req->uuid) {
free(req->uuid);
}
if (NULL != req->command) {
free(req->command);
}
free(req);
}
@@ -82,6 +96,11 @@ int neu_json_encode_mqtt_resp(void *json_object, void *param)
.name = "function",
.t = NEU_JSON_INT,
.v.val_int = resp->function,
},
{
.name = "command",
.t = NEU_JSON_STR,
.v.val_str = resp->command,
} };
ret = neu_json_encode_field(json_object, resp_elems,
NEU_JSON_ELEM_SIZE(resp_elems));