publisher hinzugefügt

1 files changed, 10 insertions, 2 deletions

diff --git a/src/mqtt.c b/src/mqtt.c
index ce89b0b..32e2ea9 100644
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -30,7 +30,9 @@ mqtt_connect(const char *clientid, // NOLINT
                 return NULL;
         }
 
-        mosquitto_message_callback_set(client, callback);
+        if ( callback ) {
+                mosquitto_message_callback_set(client, callback);
+        }
 
         err = mosquitto_connect(client, hostname, port, KEEPALIVE);
         if ( err != MOSQ_ERR_SUCCESS ) {
@@ -45,8 +47,10 @@ mqtt_connect(const char *clientid, // NOLINT
 void
 mqtt_run(struct mosquitto *client, const char *topics[], const volatile bool *quit)
 {
+        int *mid = NULL;
+
         for ( size_t idx = 0; topics[idx] != NULL; ++idx ) {
-                mosquitto_subscribe(client, NULL, topics[idx], 0);
+                mosquitto_subscribe(client, mid, topics[idx], 0);
         }
 
         while ( !*quit ) {
@@ -59,6 +63,10 @@ mqtt_run(struct mosquitto *client, const char *topics[], const volatile bool *qu
                         mosquitto_reconnect(client);
                 }
         }
+
+        for ( size_t idx = 0; topics[idx] != NULL; ++idx ) {
+                mosquitto_unsubscribe(client, mid, topics[idx]);
+        }
 }
 
 void