MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-22 14:16:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync to MMDVMHost-ipv6 code

Browse Source
This commit is contained in:
SASANO Takayoshi
2020-03-29 20:27:05 +09:00
parent eb20786f36
commit cf038099f2
2 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
UDPSocket.cpp
View File

@@ -63,15 +63,24 @@ CUDPSocket::~CUDPSocket()
} }
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 err; int err;
std::string portstr = std::to_string(port); std::string portstr = std::to_string(port);
struct addrinfo hints, *res; struct addrinfo *res;
::memset(&hints, 0, sizeof(struct addrinfo)); /* port is always digits, no needs to lookup service */
hints.ai_flags = AI_NUMERICSERV; 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) { if (err) {
sockaddr_in *paddr = (sockaddr_in *)&addr; sockaddr_in *paddr = (sockaddr_in *)&addr;
::memset(paddr, 0, address_length = sizeof(sockaddr_in)); ::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; 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() bool CUDPSocket::open()
{
return open(AF_UNSPEC);
}
bool CUDPSocket::open(const unsigned int af)
{ {
int err; int err;
sockaddr_storage addr; sockaddr_storage addr;
unsigned int addrlen; 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. */ /* 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) { if (err) {
LogError("The local address is invalid - %s", m_address.c_str()); LogError("The local address is invalid - %s", m_address.c_str());
return false; return false;

4
UDPSocket.h
View File

@@ -42,6 +42,7 @@ public:
~CUDPSocket(); ~CUDPSocket();
bool open(); bool open();
bool open(const unsigned int af);
int read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length); 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); bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length);
@@ -49,6 +50,9 @@ public:
void close(); 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);
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: private:
std::string m_address; std::string m_address;