martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome, aqhomed: Adapted to latest changes.

Browse Source
This commit is contained in:
Martin Preuss
2023-03-28 21:42:28 +02:00
parent 0aaa5969ab
commit 07356b6171
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/aqhomed/main.c
View File

@@ -207,7 +207,7 @@ GWEN_MSG_ENDPOINT_MGR *_setupService(GWEN_DB_NODE *dbArgs)
if (tcpAddress && *tcpAddress && tcpPort) { if (tcpAddress && *tcpAddress && tcpPort) {
GWEN_MSG_ENDPOINT *epTcp; GWEN_MSG_ENDPOINT *epTcp;
epTcp=AQH_TcpIpcNodeEndpoint_new(NULL, tcpAddress, tcpPort, AQH_MSGMGR_ENDPOINTGROUP_IPC); epTcp=AQH_TcpdIpcNodeEndpoint_new(tcpAddress, tcpPort, NULL, AQH_MSGMGR_ENDPOINTGROUP_IPC);
if (epTcp==NULL) { if (epTcp==NULL) {
DBG_ERROR(AQH_LOGDOMAIN, "Error creating endpoint TCP"); DBG_ERROR(AQH_LOGDOMAIN, "Error creating endpoint TCP");
GWEN_MsgEndpointMgr_free(emgr); GWEN_MsgEndpointMgr_free(emgr);

9
aqhome/ipc/endpoint_node_ipc_tcp.c
View File

@@ -19,10 +19,11 @@
#include <gwenhywfar/list.h> #include <gwenhywfar/list.h>
#include <gwenhywfar/debug.h> #include <gwenhywfar/debug.h>
#include <gwenhywfar/gwentime.h> #include <gwenhywfar/gwentime.h>
#include <gwenhywfar/endpoint_ipc_tcp.h> #include <gwenhywfar/endpoint_tcpd_ipc.h>
#define AQH_MSG_ENDPOINT_NODEIPCTCP_NAME "nodeipctcp"
#define AQH_MSG_ENDPOINT_NODEIPCTCP_NAME "node_ipc_tcpd"
@@ -32,11 +33,11 @@ static GWEN_MSG_ENDPOINT *_createChild(GWEN_MSG_ENDPOINT *ep);
GWEN_MSG_ENDPOINT *AQH_TcpIpcNodeEndpoint_new(const char *name, const char *host, int port, int groupId) GWEN_MSG_ENDPOINT *AQH_TcpdIpcNodeEndpoint_new(const char *host, int port, const char *name, int groupId)
{ {
GWEN_MSG_ENDPOINT *ep; GWEN_MSG_ENDPOINT *ep;
ep=GWEN_TcpIpcEndpoint_new(name?name:AQH_MSG_ENDPOINT_NODEIPCTCP_NAME, host, port, groupId); ep=GWEN_IpcTcpdEndpoint_new(host, port, name?name:AQH_MSG_ENDPOINT_NODEIPCTCP_NAME, groupId);
GWEN_MsgEndpoint_AddFlags(ep, AQH_MSGEP_NODE_FLAGS_NOMESSAGES); GWEN_MsgEndpoint_AddFlags(ep, AQH_MSGEP_NODE_FLAGS_NOMESSAGES);
GWEN_MsgEndpoint_SetCreateChildFn(ep, _createChild); GWEN_MsgEndpoint_SetCreateChildFn(ep, _createChild);

8
aqhome/ipc/endpoint_node_ipc_tcp.h
View File

@@ -6,17 +6,17 @@
* should have received along with this file. * should have received along with this file.
****************************************************************************/ ****************************************************************************/
#ifndef AQH_ENDPOINT_NODE_IPC_TCP_H #ifndef AQH_ENDPOINT_NODE_IPC_TCPD_H
#define AQH_ENDPOINT_NODE_IPC_TCP_H #define AQH_ENDPOINT_NODE_IPC_TCPD_H
#include <aqhome/api.h> #include <aqhome/api.h>
#include <gwenhywfar/endpoint_ipc_tcp.h> #include <gwenhywfar/endpoint.h>
AQHOME_API GWEN_MSG_ENDPOINT *AQH_TcpIpcNodeEndpoint_new(const char *name, const char *host, int port, int groupId); AQHOME_API GWEN_MSG_ENDPOINT *AQH_TcpdIpcNodeEndpoint_new(const char *host, int port, const char *name, int groupId);
#endif #endif

2
aqhome/ipc/msg_ipc_forward.c
View File

@@ -73,7 +73,7 @@ void AQH_ForwardIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, cons
GWEN_IpcMsg_GetProtoId(msg), GWEN_IpcMsg_GetProtoId(msg),
GWEN_IpcMsg_GetProtoVersion(msg)); GWEN_IpcMsg_GetProtoVersion(msg));
if (ptr && len) { if (ptr && len) {
GWEN_Text_DumpString2Buffer(ptr, len, dbuf, 2); GWEN_Text_DumpString2Buffer((const char*)ptr, len, dbuf, 2);
GWEN_Buffer_AppendByte(dbuf, '\n'); GWEN_Buffer_AppendByte(dbuf, '\n');
} }
} }