From 8a0db8cb8b685c5af1cfaa9d537578d753370e7f Mon Sep 17 00:00:00 2001
From: SASANO Takayoshi <uaa@uaa.org.uk>
Date: Fri, 3 Jul 2020 04:40:41 +0900
Subject: [PATCH] NXDNIcomNetwork: IPv6 support

---
 NXDNIcomNetwork.cpp | 22 ++++++++--------------
 NXDNIcomNetwork.h   |  4 ++--
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/NXDNIcomNetwork.cpp b/NXDNIcomNetwork.cpp
index 2f3767b..3b340cc 100644
--- a/NXDNIcomNetwork.cpp
+++ b/NXDNIcomNetwork.cpp
@@ -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) :
 m_socket(localAddress, localPort),
 m_address(),
-m_port(gatewayPort),
+m_addrlen(),
 m_debug(debug),
 m_enabled(false),
 m_buffer(1000U, "NXDN Network")
@@ -39,7 +39,7 @@ m_buffer(1000U, "NXDN Network")
 	assert(gatewayPort > 0U);
 	assert(!gatewayAddress.empty());
 
-	m_address = CUDPSocket::lookup(gatewayAddress);
+	CUDPSocket::lookup(gatewayAddress, gatewayPort, m_address, m_addrlen);
 }
 
 CNXDNIcomNetwork::~CNXDNIcomNetwork()
@@ -50,7 +50,7 @@ bool CNXDNIcomNetwork::open()
 {
 	LogMessage("Opening NXDN network connection");
 
-	if (m_address.s_addr == INADDR_NONE)
+	if (CUDPSocket::isnone(m_address))
 		return false;
 
 	return m_socket.open();
@@ -100,25 +100,19 @@ bool CNXDNIcomNetwork::write(const unsigned char* data, NXDN_NETWORK_MESSAGE_TYP
 	if (m_debug)
 		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)
 {
 	unsigned char buffer[BUFFER_LENGTH];
 
-	in_addr address;
-	unsigned int port;
-	int length = m_socket.read(buffer, BUFFER_LENGTH, address, port);
-	if (length <= 0)
+	sockaddr_storage address;
+	unsigned int addrlen;
+	int length = m_socket.read(buffer, BUFFER_LENGTH, address, addrlen);
+	if (length <= 0 || !CUDPSocket::match(m_address, address))
 		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?
 	if (::memcmp(buffer, "ICOM", 4U) != 0)
 		return;
diff --git a/NXDNIcomNetwork.h b/NXDNIcomNetwork.h
index 05fb023..18bdd97 100644
--- a/NXDNIcomNetwork.h
+++ b/NXDNIcomNetwork.h
@@ -49,8 +49,8 @@ public:
 
 private:
 	CUDPSocket                 m_socket;
-	in_addr                    m_address;
-	unsigned int               m_port;
+	sockaddr_storage           m_address;
+	unsigned int               m_addrlen;
 	bool                       m_debug;
 	bool                       m_enabled;
 	CRingBuffer<unsigned char> m_buffer;