|
@@ -634,7 +634,7 @@ cmRtRC_t _cmRtSysEnable( cmRt_t* p, bool enableFl )
|
634
|
634
|
{
|
635
|
635
|
_cmRtCfg_t* cp = p->ssArray + i;
|
636
|
636
|
if( cmRtNetIsValid(cp->netH) )
|
637
|
|
- if( cmRtNetBeginSyncMode(cp->netH) != kOkNetRC )
|
|
637
|
+ if( cmRtNetDoSync(cp->netH) != kOkNetRC )
|
638
|
638
|
rc = cmErrMsg(&p->err,kNetErrRtRC,"Network Mgr. failed on entering sync mode.");
|
639
|
639
|
}
|
640
|
640
|
|
|
@@ -944,16 +944,12 @@ cmRtRC_t cmRtSysCfg( cmRtSysH_t h, const cmRtSysSubSys_t* ss, unsigned rtSubIdx
|
944
|
944
|
goto errLabel;
|
945
|
945
|
}
|
946
|
946
|
|
947
|
|
- // register the local and remote notes
|
948
|
|
- for(j=0; j<ss->netNodeCnt; ++j)
|
|
947
|
+ if( cmRtNetInitialize( cp->netH, ss->bcastAddr, ss->localNodeLabel, ss->localIpAddr, ss->localIpPort) != kOkNetRC )
|
949
|
948
|
{
|
950
|
|
- cmRtSysNetNode_t* nn = ss->netNodeArray + j;
|
951
|
|
- if( cmRtNetRegisterLocalNode( cp->netH, nn->label, nn->ipAddr, nn->ipPort) != kOkNetRC )
|
952
|
|
- {
|
953
|
|
- rc = _cmRtError(p,kNetErrRtRC,"Network node allocation failed on label:%s addr:%s port:%i.",cmStringNullGuard(nn->label),cmStringNullGuard(nn->ipAddr),nn->ipPort);
|
954
|
|
- goto errLabel;
|
955
|
|
- }
|
|
949
|
+ rc = _cmRtError(p,kNetErrRtRC,"Network node initialization failed on label:%s addr:%s port:%i.",cmStringNullGuard(ss->localNodeLabel),cmStringNullGuard(ss->localIpAddr),ss->localIpPort);
|
|
950
|
+ goto errLabel;
|
956
|
951
|
}
|
|
952
|
+
|
957
|
953
|
|
958
|
954
|
// register the local endpoints
|
959
|
955
|
for(j=0; j<ss->endptCnt; ++j)
|