g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

NXDNIcomNetwork: IPv6 support

Browse source
This commit is contained in:
SASANO Takayoshi 2020-07-03 04:40:41 +09:00
parent 6de0bdb536
commit 8a0db8cb8b
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
NXDNIcomNetwork.cpp
View file

@ -31,7 +31,7 @@ const unsigned int BUFFER_LENGTH = 200U;
CNXDNIcomNetwork::CNXDNIcomNetwork(const std::string& localAddress, unsigned int localPort, const std::string& gatewayAddress, unsigned int gatewayPort, bool debug) : CNXDNIcomNetwork::CNXDNIcomNetwork(const std::string& localAddress, unsigned int localPort, const std::string& gatewayAddress, unsigned int gatewayPort, bool debug) :
m_socket(localAddress, localPort), m_socket(localAddress, localPort),
m_address(), m_address(),
m_port(gatewayPort), m_addrlen(),
m_debug(debug), m_debug(debug),
m_enabled(false), m_enabled(false),
m_buffer(1000U, "NXDN Network") m_buffer(1000U, "NXDN Network")
@ -39,7 +39,7 @@ m_buffer(1000U, "NXDN Network")
assert(gatewayPort > 0U); assert(gatewayPort > 0U);
assert(!gatewayAddress.empty()); assert(!gatewayAddress.empty());
m_address = CUDPSocket::lookup(gatewayAddress); CUDPSocket::lookup(gatewayAddress, gatewayPort, m_address, m_addrlen);
} }
CNXDNIcomNetwork::~CNXDNIcomNetwork() CNXDNIcomNetwork::~CNXDNIcomNetwork()
@ -50,7 +50,7 @@ bool CNXDNIcomNetwork::open()
{ {
LogMessage("Opening NXDN network connection"); LogMessage("Opening NXDN network connection");
if (m_address.s_addr == INADDR_NONE) if (CUDPSocket::isnone(m_address))
return false; return false;
return m_socket.open(); return m_socket.open();
@ -100,25 +100,19 @@ bool CNXDNIcomNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_TYP
if (m_debug) if (m_debug)
CUtils::dump(1U, "NXDN Network Data Sent", buffer, 102U); CUtils::dump(1U, "NXDN Network Data Sent", buffer, 102U);
return m_socket.write(buffer, 102U, m_address, m_port); return m_socket.write(buffer, 102U, m_address, m_addrlen);
} }
void CNXDNIcomNetwork::clock(unsigned int ms) void CNXDNIcomNetwork::clock(unsigned int ms)
{ {
unsigned char buffer[BUFFER_LENGTH]; unsigned char buffer[BUFFER_LENGTH];
in_addr address; sockaddr_storage address;
unsigned int port; unsigned int addrlen;
int length = m_socket.read(buffer, BUFFER_LENGTH, address, port); int length = m_socket.read(buffer, BUFFER_LENGTH, address, addrlen);
if (length <= 0) if (length <= 0 || !CUDPSocket::match(m_address, address))
return; return;
// Check if the data is for us
if (m_address.s_addr != address.s_addr || port != m_port) {
LogMessage("NXDN packet received from an invalid source, %08X != %08X and/or %u != %u", m_address.s_addr, address.s_addr, m_port, port);
return;
}
// Invalid packet type? // Invalid packet type?
if (::memcmp(buffer, "ICOM", 4U) != 0) if (::memcmp(buffer, "ICOM", 4U) != 0)
return; return;

4
NXDNIcomNetwork.h
View file

@ -49,8 +49,8 @@ public:
private: private:
CUDPSocket m_socket; CUDPSocket m_socket;
in_addr m_address; sockaddr_storage m_address;
unsigned int m_port; unsigned int m_addrlen;
bool m_debug; bool m_debug;
bool m_enabled; bool m_enabled;
CRingBuffer<unsigned char> m_buffer; CRingBuffer<unsigned char> m_buffer;