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

cwEuCon.cpp : Fixed bug where multiple handshake-0's could be sent.

Browse Source
This commit is contained in:
kevin.larke 2020-04-04 09:28:32 -04:00
parent 3a840015cf
commit c266475c99
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cwEuCon.cpp
View File

@ -571,21 +571,24 @@ namespace cw
return cwLogError(kOpFailRC,"The fader bank index %i failed.", fbIndex ); return cwLogError(kOpFailRC,"The fader bank index %i failed.", fbIndex );
} }
// convert the fromAddr to a string if( fb->protoState == kSendHandshake_0_Id )
if((rc = sock::addrToString( fromAddr, fbIP, INET_ADDRSTRLEN)) != kOkRC ) {
return cwLogError(rc,"IP address to string conversion failed.", fbIndex); // convert the fromAddr to a string
if((rc = sock::addrToString( fromAddr, fbIP, INET_ADDRSTRLEN)) != kOkRC )
return cwLogError(rc,"IP address to string conversion failed.", fbIndex);
// create the TCP socket // create the TCP socket
if((rc = sock::create( p->sockMgrH, fb->sockUserId, sock::kInvalidPortNumber, tcpFlags, p->sockTimeOutMs, _tcpCallback, p, fbIP, p->faderTcpPort )) != kOkRC ) if((rc = sock::create( p->sockMgrH, fb->sockUserId, sock::kInvalidPortNumber, tcpFlags, p->sockTimeOutMs, _tcpCallback, p, fbIP, p->faderTcpPort )) != kOkRC )
return cwLogError(rc,"The TCP socket for fader bank index %i failed. ", fbIndex); return cwLogError(rc,"The TCP socket for fader bank index %i failed. ", fbIndex);
fb->remoteAddr = fromAddr->sin_addr.s_addr; fb->remoteAddr = fromAddr->sin_addr.s_addr;
// Send the initial handshake to the fader bank // Send the initial handshake to the fader bank
_sendHandshake_0( fb ); _sendHandshake_0( fb );
fb->protoState = kWaitForHandshake_1_Id;
fb->protoState = kWaitForHandshake_1_Id;
}
return rc; return rc;
} }
@ -608,7 +611,6 @@ namespace cw
// if this a 'MC Mix' DNS-SD SRV reply // if this a 'MC Mix' DNS-SD SRV reply
if( strncmp(label, name+1, strlen(label)) == 0 ) if( strncmp(label, name+1, strlen(label)) == 0 )
{ {
unsigned n = strlen(label); unsigned n = strlen(label);
if((rc = _on_McMix_DNS_SD_TXT( p, name+n+1, name[0]-n, fromAddr )) != kOkRC ) if((rc = _on_McMix_DNS_SD_TXT( p, name+n+1, name[0]-n, fromAddr )) != kOkRC )