ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2025-08-03 05:22:24 -04:00
Code Issues Projects Releases Wiki Activity

Validate the NXDN protocol in the Parrot and Gateway.

Browse Source
This commit is contained in:
Jonathan Naylor 2018-03-15 19:21:59 +00:00
parent 6db1672ff7
commit 14ef0fb080
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NXDNGateway/IcomNetwork.cpp
View File

@ -91,16 +91,16 @@ void CIcomNetwork::clock(unsigned int ms)
if (length <= 0) if (length <= 0)
return; return;
// Invalid packet type?
if (::memcmp(buffer, "ICOM", 4U) != 0)
return;
// Check if the data is for us // Check if the data is for us
if (m_address.s_addr != address.s_addr || port != m_port) { if (m_address.s_addr != address.s_addr || port != m_port) {
LogMessage("Icom packet received from an invalid source, %08X != %08X and/or %u != %u", m_address.s_addr, address.s_addr, m_port, port); LogMessage("Icom packet received from an invalid source, %08X != %08X and/or %u != %u", m_address.s_addr, address.s_addr, m_port, port);
return; return;
} }
// Invalid packet type?
if (::memcmp(buffer, "ICOM", 4U) != 0)
return;
// An Icom repeater connect request // An Icom repeater connect request
if (buffer[4U] == 0x01U && buffer[5U] == 0x61U) { if (buffer[4U] == 0x01U && buffer[5U] == 0x61U) {
buffer[5U] = 0x62U; buffer[5U] = 0x62U;

10
NXDNGateway/NXDNNetwork.cpp
View File

@ -130,10 +130,14 @@ unsigned int CNXDNNetwork::readData(unsigned char* data, unsigned int length, in
if (len <= 0) if (len <= 0)
return 0U; return 0U;
if (m_debug) if ((::memcmp(data, "NXDNP", 5U) == 0 && len == 15) || (::memcmp(data, "NXDND", 5U) == 0 && len == 43)) {
CUtils::dump(1U, "NXDN Network Data Received", data, len); if (m_debug)
CUtils::dump(1U, "NXDN Network Data Received", data, len);
return len; return len;
}
return 0U;
} }
void CNXDNNetwork::close() void CNXDNNetwork::close()

4
NXDNParrot/Network.cpp
View File

@ -66,9 +66,9 @@ void CNetwork::clock(unsigned int ms)
m_address.s_addr = address.s_addr; m_address.s_addr = address.s_addr;
m_port = port; m_port = port;
if (::memcmp(buffer, "NXDNP", 5U) == 0) { // A poll if (::memcmp(buffer, "NXDNP", 5U) == 0 && length == 15) { // A poll
write(buffer, length); write(buffer, length);
} else if (::memcmp(buffer, "NXDND", 5U) == 0) { } else if (::memcmp(buffer, "NXDND", 5U) == 0 && length == 43) {
unsigned char l = length; unsigned char l = length;
m_buffer.addData(&l, 1U); m_buffer.addData(&l, 1U);
m_buffer.addData(buffer, length); m_buffer.addData(buffer, length);