From 47bc9c5bcd06acb4a98f7f2398421e31415b91ec Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Wed, 23 Oct 2019 05:48:04 +0900 Subject: [PATCH 1/7] use system default compiler replaced gcc/g++ with cc/c++ to support Clang-based system (e.g. OpenBSD). --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a2614c9..2414e70 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -CC = gcc -CXX = g++ +CC = cc +CXX = c++ CFLAGS = -g -O3 -Wall -std=c++0x -pthread LIBS = -lpthread LDFLAGS = -g From 249bae1e7bdf7cfc6daf7fe6b600af3de18f72c6 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Wed, 23 Oct 2019 12:04:06 +0900 Subject: [PATCH 2/7] replace sockaddr_in -> sockaddr_storage to support IPv6 --- DMRNetwork.cpp | 35 +++++++++++--- DMRNetwork.h | 16 +++---- MMDVMNetwork.cpp | 49 ++++++++++++++------ MMDVMNetwork.h | 4 +- UDPSocket.cpp | 117 ++++++++++++++++++----------------------------- UDPSocket.h | 9 ++-- 6 files changed, 122 insertions(+), 108 deletions(-) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 724c4b4..06885d3 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -33,7 +33,7 @@ const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U; CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, const std::string& name, const char* version, bool debug) : m_address(), -m_port(port), +m_addrlen(), m_id(NULL), m_password(password), m_name(name), @@ -57,7 +57,7 @@ m_beacon(false) assert(!password.empty()); assert(version != NULL); - m_address = CUDPSocket::lookup(address); + CUDPSocket::lookup(address, port, m_address, m_addrlen); m_buffer = new unsigned char[BUFFER_LENGTH]; m_salt = new unsigned char[sizeof(uint32_t)]; @@ -319,9 +319,9 @@ void CDMRNetwork::clock(unsigned int ms) return; } - in_addr address; - unsigned int port; - int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, port); + sockaddr_storage address; + unsigned int addrlen; + int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, addrlen); if (length < 0) { LogError("%s, Socket has failed, retrying connection to the master", m_name.c_str()); close(); @@ -332,7 +332,28 @@ void CDMRNetwork::clock(unsigned int ms) // if (m_debug && length > 0) // CUtils::dump(1U, "Network Received", m_buffer, length); - if (length > 0 && m_address.s_addr == address.s_addr && m_port == port) { + int valid_addr; + switch (address.ss_family) { + case AF_INET: + struct sockaddr_in *pi4, *pm4; + pi4 = (struct sockaddr_in *)&address; + pm4 = (struct sockaddr_in *)&m_address; + valid_addr = ((pi4->sin_addr.s_addr == pm4->sin_addr.s_addr) && + (pi4->sin_port == pm4->sin_port)); + break; + case AF_INET6: + struct sockaddr_in6 *pi6, *pm6; + pi6 = (struct sockaddr_in6 *)&address; + pm6 = (struct sockaddr_in6 *)&m_address; + valid_addr = (!::memcmp(pi6->sin6_addr.s6_addr, pm6->sin6_addr.s6_addr, sizeof(in6_addr)) && + (pi6->sin6_port == pm6->sin6_port)); + break; + default: + valid_addr = 0; + break; + } + + if (length > 0 && valid_addr) { if (::memcmp(m_buffer, "DMRD", 4U) == 0) { if (m_debug) CUtils::dump(1U, "Network Received", m_buffer, length); @@ -527,7 +548,7 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length) // if (m_debug) // CUtils::dump(1U, "Network Transmitted", data, length); - bool ret = m_socket.write(data, length, m_address, m_port); + bool ret = m_socket.write(data, length, m_address, m_addrlen); if (!ret) { LogError("%s, Socket has failed when writing data to the master, retrying connection", m_name.c_str()); m_socket.close(); diff --git a/DMRNetwork.h b/DMRNetwork.h index 458d8df..fd0fc42 100644 --- a/DMRNetwork.h +++ b/DMRNetwork.h @@ -58,14 +58,14 @@ public: void close(); private: - in_addr m_address; - unsigned int m_port; - uint8_t* m_id; - std::string m_password; - std::string m_name; - const char* m_version; - bool m_debug; - CUDPSocket m_socket; + sockaddr_storage m_address; + unsigned int m_addrlen; + uint8_t* m_id; + std::string m_password; + std::string m_name; + const char* m_version; + bool m_debug; + CUDPSocket m_socket; enum STATUS { WAITING_CONNECT, diff --git a/MMDVMNetwork.cpp b/MMDVMNetwork.cpp index 1bc1d78..0f8b392 100644 --- a/MMDVMNetwork.cpp +++ b/MMDVMNetwork.cpp @@ -33,7 +33,7 @@ const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U; CMMDVMNetwork::CMMDVMNetwork(const std::string& rptAddress, unsigned int rptPort, const std::string& localAddress, unsigned int localPort, bool debug) : m_rptAddress(), -m_rptPort(rptPort), +m_rptAddrLen(), m_id(0U), m_netId(NULL), m_debug(debug), @@ -53,7 +53,7 @@ m_homePositionLen(0U) assert(!rptAddress.empty()); assert(rptPort > 0U); - m_rptAddress = CUDPSocket::lookup(rptAddress); + CUDPSocket::lookup(rptAddress, rptPort, m_rptAddress, m_rptAddrLen); m_buffer = new unsigned char[BUFFER_LENGTH]; m_netId = new unsigned char[4U]; @@ -217,7 +217,7 @@ bool CMMDVMNetwork::write(const CDMRData& data) if (m_debug) CUtils::dump(1U, "Network Transmitted", buffer, HOMEBREW_DATA_PACKET_LENGTH); - m_socket.write(buffer, HOMEBREW_DATA_PACKET_LENGTH, m_rptAddress, m_rptPort); + m_socket.write(buffer, HOMEBREW_DATA_PACKET_LENGTH, m_rptAddress, m_rptAddrLen); return true; } @@ -267,7 +267,7 @@ bool CMMDVMNetwork::writeBeacon() ::memcpy(buffer + 0U, "RPTSBKN", 7U); ::memcpy(buffer + 7U, m_netId, 4U); - return m_socket.write(buffer, 11U, m_rptAddress, m_rptPort); + return m_socket.write(buffer, 11U, m_rptAddress, m_rptAddrLen); } void CMMDVMNetwork::close() @@ -280,15 +280,15 @@ void CMMDVMNetwork::close() ::memcpy(buffer + 0U, "MSTCL", 5U); ::memcpy(buffer + 5U, m_netId, 4U); - m_socket.write(buffer, HOMEBREW_DATA_PACKET_LENGTH, m_rptAddress, m_rptPort); + m_socket.write(buffer, HOMEBREW_DATA_PACKET_LENGTH, m_rptAddress, m_rptAddrLen); m_socket.close(); } void CMMDVMNetwork::clock(unsigned int ms) { - in_addr address; - unsigned int port; - int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, port); + sockaddr_storage address; + unsigned int addrlen; + int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, addrlen); if (length < 0) { LogError("MMDVM Network, Socket has failed, reopening"); close(); @@ -299,7 +299,28 @@ void CMMDVMNetwork::clock(unsigned int ms) // if (m_debug && length > 0) // CUtils::dump(1U, "Network Received", m_buffer, length); - if (length > 0 && m_rptAddress.s_addr == address.s_addr && m_rptPort == port) { + int valid_addr; + switch (address.ss_family) { + case AF_INET: + struct sockaddr_in *pi4, *pm4; + pi4 = (struct sockaddr_in *)&address; + pm4 = (struct sockaddr_in *)&m_rptAddress; + valid_addr = ((pi4->sin_addr.s_addr == pm4->sin_addr.s_addr) && + (pi4->sin_port == pm4->sin_port)); + break; + case AF_INET6: + struct sockaddr_in6 *pi6, *pm6; + pi6 = (struct sockaddr_in6 *)&address; + pm6 = (struct sockaddr_in6 *)&m_rptAddress; + valid_addr = (!::memcmp(pi6->sin6_addr.s6_addr, pm6->sin6_addr.s6_addr, sizeof(in6_addr)) && + (pi6->sin6_port == pm6->sin6_port)); + break; + default: + valid_addr = 0; + break; + } + + if (length > 0 && valid_addr) { if (::memcmp(m_buffer, "DMRD", 4U) == 0) { if (m_debug) CUtils::dump(1U, "Network Received", m_buffer, length); @@ -326,12 +347,12 @@ void CMMDVMNetwork::clock(unsigned int ms) uint32_t salt = 1U; ::memcpy(ack + 6U, &salt, sizeof(uint32_t)); - m_socket.write(ack, 10U, m_rptAddress, m_rptPort); + m_socket.write(ack, 10U, m_rptAddress, m_rptAddrLen); } else if (::memcmp(m_buffer, "RPTK", 4U) == 0) { unsigned char ack[10U]; ::memcpy(ack + 0U, "RPTACK", 6U); ::memcpy(ack + 6U, m_netId, 4U); - m_socket.write(ack, 10U, m_rptAddress, m_rptPort); + m_socket.write(ack, 10U, m_rptAddress, m_rptAddrLen); } else if (::memcmp(m_buffer, "RPTCL", 5U) == 0) { ::LogMessage("MMDVM Network, The connected MMDVM is closing down"); } else if (::memcmp(m_buffer, "RPTC", 4U) == 0) { @@ -342,19 +363,19 @@ void CMMDVMNetwork::clock(unsigned int ms) unsigned char ack[10U]; ::memcpy(ack + 0U, "RPTACK", 6U); ::memcpy(ack + 6U, m_netId, 4U); - m_socket.write(ack, 10U, m_rptAddress, m_rptPort); + m_socket.write(ack, 10U, m_rptAddress, m_rptAddrLen); } else if (::memcmp(m_buffer, "RPTO", 4U) == 0) { m_options = std::string((char*)(m_buffer + 8U), length - 8U); unsigned char ack[10U]; ::memcpy(ack + 0U, "RPTACK", 6U); ::memcpy(ack + 6U, m_netId, 4U); - m_socket.write(ack, 10U, m_rptAddress, m_rptPort); + m_socket.write(ack, 10U, m_rptAddress, m_rptAddrLen); } else if (::memcmp(m_buffer, "RPTPING", 7U) == 0) { unsigned char pong[11U]; ::memcpy(pong + 0U, "MSTPONG", 7U); ::memcpy(pong + 7U, m_netId, 4U); - m_socket.write(pong, 11U, m_rptAddress, m_rptPort); + m_socket.write(pong, 11U, m_rptAddress, m_rptAddrLen); } else { CUtils::dump("Unknown packet from the master", m_buffer, length); } diff --git a/MMDVMNetwork.h b/MMDVMNetwork.h index 39320c8..99ba058 100644 --- a/MMDVMNetwork.h +++ b/MMDVMNetwork.h @@ -59,8 +59,8 @@ public: virtual void close(); private: - in_addr m_rptAddress; - unsigned int m_rptPort; + sockaddr_storage m_rptAddress; + unsigned int m_rptAddrLen; unsigned int m_id; unsigned char* m_netId; bool m_debug; diff --git a/UDPSocket.cpp b/UDPSocket.cpp index 396f1f7..967d36f 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -62,49 +62,46 @@ CUDPSocket::~CUDPSocket() #endif } -in_addr CUDPSocket::lookup(const std::string& hostname) +int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_storage &addr, unsigned int &address_length) { - in_addr addr; -#if defined(_WIN32) || defined(_WIN64) - unsigned long address = ::inet_addr(hostname.c_str()); - if (address != INADDR_NONE && address != INADDR_ANY) { - addr.s_addr = address; - return addr; + int err; + std::string portstr = std::to_string(port); + struct addrinfo hints, *res; + + ::memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_flags = AI_NUMERICSERV; + + err = getaddrinfo(hostname.c_str(), portstr.c_str(), &hints, &res); + if (err) { + sockaddr_in *paddr = (sockaddr_in *)&addr; + ::memset(paddr, 0, address_length = sizeof(sockaddr_in)); + paddr->sin_family = AF_INET; + paddr->sin_port = htons(port); + paddr->sin_addr.s_addr = htonl(INADDR_NONE); + LogError("Cannot find address for host %s", hostname.c_str()); + return err; } - struct hostent* hp = ::gethostbyname(hostname.c_str()); - if (hp != NULL) { - ::memcpy(&addr, hp->h_addr_list[0], sizeof(struct in_addr)); - return addr; - } + ::memcpy(&addr, res->ai_addr, address_length = res->ai_addrlen); - LogError("Cannot find address for host %s", hostname.c_str()); - - addr.s_addr = INADDR_NONE; - return addr; -#else - in_addr_t address = ::inet_addr(hostname.c_str()); - if (address != in_addr_t(-1)) { - addr.s_addr = address; - return addr; - } - - struct hostent* hp = ::gethostbyname(hostname.c_str()); - if (hp != NULL) { - ::memcpy(&addr, hp->h_addr_list[0], sizeof(struct in_addr)); - return addr; - } - - LogError("Cannot find address for host %s", hostname.c_str()); - - addr.s_addr = INADDR_NONE; - return addr; -#endif + freeaddrinfo(res); + return 0; } bool CUDPSocket::open() { - m_fd = ::socket(PF_INET, SOCK_DGRAM, 0); + int err; + sockaddr_storage addr; + unsigned int addrlen; + + /* to determine protocol family, call lookup() first. */ + err = lookup(m_address.empty() ? "0.0.0.0" : m_address.c_str(), m_port, addr, addrlen); + if (err) { + LogError("The local address is invalid - %s", m_address.c_str()); + return false; + } + + m_fd = ::socket(addr.ss_family, SOCK_DGRAM, 0); if (m_fd < 0) { #if defined(_WIN32) || defined(_WIN64) LogError("Cannot create the UDP socket, err: %lu", ::GetLastError()); @@ -115,24 +112,6 @@ bool CUDPSocket::open() } if (m_port > 0U) { - sockaddr_in addr; - ::memset(&addr, 0x00, sizeof(sockaddr_in)); - addr.sin_family = AF_INET; - addr.sin_port = htons(m_port); - addr.sin_addr.s_addr = htonl(INADDR_ANY); - - if (!m_address.empty()) { -#if defined(_WIN32) || defined(_WIN64) - addr.sin_addr.s_addr = ::inet_addr(m_address.c_str()); -#else - addr.sin_addr.s_addr = ::inet_addr(m_address.c_str()); -#endif - if (addr.sin_addr.s_addr == INADDR_NONE) { - LogError("The local address is invalid - %s", m_address.c_str()); - return false; - } - } - int reuse = 1; if (::setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) { #if defined(_WIN32) || defined(_WIN64) @@ -143,7 +122,7 @@ bool CUDPSocket::open() return false; } - if (::bind(m_fd, (sockaddr*)&addr, sizeof(sockaddr_in)) == -1) { + if (::bind(m_fd, (sockaddr*)&addr, addrlen) == -1) { #if defined(_WIN32) || defined(_WIN64) LogError("Cannot bind the UDP address, err: %lu", ::GetLastError()); #else @@ -151,12 +130,14 @@ bool CUDPSocket::open() #endif return false; } + + LogInfo("Opening UDP port on %u", m_port); } return true; } -int CUDPSocket::read(unsigned char* buffer, unsigned int length, in_addr& address, unsigned int& port) +int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length) { assert(buffer != NULL); assert(length > 0U); @@ -188,17 +169,16 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, in_addr& addres if (ret == 0) return 0; - sockaddr_in addr; #if defined(_WIN32) || defined(_WIN64) - int size = sizeof(sockaddr_in); + int size = sizeof(sockaddr_storage); #else - socklen_t size = sizeof(sockaddr_in); + socklen_t size = sizeof(sockaddr_storage); #endif #if defined(_WIN32) || defined(_WIN64) - int len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&addr, &size); + int len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); #else - ssize_t len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&addr, &size); + ssize_t len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); #endif if (len <= 0) { #if defined(_WIN32) || defined(_WIN64) @@ -209,28 +189,19 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, in_addr& addres return -1; } - address = addr.sin_addr; - port = ntohs(addr.sin_port); - + address_length = size; return len; } -bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const in_addr& address, unsigned int port) +bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length) { assert(buffer != NULL); assert(length > 0U); - sockaddr_in addr; - ::memset(&addr, 0x00, sizeof(sockaddr_in)); - - addr.sin_family = AF_INET; - addr.sin_addr = address; - addr.sin_port = htons(port); - #if defined(_WIN32) || defined(_WIN64) - int ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&addr, sizeof(sockaddr_in)); + int ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&address, address_length); #else - ssize_t ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&addr, sizeof(sockaddr_in)); + ssize_t ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&address, address_length); #endif if (ret < 0) { #if defined(_WIN32) || defined(_WIN64) diff --git a/UDPSocket.h b/UDPSocket.h index e0af272..ec5de9c 100644 --- a/UDPSocket.h +++ b/UDPSocket.h @@ -31,7 +31,8 @@ #include #include #else -#include +#include +#include #endif class CUDPSocket { @@ -42,12 +43,12 @@ public: bool open(); - int read(unsigned char* buffer, unsigned int length, in_addr& address, unsigned int& port); - bool write(const unsigned char* buffer, unsigned int length, const in_addr& address, unsigned int port); + int read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length); + bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length); void close(); - static in_addr lookup(const std::string& hostName); + static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage &address, unsigned int &address_length); private: std::string m_address; From eb20786f3659847f3366ed2e5c0d3a02127d7f4c Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Wed, 23 Oct 2019 20:01:03 +0900 Subject: [PATCH 3/7] set INADDR_ANY/IN6ADDR_ANY_INIT address string to m_socket when CUDPSocket::open() is called with m_address (in CUDPSocket) is nothing, IPv4 socket is created by "0.0.0.0" (INADDR_ANY) address. This causes a bug that DMRGateway cannot connect to reflector on IPv6. Avoid this problem, set IP address string to m_socket (in CDMRNetwork) before calling CUDPSocket::open(). This is a workaround, I think there is better idea. --- DMRNetwork.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 06885d3..a7fecea 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -58,6 +58,8 @@ m_beacon(false) assert(version != NULL); CUDPSocket::lookup(address, port, m_address, m_addrlen); + CUDPSocket temp(m_address.ss_family == AF_INET ? "0.0.0.0" : "::", port); + m_socket = temp; // INADDR_ANY or IN6ADDR_ANY_INIT m_buffer = new unsigned char[BUFFER_LENGTH]; m_salt = new unsigned char[sizeof(uint32_t)]; From cf038099f27b7c6bc5c925af73acc1ca827d44d2 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Sun, 29 Mar 2020 20:27:05 +0900 Subject: [PATCH 4/7] sync to MMDVMHost-ipv6 code --- UDPSocket.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++----- UDPSocket.h | 4 ++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/UDPSocket.cpp b/UDPSocket.cpp index 967d36f..a8a7fb4 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -63,15 +63,24 @@ CUDPSocket::~CUDPSocket() } int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_storage &addr, unsigned int &address_length) +{ + struct addrinfo hints; + + ::memset(&hints, 0, sizeof(hints)); + + return lookup(hostname, port, addr, address_length, hints); +} + +int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_storage &addr, unsigned int &address_length, struct addrinfo &hints) { int err; std::string portstr = std::to_string(port); - struct addrinfo hints, *res; + struct addrinfo *res; - ::memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_flags = AI_NUMERICSERV; + /* port is always digits, no needs to lookup service */ + hints.ai_flags |= AI_NUMERICSERV; - err = getaddrinfo(hostname.c_str(), portstr.c_str(), &hints, &res); + err = getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res); if (err) { sockaddr_in *paddr = (sockaddr_in *)&addr; ::memset(paddr, 0, address_length = sizeof(sockaddr_in)); @@ -88,14 +97,55 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_ return 0; } +bool CUDPSocket::match(const sockaddr_storage &addr1, const sockaddr_storage &addr2) +{ + if (addr1.ss_family != addr2.ss_family) + return false; + + switch (addr1.ss_family) { + case AF_INET: + struct sockaddr_in *in_1, *in_2; + in_1 = (struct sockaddr_in *)&addr1; + in_2 = (struct sockaddr_in *)&addr2; + return ( (in_1->sin_addr.s_addr == in_2->sin_addr.s_addr) && + (in_1->sin_port == in_2->sin_port) ); + case AF_INET6: + struct sockaddr_in6 *in6_1, *in6_2; + in6_1 = (struct sockaddr_in6 *)&addr1; + in6_2 = (struct sockaddr_in6 *)&addr2; + return ( IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr) && + (in6_1->sin6_port == in6_2->sin6_port) ); + default: + return false; + } +} + +bool CUDPSocket::isnone(const sockaddr_storage &addr) +{ + struct sockaddr_in *in = (struct sockaddr_in *)&addr; + + return ( (addr.ss_family == AF_INET) && + (in->sin_addr.s_addr == htonl(INADDR_NONE)) ); +} + bool CUDPSocket::open() +{ + return open(AF_UNSPEC); +} + +bool CUDPSocket::open(const unsigned int af) { int err; sockaddr_storage addr; unsigned int addrlen; + struct addrinfo hints; + + ::memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_PASSIVE; + hints.ai_family = af; /* to determine protocol family, call lookup() first. */ - err = lookup(m_address.empty() ? "0.0.0.0" : m_address.c_str(), m_port, addr, addrlen); + err = lookup(m_address, m_port, addr, addrlen, hints); if (err) { LogError("The local address is invalid - %s", m_address.c_str()); return false; diff --git a/UDPSocket.h b/UDPSocket.h index ec5de9c..46b2370 100644 --- a/UDPSocket.h +++ b/UDPSocket.h @@ -42,6 +42,7 @@ public: ~CUDPSocket(); bool open(); + bool open(const unsigned int af); int read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length); bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length); @@ -49,6 +50,9 @@ public: void close(); static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage &address, unsigned int &address_length); + static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage &address, unsigned int &address_length, struct addrinfo &hints); + static bool match(const sockaddr_storage &addr1, const sockaddr_storage &addr2); + static bool isnone(const sockaddr_storage &addr); private: std::string m_address; From 06ed2e0080555b738544e9a186fba64dfd2ad59d Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Sun, 29 Mar 2020 20:32:44 +0900 Subject: [PATCH 5/7] modified for new UDPSocket.cpp --- DMRNetwork.cpp | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index a7fecea..9eee8fe 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -58,8 +58,6 @@ m_beacon(false) assert(version != NULL); CUDPSocket::lookup(address, port, m_address, m_addrlen); - CUDPSocket temp(m_address.ss_family == AF_INET ? "0.0.0.0" : "::", port); - m_socket = temp; // INADDR_ANY or IN6ADDR_ANY_INIT m_buffer = new unsigned char[BUFFER_LENGTH]; m_salt = new unsigned char[sizeof(uint32_t)]; @@ -305,7 +303,7 @@ void CDMRNetwork::clock(unsigned int ms) if (m_status == WAITING_CONNECT) { m_retryTimer.clock(ms); if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) { - bool ret = m_socket.open(); + bool ret = m_socket.open(m_address.ss_family); if (ret) { ret = writeLogin(); if (!ret) @@ -334,28 +332,7 @@ void CDMRNetwork::clock(unsigned int ms) // if (m_debug && length > 0) // CUtils::dump(1U, "Network Received", m_buffer, length); - int valid_addr; - switch (address.ss_family) { - case AF_INET: - struct sockaddr_in *pi4, *pm4; - pi4 = (struct sockaddr_in *)&address; - pm4 = (struct sockaddr_in *)&m_address; - valid_addr = ((pi4->sin_addr.s_addr == pm4->sin_addr.s_addr) && - (pi4->sin_port == pm4->sin_port)); - break; - case AF_INET6: - struct sockaddr_in6 *pi6, *pm6; - pi6 = (struct sockaddr_in6 *)&address; - pm6 = (struct sockaddr_in6 *)&m_address; - valid_addr = (!::memcmp(pi6->sin6_addr.s6_addr, pm6->sin6_addr.s6_addr, sizeof(in6_addr)) && - (pi6->sin6_port == pm6->sin6_port)); - break; - default: - valid_addr = 0; - break; - } - - if (length > 0 && valid_addr) { + if (length > 0 && CUDPSocket::match(m_address, address)) { if (::memcmp(m_buffer, "DMRD", 4U) == 0) { if (m_debug) CUtils::dump(1U, "Network Received", m_buffer, length); From 0e029e30d209cf57df68366d0e80a042e7b35fb2 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 3 Sep 2020 10:37:21 +0100 Subject: [PATCH 6/7] Remove warning. --- RewriteType.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RewriteType.cpp b/RewriteType.cpp index 0ceb1da..f7c7d8a 100644 --- a/RewriteType.cpp +++ b/RewriteType.cpp @@ -75,9 +75,9 @@ PROCESS_RESULT CRewriteType::process(CDMRData& data, bool trace) else LogDebug("Rule Trace,\tRewriteType from \"%s\" Slot=%u Dst=TG%u-%u: not matched", m_name.c_str(), m_fromSlot, m_fromTGStart, m_fromTGEnd); if (m_toIdStart == m_toIdEnd) - LogDebug("Rule Trace,\tRewriteType to \"\%s\" Slot=%u Dst=%u: matched", m_name.c_str(), m_toSlot, m_toIdStart); + LogDebug("Rule Trace,\tRewriteType to \"%s\" Slot=%u Dst=%u: matched", m_name.c_str(), m_toSlot, m_toIdStart); else - LogDebug("Rule Trace,\tRewriteType to \"\%s\" Slot=%u Dst=%u-%u: matched", m_name.c_str(), m_toSlot, m_toIdStart, m_toIdEnd); + LogDebug("Rule Trace,\tRewriteType to \"%s\" Slot=%u Dst=%u-%u: matched", m_name.c_str(), m_toSlot, m_toIdStart, m_toIdEnd); } return RESULT_MATCHED; From 94289e062d887c745a84572f6ae8238dc38f822f Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 3 Sep 2020 10:52:22 +0100 Subject: [PATCH 7/7] Update to support changes since IPv6 was added. --- DMRGateway.cpp | 7 +++---- UDPSocket.cpp | 43 +++++++++++++++++++------------------------ UDPSocket.h | 10 +++++----- Version.h | 2 +- 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/DMRGateway.cpp b/DMRGateway.cpp index 4f961d6..efa7afc 100644 --- a/DMRGateway.cpp +++ b/DMRGateway.cpp @@ -2444,10 +2444,9 @@ void CDMRGateway::processHomePosition() void CDMRGateway::processDynamicTGControl() { unsigned char buffer[100U]; - in_addr address; - unsigned int port; - - int len = m_socket->read(buffer, 100U, address, port); + sockaddr_storage address; + unsigned int addrlen; + int len = m_socket->read(buffer, 100U, address, addrlen); if (len <= 0) return; diff --git a/UDPSocket.cpp b/UDPSocket.cpp index a8a7fb4..659d816 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016 by Jonathan Naylor G4KLX + * Copyright (C) 2006-2016,2020 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -62,28 +62,26 @@ CUDPSocket::~CUDPSocket() #endif } -int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_storage &addr, unsigned int &address_length) +int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_storage& addr, unsigned int& address_length) { struct addrinfo hints; - ::memset(&hints, 0, sizeof(hints)); return lookup(hostname, port, addr, address_length, hints); } -int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_storage &addr, unsigned int &address_length, struct addrinfo &hints) +int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_storage& addr, unsigned int& address_length, struct addrinfo& hints) { - int err; std::string portstr = std::to_string(port); struct addrinfo *res; /* port is always digits, no needs to lookup service */ hints.ai_flags |= AI_NUMERICSERV; - err = getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res); - if (err) { - sockaddr_in *paddr = (sockaddr_in *)&addr; - ::memset(paddr, 0, address_length = sizeof(sockaddr_in)); + int err = getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res); + if (err != 0) { + sockaddr_in* paddr = (sockaddr_in*)&addr; + ::memset(paddr, 0x00U, address_length = sizeof(sockaddr_in)); paddr->sin_family = AF_INET; paddr->sin_port = htons(port); paddr->sin_addr.s_addr = htonl(INADDR_NONE); @@ -94,10 +92,11 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_ ::memcpy(&addr, res->ai_addr, address_length = res->ai_addrlen); freeaddrinfo(res); + return 0; } -bool CUDPSocket::match(const sockaddr_storage &addr1, const sockaddr_storage &addr2) +bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& addr2) { if (addr1.ss_family != addr2.ss_family) return false; @@ -105,27 +104,24 @@ bool CUDPSocket::match(const sockaddr_storage &addr1, const sockaddr_storage &ad switch (addr1.ss_family) { case AF_INET: struct sockaddr_in *in_1, *in_2; - in_1 = (struct sockaddr_in *)&addr1; - in_2 = (struct sockaddr_in *)&addr2; - return ( (in_1->sin_addr.s_addr == in_2->sin_addr.s_addr) && - (in_1->sin_port == in_2->sin_port) ); + in_1 = (struct sockaddr_in*)&addr1; + in_2 = (struct sockaddr_in*)&addr2; + return ((in_1->sin_addr.s_addr == in_2->sin_addr.s_addr) && (in_1->sin_port == in_2->sin_port)); case AF_INET6: struct sockaddr_in6 *in6_1, *in6_2; - in6_1 = (struct sockaddr_in6 *)&addr1; - in6_2 = (struct sockaddr_in6 *)&addr2; - return ( IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr) && - (in6_1->sin6_port == in6_2->sin6_port) ); + in6_1 = (struct sockaddr_in6*)&addr1; + in6_2 = (struct sockaddr_in6*)&addr2; + return (IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr) && (in6_1->sin6_port == in6_2->sin6_port)); default: return false; } } -bool CUDPSocket::isnone(const sockaddr_storage &addr) +bool CUDPSocket::isnone(const sockaddr_storage& addr) { struct sockaddr_in *in = (struct sockaddr_in *)&addr; - return ( (addr.ss_family == AF_INET) && - (in->sin_addr.s_addr == htonl(INADDR_NONE)) ); + return ((addr.ss_family == AF_INET) && (in->sin_addr.s_addr == htonl(INADDR_NONE))); } bool CUDPSocket::open() @@ -135,7 +131,6 @@ bool CUDPSocket::open() bool CUDPSocket::open(const unsigned int af) { - int err; sockaddr_storage addr; unsigned int addrlen; struct addrinfo hints; @@ -145,8 +140,8 @@ bool CUDPSocket::open(const unsigned int af) hints.ai_family = af; /* to determine protocol family, call lookup() first. */ - err = lookup(m_address, m_port, addr, addrlen, hints); - if (err) { + int err = lookup(m_address, m_port, addr, addrlen, hints); + if (err != 0) { LogError("The local address is invalid - %s", m_address.c_str()); return false; } diff --git a/UDPSocket.h b/UDPSocket.h index 46b2370..386f059 100644 --- a/UDPSocket.h +++ b/UDPSocket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011,2013,2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2011,2013,2015,2016,2020 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,10 +49,10 @@ public: void close(); - static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage &address, unsigned int &address_length); - static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage &address, unsigned int &address_length, struct addrinfo &hints); - static bool match(const sockaddr_storage &addr1, const sockaddr_storage &addr2); - static bool isnone(const sockaddr_storage &addr); + static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length); + static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); + static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2); + static bool isnone(const sockaddr_storage& addr); private: std::string m_address; diff --git a/Version.h b/Version.h index aa4c644..ff2325e 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20200421"; +const char* VERSION = "20200903"; #endif