adapted to latest changes in gwen (msgio API v2 becomes v1).
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
#include "./flash.h"
|
||||
#include "./utils.h"
|
||||
|
||||
#include "aqhome/ipc/endpoint2_ipc.h"
|
||||
#include "aqhome/ipc/endpoint_ipc.h"
|
||||
#include "aqhome/ipc/msg_ipc_setaccmsggrps.h"
|
||||
#include "aqhome/ipc/msg_ipc_forward.h"
|
||||
#include "aqhome/msg/msg_node.h"
|
||||
@@ -47,28 +47,28 @@ static int _doFlash(GWEN_DB_NODE *dbArgs);
|
||||
|
||||
static AQH_FLASHRECORD_LIST *_readHexfileIntoFlashRecordList(const char *hexFilename);
|
||||
|
||||
static int _rebootNode(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid, int timeoutInSeconds);
|
||||
static int _performFlashProcedure(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
static int _rebootNode(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid, int timeoutInSeconds);
|
||||
static int _performFlashProcedure(GWEN_MSG_ENDPOINT *epTcp,
|
||||
unsigned int uid,
|
||||
const AQH_FLASHRECORD_LIST *flashRecordList,
|
||||
int pageSize,
|
||||
int timeoutInSeconds);
|
||||
|
||||
|
||||
static int _flashStart(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid, int timeoutInSeconds);
|
||||
static int _flashStart(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid, int timeoutInSeconds);
|
||||
|
||||
|
||||
static GWEN_MSG *_waitForFlashReadyMessageForUid(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
static GWEN_MSG *_waitForFlashReadyMessageForUid(GWEN_MSG_ENDPOINT *epTcp,
|
||||
unsigned int uid, int timeoutInSeconds);
|
||||
static int _sendRebootRequest(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid);
|
||||
static int _sendFlashStart(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid);
|
||||
static int _waitForFlashResponseMessage(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds);
|
||||
static int _waitForRebootResponseMessage(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds);
|
||||
static int _sendFlashRecord(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
static int _sendRebootRequest(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid);
|
||||
static int _sendFlashStart(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid);
|
||||
static int _waitForFlashResponseMessage(GWEN_MSG_ENDPOINT *epTcp, int timeoutInSeconds);
|
||||
static int _waitForRebootResponseMessage(GWEN_MSG_ENDPOINT *epTcp, int timeoutInSeconds);
|
||||
static int _sendFlashRecord(GWEN_MSG_ENDPOINT *epTcp,
|
||||
const AQH_FLASHRECORD *flashRecord,
|
||||
uint16_t pageSize,
|
||||
int timeoutInSeconds);
|
||||
static int _sendFlashEnd(GWEN_MSG_ENDPOINT2 *epTcp, int reason);
|
||||
static int _sendFlashEnd(GWEN_MSG_ENDPOINT *epTcp, int reason);
|
||||
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ int AQH_Tool_Flash(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
|
||||
|
||||
int _doFlash(GWEN_DB_NODE *dbArgs)
|
||||
{
|
||||
GWEN_MSG_ENDPOINT2 *epTcp;
|
||||
GWEN_MSG_ENDPOINT *epTcp;
|
||||
int rv;
|
||||
int timeoutInSeconds;
|
||||
int doReboot;
|
||||
@@ -222,7 +222,7 @@ int _doFlash(GWEN_DB_NODE *dbArgs)
|
||||
rv=Utils_SendAcceptedMsgGroups(epTcp, AQH_MSG_TYPEGROUP_FLASH);
|
||||
if (rv<0) {
|
||||
DBG_INFO(NULL, "here (%d)", rv);
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return 3;
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ int _doFlash(GWEN_DB_NODE *dbArgs)
|
||||
rv=_rebootNode(epTcp, uid, timeoutInSeconds);
|
||||
if (rv<0) {
|
||||
DBG_INFO(NULL, "here (%d)", rv);
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return 3;
|
||||
}
|
||||
fprintf(stdout, "Reboot in progress\n");
|
||||
@@ -242,7 +242,7 @@ int _doFlash(GWEN_DB_NODE *dbArgs)
|
||||
msg=_waitForFlashReadyMessageForUid(epTcp, uid, timeoutInSeconds);
|
||||
if (msg==NULL) {
|
||||
DBG_INFO(NULL, "No FLASH_READY message received.");
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return 3;
|
||||
}
|
||||
DBG_INFO(NULL, "FLASH_READY message received");
|
||||
@@ -255,14 +255,14 @@ int _doFlash(GWEN_DB_NODE *dbArgs)
|
||||
if (rv<0) {
|
||||
if (rv<0) {
|
||||
DBG_INFO(NULL, "here (%d)", rv);
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
AQH_FlashRecord_List_free(flashRecordList);
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
AQH_FlashRecord_List_free(flashRecordList);
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -293,7 +293,7 @@ AQH_FLASHRECORD_LIST *_readHexfileIntoFlashRecordList(const char *hexFilename)
|
||||
|
||||
|
||||
|
||||
int _rebootNode(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid, int timeoutInSeconds)
|
||||
int _rebootNode(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid, int timeoutInSeconds)
|
||||
{
|
||||
int rv;
|
||||
|
||||
@@ -316,7 +316,7 @@ int _rebootNode(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid, int timeoutInSecond
|
||||
|
||||
|
||||
|
||||
int _performFlashProcedure(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
int _performFlashProcedure(GWEN_MSG_ENDPOINT *epTcp,
|
||||
unsigned int uid,
|
||||
const AQH_FLASHRECORD_LIST *flashRecordList,
|
||||
int pageSize,
|
||||
@@ -361,7 +361,7 @@ int _performFlashProcedure(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
|
||||
|
||||
|
||||
int _flashStart(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid, int timeoutInSeconds)
|
||||
int _flashStart(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid, int timeoutInSeconds)
|
||||
{
|
||||
int rv;
|
||||
int i;
|
||||
@@ -399,7 +399,7 @@ int _flashStart(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid, int timeoutInSecond
|
||||
|
||||
|
||||
|
||||
GWEN_MSG *_waitForFlashReadyMessageForUid(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid, int timeoutInSeconds)
|
||||
GWEN_MSG *_waitForFlashReadyMessageForUid(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid, int timeoutInSeconds)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -428,7 +428,7 @@ GWEN_MSG *_waitForFlashReadyMessageForUid(GWEN_MSG_ENDPOINT2 *epTcp, unsigned in
|
||||
|
||||
|
||||
|
||||
int _waitForRebootResponseMessage(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds)
|
||||
int _waitForRebootResponseMessage(GWEN_MSG_ENDPOINT *epTcp, int timeoutInSeconds)
|
||||
{
|
||||
GWEN_MSG *msg;
|
||||
|
||||
@@ -443,7 +443,7 @@ int _waitForRebootResponseMessage(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSecond
|
||||
|
||||
|
||||
|
||||
int _waitForFlashResponseMessage(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds)
|
||||
int _waitForFlashResponseMessage(GWEN_MSG_ENDPOINT *epTcp, int timeoutInSeconds)
|
||||
{
|
||||
GWEN_MSG *msg;
|
||||
int responseCode;
|
||||
@@ -460,7 +460,7 @@ int _waitForFlashResponseMessage(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds
|
||||
|
||||
|
||||
|
||||
int _sendRebootRequest(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid)
|
||||
int _sendRebootRequest(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid)
|
||||
{
|
||||
GWEN_MSG *msgNode;
|
||||
GWEN_MSG *msgOut;
|
||||
@@ -472,14 +472,14 @@ int _sendRebootRequest(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid)
|
||||
}
|
||||
|
||||
msgOut=AQH_ForwardIpcMsg_new(AQH_MSGTYPE_IPC_FORWARD, GWEN_Msg_GetConstBuffer(msgNode), GWEN_Msg_GetBytesInBuffer(msgNode));
|
||||
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_Msg_free(msgNode);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int _sendFlashStart(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid)
|
||||
int _sendFlashStart(GWEN_MSG_ENDPOINT *epTcp, unsigned int uid)
|
||||
{
|
||||
GWEN_MSG *msgNode;
|
||||
GWEN_MSG *msgOut;
|
||||
@@ -491,14 +491,14 @@ int _sendFlashStart(GWEN_MSG_ENDPOINT2 *epTcp, unsigned int uid)
|
||||
}
|
||||
|
||||
msgOut=AQH_ForwardIpcMsg_new(AQH_MSGTYPE_IPC_FORWARD, GWEN_Msg_GetConstBuffer(msgNode), GWEN_Msg_GetBytesInBuffer(msgNode));
|
||||
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_Msg_free(msgNode);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int _sendFlashEnd(GWEN_MSG_ENDPOINT2 *epTcp, int reason)
|
||||
int _sendFlashEnd(GWEN_MSG_ENDPOINT *epTcp, int reason)
|
||||
{
|
||||
GWEN_MSG *msgNode;
|
||||
GWEN_MSG *msgOut;
|
||||
@@ -510,14 +510,14 @@ int _sendFlashEnd(GWEN_MSG_ENDPOINT2 *epTcp, int reason)
|
||||
}
|
||||
|
||||
msgOut=AQH_ForwardIpcMsg_new(AQH_MSGTYPE_IPC_FORWARD, GWEN_Msg_GetConstBuffer(msgNode), GWEN_Msg_GetBytesInBuffer(msgNode));
|
||||
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_Msg_free(msgNode);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int _sendFlashRecord(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
int _sendFlashRecord(GWEN_MSG_ENDPOINT *epTcp,
|
||||
const AQH_FLASHRECORD *flashRecord,
|
||||
uint16_t pageSize,
|
||||
int timeoutInSeconds)
|
||||
@@ -556,7 +556,7 @@ int _sendFlashRecord(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
}
|
||||
|
||||
msgOut=AQH_ForwardIpcMsg_new(AQH_MSGTYPE_IPC_FORWARD, GWEN_Msg_GetConstBuffer(msgNode), GWEN_Msg_GetBytesInBuffer(msgNode));
|
||||
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_Msg_free(msgNode);
|
||||
|
||||
rv=_waitForFlashResponseMessage(epTcp, timeoutInSeconds);
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "./getdevices.h"
|
||||
#include "./utils.h"
|
||||
|
||||
#include "aqhome/ipc/endpoint2_ipc.h"
|
||||
#include "aqhome/ipc/endpoint_ipc.h"
|
||||
#include "aqhome/ipc/msg_ipc_getdevices_req.h"
|
||||
#include "aqhome/ipc/msg_ipc_getdevices_rsp.h"
|
||||
#include "aqhome/ipc/msg_ipc_error.h"
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
|
||||
static int _doGetDevices(GWEN_DB_NODE *dbArgs);
|
||||
static int _sendGetDevices(GWEN_MSG_ENDPOINT2 *epTcp);
|
||||
static int _sendGetDevices(GWEN_MSG_ENDPOINT *epTcp);
|
||||
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ int AQH_Tool_GetDevices(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
|
||||
|
||||
int _doGetDevices(GWEN_DB_NODE *dbArgs)
|
||||
{
|
||||
GWEN_MSG_ENDPOINT2 *epTcp;
|
||||
GWEN_MSG_ENDPOINT *epTcp;
|
||||
int rv;
|
||||
int timeoutInSeconds;
|
||||
|
||||
@@ -149,7 +149,7 @@ int _doGetDevices(GWEN_DB_NODE *dbArgs)
|
||||
msg=Utils_WaitForSpecificIpcMessage(epTcp, AQH_MSGTYPE_IPC_GETDEVICES_RSP, timeoutInSeconds);
|
||||
if (msg==NULL) {
|
||||
DBG_INFO(NULL, "No GET_DEVICE response received.");
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return 2;
|
||||
}
|
||||
code=GWEN_IpcMsg_GetCode(msg);
|
||||
@@ -196,13 +196,13 @@ int _doGetDevices(GWEN_DB_NODE *dbArgs)
|
||||
}
|
||||
}
|
||||
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int _sendGetDevices(GWEN_MSG_ENDPOINT2 *epTcp)
|
||||
int _sendGetDevices(GWEN_MSG_ENDPOINT *epTcp)
|
||||
{
|
||||
GWEN_MSG *msgOut;
|
||||
|
||||
@@ -211,7 +211,7 @@ int _sendGetDevices(GWEN_MSG_ENDPOINT2 *epTcp)
|
||||
DBG_ERROR(NULL, "Error creating message");
|
||||
return GWEN_ERROR_GENERIC;
|
||||
}
|
||||
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "aqhome/ipc/msg_ipc_setaccmsggrps.h"
|
||||
#include "aqhome/ipc/msg_ipc_ping.h"
|
||||
#include "aqhome/ipc/msg_ipc_forward.h"
|
||||
#include "aqhome/ipc/endpoint2_ipc.h"
|
||||
#include "aqhome/ipc/endpoint_ipc.h"
|
||||
#include "aqhome/msg/msg_node.h"
|
||||
|
||||
#include <gwenhywfar/args.h>
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
|
||||
static int _doPing(GWEN_DB_NODE *dbArgs);
|
||||
static int _sendPing(GWEN_MSG_ENDPOINT2 *epTcp, int nodeAddr);
|
||||
static int _sendPing(GWEN_MSG_ENDPOINT *epTcp, int nodeAddr);
|
||||
|
||||
|
||||
|
||||
@@ -129,7 +129,7 @@ int AQH_Tool_Ping(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
|
||||
|
||||
int _doPing(GWEN_DB_NODE *dbArgs)
|
||||
{
|
||||
GWEN_MSG_ENDPOINT2 *epTcp;
|
||||
GWEN_MSG_ENDPOINT *epTcp;
|
||||
int rv;
|
||||
int nodeAddr;
|
||||
int timeoutInSeconds;
|
||||
@@ -165,13 +165,13 @@ int _doPing(GWEN_DB_NODE *dbArgs)
|
||||
}
|
||||
|
||||
fprintf(stdout, "PONG response received\n");
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int _sendPing(GWEN_MSG_ENDPOINT2 *epTcp, int nodeAddr)
|
||||
int _sendPing(GWEN_MSG_ENDPOINT *epTcp, int nodeAddr)
|
||||
{
|
||||
GWEN_MSG *msgOut;
|
||||
|
||||
@@ -180,7 +180,7 @@ int _sendPing(GWEN_MSG_ENDPOINT2 *epTcp, int nodeAddr)
|
||||
DBG_ERROR(NULL, "Error creating message");
|
||||
return GWEN_ERROR_GENERIC;
|
||||
}
|
||||
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
#include "./utils.h"
|
||||
|
||||
#include "aqhome/ipc/endpoint2_ipc.h"
|
||||
#include "aqhome/ipc/endpoint_ipc.h"
|
||||
#include "aqhome/ipc/msg_ipc_setaccmsggrps.h"
|
||||
#include "aqhome/ipc/msg_ipc_forward.h"
|
||||
|
||||
#include <gwenhywfar/endpoint2_tcpc.h>
|
||||
#include <gwenhywfar/endpoint_tcpc.h>
|
||||
#include <gwenhywfar/debug.h>
|
||||
|
||||
#include <time.h>
|
||||
@@ -26,9 +26,9 @@
|
||||
|
||||
|
||||
|
||||
GWEN_MSG_ENDPOINT2 *Utils_SetupIpcEndpoint(GWEN_DB_NODE *dbArgs)
|
||||
GWEN_MSG_ENDPOINT *Utils_SetupIpcEndpoint(GWEN_DB_NODE *dbArgs)
|
||||
{
|
||||
GWEN_MSG_ENDPOINT2 *epTcp;
|
||||
GWEN_MSG_ENDPOINT *epTcp;
|
||||
const char *tcpAddress;
|
||||
int tcpPort;
|
||||
int rv;
|
||||
@@ -37,15 +37,15 @@ GWEN_MSG_ENDPOINT2 *Utils_SetupIpcEndpoint(GWEN_DB_NODE *dbArgs)
|
||||
tcpPort=GWEN_DB_GetIntValue(dbArgs, "tcpPort", 0, 45454);
|
||||
|
||||
DBG_INFO(NULL, "Setup tcp client endpoint to %s:%d", tcpAddress, tcpPort);
|
||||
epTcp=AQH_IpcEndpoint2_CreateIpcTcpClient(tcpAddress, tcpPort, "aqhome-tool-IPC", 0);
|
||||
epTcp=AQH_IpcEndpoint_CreateIpcTcpClient(tcpAddress, tcpPort, "aqhome-tool-IPC", 0);
|
||||
if (epTcp==NULL) {
|
||||
DBG_ERROR(NULL, "Error creating endpoint TCPc");
|
||||
return NULL;
|
||||
}
|
||||
rv=GWEN_TcpcEndpoint2_StartConnect(epTcp);
|
||||
rv=GWEN_TcpcEndpoint_StartConnect(epTcp);
|
||||
if (rv<0 && rv!=GWEN_ERROR_IN_PROGRESS) {
|
||||
DBG_ERROR(NULL, "Error connecting (%d)", rv);
|
||||
GWEN_MsgEndpoint2_free(epTcp);
|
||||
GWEN_MsgEndpoint_free(epTcp);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ GWEN_MSG_ENDPOINT2 *Utils_SetupIpcEndpoint(GWEN_DB_NODE *dbArgs)
|
||||
|
||||
|
||||
|
||||
GWEN_MSG *Utils_WaitForSpecificNodeMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
GWEN_MSG *Utils_WaitForSpecificNodeMessage(GWEN_MSG_ENDPOINT *epTcp,
|
||||
int msgCode,
|
||||
int nodeAddr,
|
||||
int timeoutInSeconds)
|
||||
@@ -67,8 +67,8 @@ GWEN_MSG *Utils_WaitForSpecificNodeMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
GWEN_MSG *msg;
|
||||
time_t now;
|
||||
|
||||
GWEN_MsgEndpoint2_IoLoop(epTcp, 2000); /* 2000 ms */
|
||||
msg=GWEN_MsgEndpoint2_TakeFirstReceivedMessage(epTcp);
|
||||
GWEN_MsgEndpoint_IoLoop(epTcp, 2000); /* 2000 ms */
|
||||
msg=GWEN_MsgEndpoint_TakeFirstReceivedMessage(epTcp);
|
||||
if (msg) {
|
||||
if (GWEN_IpcMsg_GetCode(msg)==AQH_MSGTYPE_IPC_FORWARD) {
|
||||
GWEN_MSG *nodeMsg;
|
||||
@@ -103,7 +103,7 @@ GWEN_MSG *Utils_WaitForSpecificNodeMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
|
||||
|
||||
|
||||
GWEN_MSG *Utils_WaitForSpecificIpcMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
GWEN_MSG *Utils_WaitForSpecificIpcMessage(GWEN_MSG_ENDPOINT *epTcp,
|
||||
int msgCode,
|
||||
int timeoutInSeconds)
|
||||
{
|
||||
@@ -115,8 +115,8 @@ GWEN_MSG *Utils_WaitForSpecificIpcMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
GWEN_MSG *msg;
|
||||
time_t now;
|
||||
|
||||
GWEN_MsgEndpoint2_IoLoop(epTcp, 2000); /* 2000 ms */
|
||||
msg=GWEN_MsgEndpoint2_TakeFirstReceivedMessage(epTcp);
|
||||
GWEN_MsgEndpoint_IoLoop(epTcp, 2000); /* 2000 ms */
|
||||
msg=GWEN_MsgEndpoint_TakeFirstReceivedMessage(epTcp);
|
||||
if (msg) {
|
||||
uint16_t code;
|
||||
|
||||
@@ -143,16 +143,16 @@ GWEN_MSG *Utils_WaitForSpecificIpcMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
|
||||
|
||||
|
||||
int Utils_FlushOutMessageQueue(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds)
|
||||
int Utils_FlushOutMessageQueue(GWEN_MSG_ENDPOINT *epTcp, int timeoutInSeconds)
|
||||
{
|
||||
time_t startTime;
|
||||
|
||||
startTime=time(NULL);
|
||||
|
||||
while(GWEN_MsgEndpoint2_HaveMessageToSend(epTcp)) {
|
||||
while(GWEN_MsgEndpoint_HaveMessageToSend(epTcp)) {
|
||||
time_t now;
|
||||
|
||||
GWEN_MsgEndpoint2_IoLoop(epTcp, 2000); /* 2000 ms */
|
||||
GWEN_MsgEndpoint_IoLoop(epTcp, 2000); /* 2000 ms */
|
||||
now=time(NULL);
|
||||
if (now-startTime>timeoutInSeconds) {
|
||||
DBG_INFO(NULL, "Timeout");
|
||||
@@ -165,7 +165,7 @@ int Utils_FlushOutMessageQueue(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds)
|
||||
|
||||
|
||||
|
||||
int Utils_SendAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *epTcp, uint32_t groups)
|
||||
int Utils_SendAcceptedMsgGroups(GWEN_MSG_ENDPOINT *epTcp, uint32_t groups)
|
||||
{
|
||||
GWEN_MSG *msgOut;
|
||||
|
||||
@@ -174,7 +174,7 @@ int Utils_SendAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *epTcp, uint32_t groups)
|
||||
DBG_ERROR(NULL, "Error creating message");
|
||||
return GWEN_ERROR_GENERIC;
|
||||
}
|
||||
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
|
||||
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,24 +11,24 @@
|
||||
|
||||
|
||||
#include <gwenhywfar/db.h>
|
||||
#include <gwenhywfar/endpoint2.h>
|
||||
#include <gwenhywfar/endpoint.h>
|
||||
|
||||
|
||||
|
||||
GWEN_MSG_ENDPOINT2 *Utils_SetupIpcEndpoint(GWEN_DB_NODE *dbArgs);
|
||||
GWEN_MSG_ENDPOINT *Utils_SetupIpcEndpoint(GWEN_DB_NODE *dbArgs);
|
||||
|
||||
GWEN_MSG *Utils_WaitForSpecificNodeMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
GWEN_MSG *Utils_WaitForSpecificNodeMessage(GWEN_MSG_ENDPOINT *epTcp,
|
||||
int msgCode,
|
||||
int nodeAddr,
|
||||
int timeoutInSeconds);
|
||||
|
||||
GWEN_MSG *Utils_WaitForSpecificIpcMessage(GWEN_MSG_ENDPOINT2 *epTcp,
|
||||
GWEN_MSG *Utils_WaitForSpecificIpcMessage(GWEN_MSG_ENDPOINT *epTcp,
|
||||
int msgCode,
|
||||
int timeoutInSeconds);
|
||||
|
||||
int Utils_FlushOutMessageQueue(GWEN_MSG_ENDPOINT2 *epTcp, int timeoutInSeconds);
|
||||
int Utils_FlushOutMessageQueue(GWEN_MSG_ENDPOINT *epTcp, int timeoutInSeconds);
|
||||
|
||||
int Utils_SendAcceptedMsgGroups(GWEN_MSG_ENDPOINT2 *epTcp, uint32_t groups);
|
||||
int Utils_SendAcceptedMsgGroups(GWEN_MSG_ENDPOINT *epTcp, uint32_t groups);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user