|
@@ -522,7 +522,7 @@ cmRtNetRC_t cmRtNetSyncModeRecv( cmRtNetH_t h, const char* data, unsigned dataB
|
522
|
522
|
cmRtNetNode_t* np = NULL;
|
523
|
523
|
cmRtNetSyncMsg_t m;
|
524
|
524
|
|
525
|
|
- assert( p->syncModeFl );
|
|
525
|
+ assert( cmRtNetIsSyncModeMsg(data,dataByteCnt));
|
526
|
526
|
|
527
|
527
|
if( _cmRtNetDeserializeSyncMsg(data,dataByteCnt,&m) != kOkNetRC )
|
528
|
528
|
{
|
|
@@ -587,11 +587,13 @@ cmRtNetRC_t cmRtNetSyncModeRecv( cmRtNetH_t h, const char* data, unsigned dataB
|
587
|
587
|
break;
|
588
|
588
|
|
589
|
589
|
case kHelloAckSelNetId: // master response
|
|
590
|
+ assert( p->syncModeFl );
|
590
|
591
|
_cmRtNetRpt(p,"rcv hello ack\n");
|
591
|
592
|
rc = _cmRtNetRecvAck(p,fromAddr,kWaitHelloAckStNetId,kSendEndpointStNetId);
|
592
|
593
|
break;
|
593
|
594
|
|
594
|
595
|
case kEndpointAckSelNetId: // master response
|
|
596
|
+ assert( p->syncModeFl );
|
595
|
597
|
_cmRtNetRpt(p,"rcv endpoint ack\n");
|
596
|
598
|
rc = _cmRtNetRecvAck(p,fromAddr,kWaitEndpointAckStNetId,kSendEndpointStNetId);
|
597
|
599
|
break;
|
|
@@ -643,8 +645,8 @@ cmRtNetRC_t _cmRtNetSendNodeSync( cmRtNet_t* p, cmRtNetNode_t* np )
|
643
|
645
|
{
|
644
|
646
|
cmTimeSpec_t t;
|
645
|
647
|
cmTimeGet(&t);
|
646
|
|
- unsigned fiveSecs = 5000000;
|
647
|
|
- if( cmTimeElapsedMicros(&np->lastSendTime,&t) > fiveSecs)
|
|
648
|
+ unsigned twentySecs = 20000000;
|
|
649
|
+ if( cmTimeElapsedMicros(&np->lastSendTime,&t) > twentySecs)
|
648
|
650
|
{
|
649
|
651
|
const cmChar_t* ackStr = np->state==kWaitHelloAckStNetId ? "hello" : "endpoint";
|
650
|
652
|
rc = cmErrMsg(&p->err,kTimeOutErrNetRC,"The node %s:%s:%i did not give a '%s' acknowledge.",cmStringNullGuard(np->label),cmStringNullGuard(np->addr),np->port,ackStr);
|