Simplified IPC code to use less different IPC messages. Share more code. More qork on MQTT code.

apps/aqhome-mqttlog/0BUILD

@@ -46,6 +46,7 @@
 
     <headers dist="true" >
       init.h
+      fini.h
       aqhome_mqtt.h
       aqhome_mqtt_p.h
       mqtt.h
@@ -56,6 +57,7 @@
       $(local/typefiles)
       aqhome_mqtt.c
       init.c
+      fini.c
       main.c
       mqtt.c
       messages.c

apps/aqhome-mqttlog/aqhome_mqtt.c

@@ -30,8 +30,6 @@ AQHOME_MQTT *AqHomeMqtt_new()
 
   GWEN_NEW_OBJECT(AQHOME_MQTT, aqh);
 
-  aqh->rootEndpoint=GWEN_MsgEndpoint_new("root", 0);
-
   return aqh;
 }
 

apps/aqhome-mqttlog/fini.c

@@ -0,0 +1,80 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 Martin Preuss, all rights reserved.
+ *
+ * The license for this file can be found in the file COPYING which you
+ * should have received along with this file.
+ ****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
+#include "./fini.h"
+#include "./aqhome_mqtt_p.h"
+
+#include <gwenhywfar/gwenhywfar.h>
+#include <gwenhywfar/args.h>
+#include <gwenhywfar/debug.h>
+#include <gwenhywfar/endpoint.h>
+
+#include <unistd.h>
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * defines
+ * ------------------------------------------------------------------------------------------------
+ */
+
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * forward declarations
+ * ------------------------------------------------------------------------------------------------
+ */
+
+static void _disconnectTree(GWEN_MSG_ENDPOINT *ep);
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * implementations
+ * ------------------------------------------------------------------------------------------------
+ */
+
+void AqHomeMqtt_Fini(AQHOME_MQTT *aqh)
+{
+  if (aqh) {
+    if (aqh->rootEndpoint)
+      _disconnectTree(aqh->rootEndpoint);
+    GWEN_MsgEndpoint_free(aqh->rootEndpoint);
+    aqh->rootEndpoint=NULL;
+    aqh->brokerEndpoint=NULL;
+    aqh->mqttEndpoint=NULL;
+
+    if (aqh->pidFile)
+      remove(aqh->pidFile);
+  }
+}
+
+
+
+void _disconnectTree(GWEN_MSG_ENDPOINT *ep)
+{
+  GWEN_MSG_ENDPOINT *epChild;
+
+  epChild=GWEN_MsgEndpoint_Tree2_GetFirstChild(ep);
+  while(epChild) {
+    _disconnectTree(epChild);
+    epChild=GWEN_MsgEndpoint_Tree2_GetNext(epChild);
+  } /* while */
+
+  GWEN_MsgEndpoint_Disconnect(ep);
+}
+
+
+
+

apps/aqhome-mqttlog/fini.h

@@ -0,0 +1,23 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 Martin Preuss, all rights reserved.
+ *
+ * The license for this file can be found in the file COPYING which you
+ * should have received along with this file.
+ ****************************************************************************/
+
+#ifndef AQHOMEMQTT_FINI_H
+#define AQHOMEMQTT_FINI_H
+
+
+#include "./aqhome_mqtt.h"
+
+
+
+void AqHomeMqtt_Fini(AQHOME_MQTT *aqh);
+
+
+
+#endif
+
+

apps/aqhome-mqttlog/init.c

@@ -73,6 +73,8 @@ int AqHomeMqtt_Init(AQHOME_MQTT *aqh, int argc, char **argv)
   }
   aqh->dbArgs=dbArgs;
 
+  aqh->timeout=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 0);
+
   s=GWEN_DB_GetCharValue(dbArgs, "pidfile", 0, AQHOME_MQTT_DEFAULT_PIDFILE);
   if (s && *s) {
     AqHomeMqtt_SetPidFile(aqh, s);
@@ -83,6 +85,8 @@ int AqHomeMqtt_Init(AQHOME_MQTT *aqh, int argc, char **argv)
     }
   }
 
+  aqh->rootEndpoint=GWEN_MsgEndpoint_new("root", 0);
+
   rv=_setupMqtt(aqh, dbArgs);
   if (rv<0) {
     DBG_ERROR(NULL, "Error setting up connection to broker (%d)", rv);

apps/aqhome-mqttlog/mqtt.c

@@ -22,8 +22,9 @@
 #include <aqhome/mqtt/msg_mqtt_subscribe.h>
 #include <aqhome/mqtt/msg_mqtt_suback.h>
 
-#include <gwenhywfar/debug.h>
+#include <gwenhywfar/endpoint_multilayer.h>
 #include <gwenhywfar/text.h>
+#include <gwenhywfar/debug.h>
 
 #include <time.h>
 #include <unistd.h>
@@ -75,6 +76,7 @@ GWEN_MSG_ENDPOINT *AqHomeMqttLog_CreateMqttEndpoint(GWEN_DB_NODE *dbArgs)
       return NULL;
     }
     AQH_MqttClientEndpoint_SetKeepAliveTime(epMqtt, mqttKeepAlive);
+    GWEN_MsgEndpoint_AddFlags(epMqtt, AQH_ENDPOINT2_MQTTCLIENT_FLAGS_SUBSCRIBEALL);
 
     return epMqtt;
   }
@@ -89,7 +91,7 @@ int AqHomeMqttLog_MqttConnect(GWEN_MSG_ENDPOINT *epTcp)
   if (GWEN_MsgEndpoint_GetState(epTcp)==GWEN_MSG_ENDPOINT_STATE_UNCONNECTED) {
     int rv;
 
-    rv=AQH_MqttClientEndpoint_StartConnect(epTcp);
+    rv=GWEN_MultilayerEndpoint_StartConnect(epTcp);
     if (rv<0 && rv!=GWEN_ERROR_IN_PROGRESS) {
       DBG_ERROR(NULL, "Error starting to connect (%d)", rv);
       return rv;