diff options
Diffstat (limited to '')
| -rw-r--r-- | src/aclk/aclk_rx_msgs.c (renamed from aclk/aclk_rx_msgs.c) | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/aclk/aclk_rx_msgs.c b/src/aclk/aclk_rx_msgs.c index 0e91e28c0..60e421928 100644 --- a/aclk/aclk_rx_msgs.c +++ b/src/aclk/aclk_rx_msgs.c @@ -11,7 +11,6 @@ #include "schema-wrappers/proto_2_json.h" #define ACLK_V2_PAYLOAD_SEPARATOR "\x0D\x0A\x0D\x0A" -#define ACLK_CLOUD_REQ_V2_PREFIX "GET /" #define ACLK_V_COMPRESSION 2 @@ -100,13 +99,17 @@ static inline int aclk_v2_payload_get_query(const char *payload, char **query_ur { const char *start, *end; - // TODO better check of URL - if(strncmp(payload, ACLK_CLOUD_REQ_V2_PREFIX, strlen(ACLK_CLOUD_REQ_V2_PREFIX))) { + if(strncmp(payload, "GET /", 5) == 0 || strncmp(payload, "PUT /", 5) == 0) + start = payload + 4; + else if(strncmp(payload, "POST /", 6) == 0) + start = payload + 5; + else if(strncmp(payload, "DELETE /", 8) == 0) + start = payload + 7; + else { errno = 0; - netdata_log_error("Only accepting requests that start with \"%s\" from CLOUD.", ACLK_CLOUD_REQ_V2_PREFIX); + netdata_log_error("Only accepting requests that start with GET, POST, PUT, DELETE from CLOUD."); return 1; } - start = payload + 4; if(!(end = strstr(payload, HTTP_1_1 HTTP_ENDL))) { errno = 0; @@ -196,7 +199,7 @@ int aclk_handle_cloud_cmd_message(char *payload) // Originally we were expecting to have multiple types of 'cmd' message, // but after the new protocol was designed we will ever only have 'http' - if (strcmp(cloud_to_agent.type_id, "http")) { + if (strcmp(cloud_to_agent.type_id, "http") != 0) { error_report("Only 'http' cmd message is supported"); goto err_cleanup; } @@ -252,7 +255,7 @@ int create_node_instance_result(const char *msg, size_t msg_len) netdata_log_debug(D_ACLK, "CreateNodeInstanceResult: guid:%s nodeid:%s", res.machine_guid, res.node_id); - uuid_t host_id, node_id; + nd_uuid_t host_id, node_id; if (uuid_parse(res.machine_guid, host_id)) { netdata_log_error("Error parsing machine_guid provided by CreateNodeInstanceResult"); freez(res.machine_guid); |