From cf038099f27b7c6bc5c925af73acc1ca827d44d2 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Sun, 29 Mar 2020 20:27:05 +0900 Subject: [PATCH 1/2] 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 2/2] 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);