Merge branch 'master' into IPv6
This commit is contained in:
commit
cccb5eb372
3 changed files with 12 additions and 0 deletions
|
@ -209,6 +209,10 @@ void CYSFNetwork::clock(unsigned int ms)
|
|||
if (::memcmp(buffer, "YSFO", 4U) == 0)
|
||||
return;
|
||||
|
||||
// Throw away any info messages
|
||||
if (::memcmp(buffer, "YSFI", 4U) == 0)
|
||||
return;
|
||||
|
||||
if (::memcmp(buffer, "YSFP", 4U) == 0 && !m_linked) {
|
||||
if (strcmp(m_name.c_str(),"MMDVM")== 0)
|
||||
LogMessage("Link successful to %s", m_name.c_str());
|
||||
|
|
|
@ -93,6 +93,10 @@ unsigned int CNetwork::read(unsigned char* data)
|
|||
if (::memcmp(data, "YSFO", 4U) == 0)
|
||||
return 0U;
|
||||
|
||||
// Throw away incoming info messages
|
||||
if (::memcmp(data, "YSFI", 4U) == 0)
|
||||
return 0U;
|
||||
|
||||
// Handle incoming unlinks
|
||||
if (::memcmp(data, "YSFU", 4U) == 0)
|
||||
return 0U;
|
||||
|
|
|
@ -111,6 +111,10 @@ unsigned int CNetwork::readData(unsigned char* data, unsigned int length, sockad
|
|||
if (::memcmp(data, "YSFO", 4U) == 0)
|
||||
return 0U;
|
||||
|
||||
// Throw away any info messages
|
||||
if (::memcmp(data, "YSFI", 4U) == 0)
|
||||
return 0U;
|
||||
|
||||
// Handle incoming status requests
|
||||
if (::memcmp(data, "YSFS", 4U) == 0) {
|
||||
m_socket.write(m_status, 42U, addr, addrLen);
|
||||
|
|
Loading…
Reference in a new issue