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

cmRtNet.h/c: More changes to cmRtNetTest().

Browse Source
This commit is contained in:
kevin 2013-04-26 13:19:55 -07:00
parent 75f3882a61
commit 19ec97b2b4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmRtNet.c
View File

@ -759,6 +759,7 @@ void cmRtNetReport( cmRtNetH_t h )
//========================================================================== //==========================================================================
#include "cmThread.h"
typedef struct typedef struct
{ {
@ -768,7 +769,7 @@ typedef struct
void _cmRtNetTestRecv( void* cbArg, const char* data, unsigned dataByteCnt, const struct sockaddr_in* fromAddr ) void _cmRtNetTestRecv( void* cbArg, const char* data, unsigned dataByteCnt, const struct sockaddr_in* fromAddr )
{ {
_cmRtNetTest_t* p = (_cmrtNetTest_t*)cbArg; _cmRtNetTest_t* p = (_cmRtNetTest_t*)cbArg;
if( cmRtNetIsSyncModeMsg(data,dataByteCnt)) if( cmRtNetIsSyncModeMsg(data,dataByteCnt))
cmRtNetSyncModeRecv(p->netH,data,dataByteCnt,fromAddr); cmRtNetSyncModeRecv(p->netH,data,dataByteCnt,fromAddr);
@ -778,7 +779,7 @@ void _cmRtNetTestRecv( void* cbArg, const char* data, unsigned dataByteCnt, cons
bool _cmRtNetTestThreadFunc(void* param) bool _cmRtNetTestThreadFunc(void* param)
{ {
_cmrtNetTest_t* p = (_cmRtNetTest_t*)param; _cmRtNetTest_t* p = (_cmRtNetTest_t*)param;
if( cmRtNetIsValid(p->netH) && cmRtNetIsInSyncMode(p->netH) ) if( cmRtNetIsValid(p->netH) && cmRtNetIsInSyncMode(p->netH) )
@ -787,7 +788,7 @@ bool _cmRtNetTestThreadFunc(void* param)
return true; return true;
} }
void cmRtNetTest( cmCtx_t* ctx, bool mstrFl ) void cmRtNetTest( cmCtx_t* ctx, bool mstrFl )
{ {
char c; char c;
_cmRtNetTest_t t; _cmRtNetTest_t t;
@ -799,7 +800,7 @@ void cmRtNetTest( cmCtx_t* ctx, bool mstrFl )
if( cmThreadCreate(&p->thH,_cmRtNetTestThreadFunc,p,&ctx->rpt) != kOkThRC ) if( cmThreadCreate(&p->thH,_cmRtNetTestThreadFunc,p,&ctx->rpt) != kOkThRC )
goto errLabel; goto errLabel;
if((rc = cmRtNetAlloc(ctx,&p->netH,p)) != kOkNetRC ) if((rc = cmRtNetAlloc(ctx,&p->netH,_cmRtNetTestRecv,p)) != kOkNetRC )
goto errLabel; goto errLabel;
if((rc = cmRtNetCreateNode(p->netH, "local", NULL, port )) != kOkNetRC) if((rc = cmRtNetCreateNode(p->netH, "local", NULL, port )) != kOkNetRC)
@ -807,10 +808,10 @@ void cmRtNetTest( cmCtx_t* ctx, bool mstrFl )
if( mstrFl ) if( mstrFl )
{ {
if((rc = cmRtNetCreate(p->netH,"whirl", "192.168.15.109", port )) != kOkNetRC ) if((rc = cmRtNetCreateNode(p->netH,"whirl", "192.168.15.109", port )) != kOkNetRC )
goto errLabel; goto errLabel;
if((rc = cmRtNetEndPoint(p->netH,"thunk_ep0", 0 )) != kOkNetRC ) if((rc = cmRtNetRegisterEndPoint(p->netH,"thunk_ep0", 0 )) != kOkNetRC )
goto errLabel; goto errLabel;
if(( rc = cmRtNetBeginSyncMode(p->netH)) != kOkNetRC ) if(( rc = cmRtNetBeginSyncMode(p->netH)) != kOkNetRC )
@ -819,7 +820,7 @@ void cmRtNetTest( cmCtx_t* ctx, bool mstrFl )
} }
else else
{ {
if((rc = cmRtNetEndPoint(p->netH,"whirl_ep0", 0 )) != kOkNetRC ) if((rc = cmRtNetRegisterEndPoint(p->netH,"whirl_ep0", 0 )) != kOkNetRC )
goto errLabel; goto errLabel;
} }

2
cmRtNet.h
View File

@ -87,7 +87,7 @@ extern "C" {
void cmRtNetReport( cmRtNetH_t h ); void cmRtNetReport( cmRtNetH_t h );
void cmRtNetTest( cmCtx_t* ctx ); void cmRtNetTest( cmCtx_t* ctx, bool mstrFl );
/* /*
Master: Master: