Merge pull request #328 from afcidk/fix-warnings

cleanup: fix warnings in accelerator_mqtt

Author: jserv

README.md

@@ -132,7 +132,7 @@ $ make && bazel run //accelerator:push_docker --host_force_python=PY2
 MQTT connectivity is an optional feature allowing IoT endpoint devices to collaborate with `Tangle-Accelerator`.
 
 ```
-make MQTT && bazel run //accelerator_mqtt
+make MQTT && bazel run //accelerator:accelerator_mqtt
 ```
 
 Note you may need to set up the `MQTT_HOST` and `TOPIC_ROOT` in `config.h` to connect to a MQTT broker.

accelerator/config.c

@@ -131,7 +131,9 @@ status_t ta_config_default_init(ta_config_t* const info, iota_config_t* const ic
   iconf->milestone_depth = MILESTONE_DEPTH;
   iconf->mwm = MWM;
   iconf->seed = SEED;
-  iconf->mam_file_path = tempnam(MAM_FILE_DIR, MAM_FILE_PREFIX);
+  char mam_file_path[] = MAM_FILE_PREFIX;
+  mkstemp(mam_file_path);
+  iconf->mam_file_path = mam_file_path;
 
   ta_log_info("Initializing IRI connection\n");
   service->http.path = "/";

accelerator/config.h

@@ -46,8 +46,7 @@ extern "C" {
 #define SEED                                                                   \
   "AMRWQP9BUMJALJHBXUCHOD9HFFD9LGTGEAWMJWWXSDVOF9PI9YGJAPBQLQUOMNYEQCZPGCTHGV" \
   "NNAPGHA"
-#define MAM_FILE_DIR "/tmp"
-#define MAM_FILE_PREFIX "mam_bin_"
+#define MAM_FILE_PREFIX "/tmp/mam_bin_XXXXXX"
 
 /** @name Redis connection config */
 /** @{ */

connectivity/mqtt/duplex_callback.c

@@ -47,7 +47,7 @@ static status_t mqtt_request_handler(mosq_config_t *cfg, char *subscribe_topic,
   char *p;
   if (!strncmp(api_sub_topic, "address", 7)) {
     ret = api_generate_address(&ta_core.iconf, &ta_core.service, &json_result);
-  } else if (p = strstr(api_sub_topic, "tag")) {
+  } else if ((p = strstr(api_sub_topic, "tag"))) {
     if (!strncmp(p + 4, "hashes", 6)) {
       char tag[NUM_TRYTES_TAG + 1];
       mqtt_tag_req_deserialize(req, tag);
@@ -57,15 +57,15 @@ static status_t mqtt_request_handler(mosq_config_t *cfg, char *subscribe_topic,
       mqtt_tag_req_deserialize(req, tag);
       ret = api_find_transactions_obj_by_tag(&ta_core.service, tag, &json_result);
     }
-  } else if (p = strstr(api_sub_topic, "transaction")) {
+  } else if ((p = strstr(api_sub_topic, "transaction"))) {
     if (!strncmp(p + 12, "object", 6)) {
       char hash[NUM_TRYTES_HASH + 1];
       mqtt_transaction_hash_req_deserialize(req, hash);
       ret = api_find_transaction_object_single(&ta_core.service, hash, &json_result);
     } else if (!strncmp(p + 12, "send", 4)) {
       ret = api_send_transfer(&ta_core.iconf, &ta_core.service, req, &json_result);
     }
-  } else if (p = strstr(api_sub_topic, "tips")) {
+  } else if ((p = strstr(api_sub_topic, "tips"))) {
     if (!strncmp(p + 5, "all", 3)) {
       ret = api_get_tips(&ta_core.service, &json_result);
     } else if (!strncmp(p + 5, "pair", 4)) {
@@ -129,6 +129,10 @@ static void connect_callback_duplex_func(struct mosquitto *mosq, void *obj, int
 
 static void disconnect_callback_duplex_func(struct mosquitto *mosq, void *obj, mosq_retcode_t ret,
                                             const mosquitto_property *properties) {
+  UNUSED(mosq);
+  UNUSED(obj);
+  UNUSED(ret);
+  UNUSED(properties);
   // TODO we may necessitate doing something here after client is disconnected.
 }
 
@@ -138,6 +142,9 @@ static void subscribe_callback_duplex_func(struct mosquitto *mosq, void *obj, in
 }
 
 static void log_callback_duplex_func(struct mosquitto *mosq, void *obj, int level, const char *str) {
+  UNUSED(mosq);
+  UNUSED(obj);
+  UNUSED(level);
   log_info(logger_id, "log: %s\n", str);
 }
 

connectivity/mqtt/pub_utils.h

@@ -10,6 +10,8 @@
 #define PUB_UTILS_H
 
 #include "client_common.h"
+#undef uthash_free
+#undef uthash_malloc
 #include "third_party/mosquitto/config.h"
 #include "third_party/mosquitto/lib/mqtt_protocol.h"
 

connectivity/mqtt/sub_utils.c

@@ -51,6 +51,7 @@ void publish_callback_sub_func(struct mosquitto *mosq, void *obj, int mid, int r
 void message_callback_sub_func(struct mosquitto *mosq, void *obj, const struct mosquitto_message *message,
                                const mosquitto_property *properties) {
   mosq_config_t *cfg = (mosq_config_t *)obj;
+  UNUSED(properties);
 
   if (cfg->sub_config->remove_retained && message->retain) {
     mosquitto_publish(mosq, &cfg->general_config->last_mid, message->topic, 0, NULL, 1, true);
@@ -99,6 +100,8 @@ void connect_callback_sub_func(struct mosquitto *mosq, void *obj, int result, in
 }
 
 void subscribe_callback_sub_func(struct mosquitto *mosq, void *obj, int mid, int qos_count, const int *granted_qos) {
+  UNUSED(mosq);
+  UNUSED(obj);
   char *qos_str = (char *)calloc(qos_count, 3);
   char qos_digit[4];
   for (int i = 1; i < qos_count; i++) {