Преглед изворни кода

cmRtNet.c: More changes to cmRtNetTest().

master
kevin пре 11 година
родитељ
комит
317d40b9d9
1 измењених фајлова са 5 додато и 3 уклоњено
  1. 5
    3
      cmRtNet.c

+ 5
- 3
cmRtNet.c Прегледај датотеку

522
   cmRtNetNode_t*   np = NULL;
522
   cmRtNetNode_t*   np = NULL;
523
   cmRtNetSyncMsg_t m;
523
   cmRtNetSyncMsg_t m;
524
 
524
 
525
-  assert( p->syncModeFl );
525
+  assert( cmRtNetIsSyncModeMsg(data,dataByteCnt));
526
   
526
   
527
   if( _cmRtNetDeserializeSyncMsg(data,dataByteCnt,&m) != kOkNetRC )
527
   if( _cmRtNetDeserializeSyncMsg(data,dataByteCnt,&m) != kOkNetRC )
528
   {
528
   {
587
       break;
587
       break;
588
 
588
 
589
     case kHelloAckSelNetId: // master response
589
     case kHelloAckSelNetId: // master response
590
+      assert( p->syncModeFl );
590
       _cmRtNetRpt(p,"rcv hello ack\n");
591
       _cmRtNetRpt(p,"rcv hello ack\n");
591
       rc = _cmRtNetRecvAck(p,fromAddr,kWaitHelloAckStNetId,kSendEndpointStNetId);
592
       rc = _cmRtNetRecvAck(p,fromAddr,kWaitHelloAckStNetId,kSendEndpointStNetId);
592
       break;
593
       break;
593
 
594
 
594
     case kEndpointAckSelNetId: // master response
595
     case kEndpointAckSelNetId: // master response
596
+      assert( p->syncModeFl );  
595
       _cmRtNetRpt(p,"rcv endpoint ack\n");
597
       _cmRtNetRpt(p,"rcv endpoint ack\n");
596
       rc = _cmRtNetRecvAck(p,fromAddr,kWaitEndpointAckStNetId,kSendEndpointStNetId);
598
       rc = _cmRtNetRecvAck(p,fromAddr,kWaitEndpointAckStNetId,kSendEndpointStNetId);
597
       break;
599
       break;
643
       {
645
       {
644
         cmTimeSpec_t t;
646
         cmTimeSpec_t t;
645
         cmTimeGet(&t);
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
           const cmChar_t* ackStr = np->state==kWaitHelloAckStNetId ? "hello" : "endpoint";
651
           const cmChar_t* ackStr = np->state==kWaitHelloAckStNetId ? "hello" : "endpoint";
650
           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);         
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);         

Loading…
Откажи
Сачувај