Mehrere Topics möglich und bessere Abbruchsteuerung

1 files changed, 7 insertions, 4 deletions

diff --git a/src/main.c b/src/main.c
index 1b5bac7..8a25176 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,11 +76,13 @@ connect(const char *clientid, // NOLINT
 }
 
 static void
-run(struct mosquitto *client, const char *topic)
+run(struct mosquitto *client, const char *topics[], const volatile bool *quit)
 {
-        mosquitto_subscribe(client, NULL, topic, 0);
+        for ( size_t idx = 0; topics[idx] != NULL; ++idx ) {
+                mosquitto_subscribe(client, NULL, topics[idx], 0);
+        }
 
-        while ( !terminate ) {
+        while ( !*quit ) {
                 static const int defaultTimeout = -1; // 1000ms
 
                 int err = mosquitto_loop(client, defaultTimeout, 1);
@@ -127,7 +129,8 @@ main(void)
                 return EXIT_FAILURE;
         }
 
-        run(client, TOPIC);
+        run(client, (const char *[]){ TOPIC, NULL }, &terminate);
+
         shutdown(client);
 
         return EXIT_SUCCESS;