Mercurial > bms / file diff

--- a/bmsd/mqtt.c	Fri May 07 13:20:53 2021 +0200
+++ b/bmsd/mqtt.c	Fri May 07 13:29:07 2021 +0200
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2017-2020
+ * Copyright (C) 2017-2021
  *   
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -40,11 +40,11 @@
 int              	mqtt_mid_sent = 0;
 int              	mqtt_last_mid = -1;
 int              	mqtt_last_mid_sent = -1;
-int              	mqtt_connected = TRUE;
-int              	mqtt_disconnect_sent = FALSE;
-int              	mqtt_connect_lost = FALSE;
-int              	mqtt_my_shutdown = FALSE;
-int              	mqtt_use = FALSE;
+int              	mqtt_connected = true;
+int              	mqtt_disconnect_sent = false;
+int              	mqtt_connect_lost = false;
+int              	mqtt_my_shutdown = false;
+int              	mqtt_use = false;
 int			keepalive = 60;
 unsigned int		max_inflight = 20;
 struct mosquitto	*mosq = NULL;
@@ -88,7 +88,7 @@
     char	*topic = NULL;
 
     if (mqtt_connect_lost) {
-        mqtt_connect_lost = FALSE;
+        mqtt_connect_lost = false;
         syslog(LOG_NOTICE, "MQTT: reconnect: %s", mosquitto_connack_string(result));
     }
 
@@ -119,13 +119,13 @@
 {
     if (mqtt_my_shutdown) {
        	syslog(LOG_NOTICE, "MQTT: acknowledged DISCONNECT from %s", Config.mqtt_host);
-       	mqtt_connected = FALSE;
+       	mqtt_connected = false;
     } else {
        	/*
          * The remote server was brought down. We must keep running
          */
        	syslog(LOG_NOTICE, "MQTT: received DISCONNECT from %s, connection lost", Config.mqtt_host);
-       	mqtt_connect_lost = TRUE;
+       	mqtt_connect_lost = true;
     }
 }
 
@@ -300,7 +300,7 @@
        id[MOSQ_MQTT_ID_MAX_LENGTH] = '\0';
     }
 
-    mosq = mosquitto_new(id, TRUE, NULL);
+    mosq = mosquitto_new(id, true, NULL);
     if (!mosq) {
        switch(errno) {
            case ENOMEM:
@@ -370,7 +370,7 @@
 	syslog(LOG_NOTICE, "MQTT: will run without an MQTT broker.");
 	return 4;
     } else {
-        mqtt_use = TRUE;
+        mqtt_use = true;
         syslog(LOG_NOTICE, "MQTT: connected with %s:%d", Config.mqtt_host, Config.mqtt_port);
 
         /*
@@ -405,33 +405,33 @@
 	topic = NULL;
 	mqtt_last_mid = mqtt_mid_sent;
         mqtt_status = STATUS_WAITING;
-	mqtt_my_shutdown = TRUE;
+	mqtt_my_shutdown = true;
 
         do {
             if (mqtt_status == STATUS_WAITING) {
                 if (debug)
                     fprintf(stdout, (char *)"Waiting\n");
-                if (mqtt_last_mid_sent == mqtt_last_mid && mqtt_disconnect_sent == FALSE) {
+                if (mqtt_last_mid_sent == mqtt_last_mid && mqtt_disconnect_sent == false) {
                     mosquitto_disconnect(mosq);
-                    mqtt_disconnect_sent = TRUE;
+                    mqtt_disconnect_sent = true;
                 }
                 usleep(100000);
             }
             rc = MOSQ_ERR_SUCCESS;
         } while (rc == MOSQ_ERR_SUCCESS && mqtt_connected);
 
-        mosquitto_loop_stop(mosq, FALSE);
+        mosquitto_loop_stop(mosq, false);
         mosquitto_destroy(mosq);
         mosquitto_lib_cleanup();
-	mqtt_use = FALSE;
+	mqtt_use = false;
 	mqtt_status = STATUS_CONNECTING;
 	mqtt_mid_sent = 0;
 	mqtt_last_mid = -1;
 	mqtt_last_mid_sent = -1;
-	mqtt_connected = TRUE;
-	mqtt_disconnect_sent = FALSE;
-	mqtt_connect_lost = FALSE;
-	mqtt_my_shutdown = FALSE;
+	mqtt_connected = true;
+	mqtt_disconnect_sent = false;
+	mqtt_connect_lost = false;
+	mqtt_my_shutdown = false;
 	syslog(LOG_NOTICE, "MQTT: disconnected");
     }
 }