cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwEuCon.cpp : Debug watch-dog logic.

Browse Source
This commit is contained in:
kevin 2020-04-17 15:15:17 -04:00
parent 16fb46f5f9
commit 9ec4c131b5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cwEuCon.cpp
View File

@ -382,8 +382,8 @@ namespace cw
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
if((rc = sock::destroy(fb->eucon->sockMgrH, fb->sockUserId)) != kOkRC ) //if((rc = sock::destroy(fb->eucon->sockMgrH, fb->sockUserId)) != kOkRC )
rc = cwLogError(rc,"Socket destroy failed on disconnect attempt on fader bank index:%i.",fb->fbIndex); // rc = cwLogError(rc,"Socket destroy failed on disconnect attempt on fader bank index:%i.",fb->fbIndex);
fb->protoState = kSendHandshake_0_Id; fb->protoState = kSendHandshake_0_Id;
@ -398,7 +398,7 @@ namespace cw
// send the initial handshake // send the initial handshake
if((rc = sock::send( fb->eucon->sockMgrH, fb->sockUserId, kInvalidId, buf, bufByteN )) != kOkRC ) if((rc = sock::send( fb->eucon->sockMgrH, fb->sockUserId, kInvalidId, buf, bufByteN )) != kOkRC )
{ {
rc = cwLogError(rc,"TCP '%s' send failed on fader bank index:%i. Disconnecting.",fb->fbIndex); rc = cwLogError(rc,"TCP send failed on fader bank index:%i proto:%i Disconnecting.",fb->fbIndex,fb->protoState);
_disconnect(fb); _disconnect(fb);
} }
@ -549,8 +549,8 @@ namespace cw
} }
//printf("fbi: %i : proto:%i rcv\n",fb->fbIndex,fb->protoState);
time::futureMs(fb->nextRecvHbTs,fb->eucon->heartBeatPeriodMs+1000); time::futureMs(fb->nextRecvHbTs,fb->eucon->heartBeatPeriodMs*2);
} }
@ -598,6 +598,8 @@ namespace cw
fb->remoteAddr = fromAddr->sin_addr.s_addr; fb->remoteAddr = fromAddr->sin_addr.s_addr;
time::futureMs(fb->nextRecvHbTs,fb->eucon->heartBeatPeriodMs*2);
// Send the initial handshake to the fader bank // Send the initial handshake to the fader bank
_sendHandshake_0( fb ); _sendHandshake_0( fb );
@ -735,7 +737,7 @@ cw::rc_t cw::eucon::exec( handle_t h, unsigned sockTimeOutMs )
// check the health of each fader bank // check the health of each fader bank
for(fbank_t* fb = p->fbankL; fb!=nullptr; fb=fb->link) for(fbank_t* fb = p->fbankL; fb!=nullptr; fb=fb->link)
if( fb->protoState == kRunning_Id ) if( fb->protoState != kSendHandshake_0_Id )
{ {
// has it been more than 'heartBeatPerioMs' millisecnods since we received a msg from this fader bank // has it been more than 'heartBeatPerioMs' millisecnods since we received a msg from this fader bank