cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmRtNet.c: More changes to cmRtNetTest().

Browse Source
This commit is contained in:
kpl 2013-04-26 15:54:54 -07:00
parent 01973701f8
commit 81b753e2ad
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmRtNet.c
View File

@ -11,7 +11,7 @@
enum enum
{ {
kLocalNetFl = 0x01, kLocalNetFl = 0x01,
kSockAddrNetFl = 0x02 kSockAddrNetFl = 0x02
}; };
@ -191,6 +191,7 @@ cmRtNetRC_t _cmRtNetReleaseNode( cmRtNet_t* p, cmRtNetNode_t* np )
cmRtNetRC_t _cmRtNetCreateNode( cmRtNet_t* p, const cmChar_t* label, const cmChar_t* addr, cmUdpPort_t port, const struct sockaddr_in* saddr ) cmRtNetRC_t _cmRtNetCreateNode( cmRtNet_t* p, const cmChar_t* label, const cmChar_t* addr, cmUdpPort_t port, const struct sockaddr_in* saddr )
{ {
cmRtNetRC_t rc = kOkNetRC;
cmRtNetNode_t* np; cmRtNetNode_t* np;
if( label == NULL ) if( label == NULL )
@ -216,12 +217,20 @@ cmRtNetRC_t _cmRtNetCreateNode( cmRtNet_t* p, const cmChar_t* label, const cmCha
p->localNode = np; p->localNode = np;
if( saddr != NULL ) if( saddr != NULL )
{
np->sockaddr = *saddr; np->sockaddr = *saddr;
np->flags = cmSetFlag(np->flags,kSockAddrNetFl); else
{
if( cmUdpInitAddr(p->udpH, np->addr, np->port, &np->sockaddr ) != kOkUdpRC )
{
rc = cmErrMsg(&p->err,kUdpPortFailNetRC,"IP::port to socket address conversion failed.");
goto errLabel;
}
} }
return kOkNetRC; np->flags = cmSetFlag(np->flags,kSockAddrNetFl);
errLabel:
return rc;
} }
cmRtNetEnd_t* _cmRtNetFindNodeEnd(cmRtNetNode_t* np, const cmChar_t* endPtLabel ) cmRtNetEnd_t* _cmRtNetFindNodeEnd(cmRtNetNode_t* np, const cmChar_t* endPtLabel )
@ -296,6 +305,7 @@ cmRtNetRC_t _cmRtNetSendSyncMsg( cmRtNet_t* p, cmRtNetNode_t* np, cmRtNetSelId_t
{ {
cmRtNetSyncMsg_t m; cmRtNetSyncMsg_t m;
cmRtNetRC_t rc = kOkNetRC; cmRtNetRC_t rc = kOkNetRC;
cmUdpRC_t udpRC = kOkUdpRC;
m.hdr.rtSubIdx = cmInvalidIdx; m.hdr.rtSubIdx = cmInvalidIdx;
m.hdr.selId = kNetSyncSelRtId; m.hdr.selId = kNetSyncSelRtId;
@ -315,12 +325,12 @@ cmRtNetRC_t _cmRtNetSendSyncMsg( cmRtNet_t* p, cmRtNetNode_t* np, cmRtNetSelId_t
cmRtNetNodeState_t orgState = np->state; cmRtNetNodeState_t orgState = np->state;
np->state = nextStId; np->state = nextStId;
// send the msg // send the msg
cmUdpRC_t udpRC; if( cmIsFlag(np->flags,kSockAddrNetFl) == false )
if( cmIsFlag(np->flags,kSockAddrNetFl) )
udpRC = cmUdpSendTo(p->udpH, buf, n, &np->sockaddr );
else
udpRC = cmUdpSend2(p->udpH, buf, n, np->addr, np->port ); udpRC = cmUdpSend2(p->udpH, buf, n, np->addr, np->port );
else
udpRC = cmUdpSendTo(p->udpH, buf, n, &np->sockaddr );
// check for send errors // check for send errors
if( udpRC != kOkUdpRC ) if( udpRC != kOkUdpRC )