Merge branch 'master' into IPv6

This commit is contained in:
Jonathan Naylor 2020-09-06 21:30:35 +01:00
commit bbe1a50745
4 changed files with 27 additions and 12 deletions

View file

@ -104,15 +104,19 @@ unsigned int CNetwork::readData(unsigned char* data, unsigned int length, sockad
if (len <= 0)
return 0U;
if (m_debug)
CUtils::dump(1U, "YSF Network Data Received", data, len);
// Throw away any options messages
if (::memcmp(data, "YSFO", 4U) == 0)
return 0U;
// Handle incoming status requests
if (::memcmp(data, "YSFS", 4U) == 0) {
m_socket.write(m_status, 42U, addr, addrLen);
return 0U;
}
if (m_debug)
CUtils::dump(1U, "YSF Network Data Received", data, len);
return len;
}