adapted to latest changes in gwen, more work on data and nodes servers.

apps/aqhome-data/c_setdata.c

@@ -14,6 +14,7 @@
 #include "./c_setdata.h"
 #include "./aqhome_data_p.h"
 #include "./loop.h"
+#include "aqhome/aqhome.h"
 #include "aqhome/ipc/data/ipc_data.h"
 #include "aqhome/ipc/data/msg_data_set.h"
 #include "aqhome/ipc/endpoint_ipc.h"
@@ -77,7 +78,9 @@ void AqHomeData_HandleSetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc, GWEN_M
   AQH_Value_free(recvdValue);
   free(valueDataFreeable);
 
-  outMsg=AQH_ResultIpcMsg_new(AQH_MSGTYPE_IPC_DATA_RESULT, resultCode);
+  outMsg=AQH_ResultIpcMsg_new(AQH_MSGTYPE_IPC_DATA_RESULT,
+                              GWEN_MsgEndpoint_GetNextMessageId(epSrc), GWEN_IpcMsg_GetMsgId(recvdMsg),
+                              resultCode);
   GWEN_MsgEndpoint_AddSendMessage(epSrc, outMsg);
 }
 
@@ -96,7 +99,9 @@ int _forwardDataToDriver(AQHOME_DATA *aqh, const AQH_VALUE *v, const char *data)
       GWEN_MSG *driverMsg;
 
       DBG_INFO(AQH_LOGDOMAIN, "Sending SETDATA msg to driver endpoint (%s)", GWEN_MsgEndpoint_GetName(ep));
-      driverMsg=AQH_SetDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_SETDATA, v, data);
+      driverMsg=AQH_SetDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_SETDATA,
+                                      GWEN_MsgEndpoint_GetNextMessageId(ep), 0,
+                                      v, data);
       GWEN_MsgEndpoint_AddSendMessage(ep, driverMsg);
       return AQH_MSG_IPC_SUCCESS;
     }