aqhome: re-implemented aqhomed.

- added IPC endpoint2

aqhome/ipc/0BUILD

@@ -45,6 +45,7 @@
   
   
     <headers dist="true" install="$(pkgincludedir)/ipc" >
+      endpoint2_ipc.h
       endpoint_node_ipc.h
       endpoint_node_ipc_tcpd.h
       endpoint_ipc_tcpc.h
@@ -61,12 +62,14 @@
 
 
     <headers dist="true" >
+      endpoint2_ipc_p.h
     </headers>
   
   
     <sources>
       $(local/typefiles)
 
+      endpoint2_ipc.c
       endpoint_node_ipc.c
       endpoint_node_ipc_tcpd.c
       endpoint_ipc_tcpc.c

aqhome/ipc/endpoint2_ipc.c

@@ -0,0 +1,139 @@
+/****************************************************************************
+ * 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 "aqhome/ipc/endpoint2_ipc_p.h"
+
+#include <gwenhywfar/endpoint2_ipc.h>
+#include <gwenhywfar/debug.h>
+
+
+
+
+#define AQH_MSG_ENDPOINT2_IPC_NAME     "ipc"
+
+
+GWEN_INHERIT(GWEN_MSG_ENDPOINT, AQH_ENDPOINT2_IPC)
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * forward declarations
+ * ------------------------------------------------------------------------------------------------
+ */
+
+static void GWENHYWFAR_CB _freeData(void *bp, void *p);
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * implementations
+ * ------------------------------------------------------------------------------------------------
+ */
+
+void AQH_IpcEndpoint2_Extend(GWEN_MSG_ENDPOINT2 *ep)
+{
+  AQH_ENDPOINT2_IPC *xep;
+
+  GWEN_NEW_OBJECT(AQH_ENDPOINT2_IPC, xep);
+  GWEN_INHERIT_SETDATA(GWEN_MSG_ENDPOINT2, AQH_ENDPOINT2_IPC, ep, xep, _freeData);
+}
+
+
+
+void _freeData(void *bp, void *p)
+{
+  AQH_ENDPOINT2_IPC *xep;
+
+  xep=(AQH_ENDPOINT2_IPC*) p;
+  GWEN_FREE_OBJECT(xep);
+}
+
+
+
+uint32_t AQH_IpcEndpoint2_GetAcceptedMsgGroups(const GWEN_MSG_ENDPOINT2 *ep)
+{
+  if (ep) {
+    AQH_ENDPOINT2_IPC *xep;
+
+    xep=GWEN_INHERIT_GETDATA(GWEN_MSG_ENDPOINT2, AQH_ENDPOINT2_IPC, ep);
+    if (xep) {
+      return xep->acceptedMsgGroups;
+    }
+  }
+
+  return 0;
+}
+
+
+
+void AQH_IpcEndpoint2_SetAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *ep, uint32_t i)
+{
+  if (ep) {
+    AQH_ENDPOINT2_IPC *xep;
+
+    xep=GWEN_INHERIT_GETDATA(GWEN_MSG_ENDPOINT2, AQH_ENDPOINT2_IPC, ep);
+    if (xep)
+      xep->acceptedMsgGroups=i;
+  }
+}
+
+
+
+void AQH_IpcEndpoint2_AddAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *ep, uint32_t i)
+{
+  if (ep) {
+    AQH_ENDPOINT2_IPC *xep;
+
+    xep=GWEN_INHERIT_GETDATA(GWEN_MSG_ENDPOINT2, AQH_ENDPOINT2_IPC, ep);
+    if (xep)
+      xep->acceptedMsgGroups|=i;
+  }
+}
+
+
+
+void AQH_IpcEndpoint2_SubAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *ep, uint32_t i)
+{
+  if (ep) {
+    AQH_ENDPOINT2_IPC *xep;
+
+    xep=GWEN_INHERIT_GETDATA(GWEN_MSG_ENDPOINT2, AQH_ENDPOINT2_IPC, ep);
+    if (xep)
+      xep->acceptedMsgGroups&=~i;
+  }
+}
+
+
+
+GWEN_MSG_ENDPOINT2 *AQH_IpcEndpoint2_CreateIpcTcpClient(const char *host, int port, const char *name, int groupId)
+{
+  GWEN_MSG_ENDPOINT2 *ep;
+
+  ep=GWEN_IpcEndpoint2_CreateIpcTcpClient(host, port, name?name:AQH_MSG_ENDPOINT2_IPC_NAME, groupId);
+  AQH_IpcEndpoint2_Extend(ep);
+  return ep;
+}
+
+
+
+GWEN_MSG_ENDPOINT2 *AQH_IpcEndpoint2_CreateIpcTcpServiceForSocket(GWEN_SOCKET *sk, const char *name, int groupId)
+{
+  GWEN_MSG_ENDPOINT2 *ep;
+
+  ep=GWEN_IpcEndpoint2_CreateIpcTcpServiceForSocket(sk, name?name:AQH_MSG_ENDPOINT2_IPC_NAME, groupId);
+  AQH_IpcEndpoint2_Extend(ep);
+  return ep;
+}
+
+
+

aqhome/ipc/endpoint2_ipc.h

@@ -0,0 +1,31 @@
+/****************************************************************************
+ * 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 AQH_ENDPOINT2_IPC_H
+#define AQH_ENDPOINT2_IPC_H
+
+
+#include <aqhome/api.h>
+
+#include <gwenhywfar/endpoint.h>
+
+
+
+AQHOME_API void AQH_IpcEndpoint2_Extend(GWEN_MSG_ENDPOINT2 *ep);
+
+AQHOME_API GWEN_MSG_ENDPOINT2 *AQH_IpcEndpoint2_CreateIpcTcpClient(const char *host, int port, const char *name, int groupId);
+AQHOME_API GWEN_MSG_ENDPOINT2 *AQH_IpcEndpoint2_CreateIpcTcpServiceForSocket(GWEN_SOCKET *sk, const char *name, int groupId);
+
+AQHOME_API uint32_t AQH_IpcEndpoint2_GetAcceptedMsgGroups(const GWEN_MSG_ENDPOINT2 *ep);
+AQHOME_API void AQH_IpcEndpoint2_SetAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *ep, uint32_t i);
+AQHOME_API void AQH_IpcEndpoint2_AddAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *ep, uint32_t i);
+AQHOME_API void AQH_IpcEndpoint2_SubAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *ep, uint32_t i);
+
+
+#endif
+

aqhome/ipc/endpoint2_ipc_p.h

@@ -0,0 +1,38 @@
+/****************************************************************************
+ * 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 AQH_ENDPOINT2_IPC_P_H
+#define AQH_ENDPOINT2_IPC_P_H
+
+
+#include <aqhome/api.h>
+
+#include <gwenhywfar/endpoint2.h>
+
+#include "aqhome/ipc/endpoint2_ipc.h"
+
+
+typedef struct AQH_ENDPOINT2_IPC AQH_ENDPOINT2_IPC;
+struct AQH_ENDPOINT2_IPC {
+  uint32_t acceptedMsgGroups;
+};
+
+
+
+
+
+#endif
+
+
+
+
+
+
+
+
+