UDPSocket renewal (2)
introduced YSFClients code match_addr(addr1, addr2) -> match(addr1, addr2, IMT_ADDRESS_ONLY) isnone() -> isNone() open(sockaddr_storage&) added (this refers address family only)
This commit is contained in:
parent
457be810a3
commit
def0edbaca
110
UDPSocket.cpp
110
UDPSocket.cpp
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2006-2016,2018,2020 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -57,11 +57,6 @@ CUDPSocket::CUDPSocket(unsigned int port)
|
||||||
CUDPSocket("", port);
|
CUDPSocket("", port);
|
||||||
}
|
}
|
||||||
|
|
||||||
CUDPSocket::CUDPSocket()
|
|
||||||
{
|
|
||||||
CUDPSocket("", 0U);
|
|
||||||
}
|
|
||||||
|
|
||||||
CUDPSocket::~CUDPSocket()
|
CUDPSocket::~CUDPSocket()
|
||||||
{
|
{
|
||||||
#if defined(_WIN32) || defined(_WIN64)
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
|
@ -69,28 +64,26 @@ CUDPSocket::~CUDPSocket()
|
||||||
#endif
|
#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;
|
struct addrinfo hints;
|
||||||
|
|
||||||
::memset(&hints, 0, sizeof(hints));
|
::memset(&hints, 0, sizeof(hints));
|
||||||
|
|
||||||
return lookup(hostname, port, addr, address_length, 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);
|
std::string portstr = std::to_string(port);
|
||||||
struct addrinfo *res;
|
struct addrinfo *res;
|
||||||
|
|
||||||
/* port is always digits, no needs to lookup service */
|
/* port is always digits, no needs to lookup service */
|
||||||
hints.ai_flags |= AI_NUMERICSERV;
|
hints.ai_flags |= AI_NUMERICSERV;
|
||||||
|
|
||||||
err = getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res);
|
int err = getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res);
|
||||||
if (err) {
|
if (err != 0) {
|
||||||
sockaddr_in *paddr = (sockaddr_in *)&addr;
|
sockaddr_in* paddr = (sockaddr_in*)&addr;
|
||||||
::memset(paddr, 0, address_length = sizeof(sockaddr_in));
|
::memset(paddr, 0x00U, address_length = sizeof(sockaddr_in));
|
||||||
paddr->sin_family = AF_INET;
|
paddr->sin_family = AF_INET;
|
||||||
paddr->sin_port = htons(port);
|
paddr->sin_port = htons(port);
|
||||||
paddr->sin_addr.s_addr = htonl(INADDR_NONE);
|
paddr->sin_addr.s_addr = htonl(INADDR_NONE);
|
||||||
|
@ -101,90 +94,85 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned int port, sockaddr_
|
||||||
::memcpy(&addr, res->ai_addr, address_length = res->ai_addrlen);
|
::memcpy(&addr, res->ai_addr, address_length = res->ai_addrlen);
|
||||||
|
|
||||||
freeaddrinfo(res);
|
freeaddrinfo(res);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CUDPSocket::match(const sockaddr_storage &addr1, const sockaddr_storage &addr2)
|
bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type)
|
||||||
{
|
{
|
||||||
if (addr1.ss_family != addr2.ss_family)
|
if (addr1.ss_family != addr2.ss_family)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
switch (addr1.ss_family) {
|
if (type == IMT_ADDRESS_AND_PORT) {
|
||||||
case AF_INET:
|
switch (addr1.ss_family) {
|
||||||
struct sockaddr_in *in_1, *in_2;
|
case AF_INET:
|
||||||
in_1 = (struct sockaddr_in *)&addr1;
|
struct sockaddr_in *in_1, *in_2;
|
||||||
in_2 = (struct sockaddr_in *)&addr2;
|
in_1 = (struct sockaddr_in*)&addr1;
|
||||||
return ( (in_1->sin_addr.s_addr == in_2->sin_addr.s_addr) &&
|
in_2 = (struct sockaddr_in*)&addr2;
|
||||||
(in_1->sin_port == in_2->sin_port) );
|
return (in_1->sin_addr.s_addr == in_2->sin_addr.s_addr) && (in_1->sin_port == in_2->sin_port);
|
||||||
case AF_INET6:
|
case AF_INET6:
|
||||||
struct sockaddr_in6 *in6_1, *in6_2;
|
struct sockaddr_in6 *in6_1, *in6_2;
|
||||||
in6_1 = (struct sockaddr_in6 *)&addr1;
|
in6_1 = (struct sockaddr_in6*)&addr1;
|
||||||
in6_2 = (struct sockaddr_in6 *)&addr2;
|
in6_2 = (struct sockaddr_in6*)&addr2;
|
||||||
return ( IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr) &&
|
return IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr) && (in6_1->sin6_port == in6_2->sin6_port);
|
||||||
(in6_1->sin6_port == in6_2->sin6_port) );
|
default:
|
||||||
default:
|
return false;
|
||||||
|
}
|
||||||
|
} else if (type == IMT_ADDRESS_ONLY) {
|
||||||
|
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;
|
||||||
|
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);
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CUDPSocket::match_addr(const sockaddr_storage &addr1, const sockaddr_storage &addr2)
|
bool CUDPSocket::isNone(const sockaddr_storage& addr)
|
||||||
{
|
|
||||||
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);
|
|
||||||
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);
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CUDPSocket::isnone(const sockaddr_storage &addr)
|
|
||||||
{
|
{
|
||||||
struct sockaddr_in *in = (struct sockaddr_in *)&addr;
|
struct sockaddr_in *in = (struct sockaddr_in *)&addr;
|
||||||
|
|
||||||
return ( (addr.ss_family == AF_INET) &&
|
return ((addr.ss_family == AF_INET) && (in->sin_addr.s_addr == htonl(INADDR_NONE)));
|
||||||
(in->sin_addr.s_addr == htonl(INADDR_NONE)) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CUDPSocket::open()
|
bool CUDPSocket::open(const sockaddr_storage& address)
|
||||||
{
|
{
|
||||||
return open(0, AF_UNSPEC, m_address[0], m_port[0]);
|
return open(address.ss_family);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CUDPSocket::open(const unsigned int af)
|
bool CUDPSocket::open(unsigned int af)
|
||||||
{
|
{
|
||||||
return open(0, af, m_address[0], m_port[0]);
|
return open(0, af, m_address[0], m_port[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CUDPSocket::open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned int port)
|
bool CUDPSocket::open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned int port)
|
||||||
{
|
{
|
||||||
int err, fd;
|
|
||||||
sockaddr_storage addr;
|
sockaddr_storage addr;
|
||||||
unsigned int addrlen;
|
unsigned int addrlen;
|
||||||
struct addrinfo hints;
|
struct addrinfo hints;
|
||||||
|
|
||||||
::memset(&hints, 0, sizeof(hints));
|
::memset(&hints, 0, sizeof(hints));
|
||||||
hints.ai_flags = AI_PASSIVE;
|
hints.ai_flags = AI_PASSIVE;
|
||||||
hints.ai_family = af;
|
hints.ai_family = af;
|
||||||
|
|
||||||
/* to determine protocol family, call lookup() first. */
|
/* to determine protocol family, call lookup() first. */
|
||||||
err = lookup(address, port, addr, addrlen, hints);
|
int err = lookup(address, port, addr, addrlen, hints);
|
||||||
if (err) {
|
if (err != 0) {
|
||||||
LogError("The local address is invalid - %s", address.c_str());
|
LogError("The local address is invalid - %s", address.c_str());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
fd = ::socket(addr.ss_family, SOCK_DGRAM, 0);
|
int fd = ::socket(addr.ss_family, SOCK_DGRAM, 0);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
#if defined(_WIN32) || defined(_WIN64)
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
LogError("Cannot create the UDP socket, err: %lu", ::GetLastError());
|
LogError("Cannot create the UDP socket, err: %lu", ::GetLastError());
|
||||||
|
|
20
UDPSocket.h
20
UDPSocket.h
|
@ -40,15 +40,19 @@
|
||||||
#define UDP_SOCKET_MAX 1
|
#define UDP_SOCKET_MAX 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
enum IPMATCHTYPE {
|
||||||
|
IMT_ADDRESS_AND_PORT,
|
||||||
|
IMT_ADDRESS_ONLY
|
||||||
|
};
|
||||||
|
|
||||||
class CUDPSocket {
|
class CUDPSocket {
|
||||||
public:
|
public:
|
||||||
CUDPSocket(const std::string& address, unsigned int port = 0U);
|
CUDPSocket(const std::string& address, unsigned int port = 0U);
|
||||||
CUDPSocket(unsigned int port = 0U);
|
CUDPSocket(unsigned int port = 0U);
|
||||||
CUDPSocket();
|
|
||||||
~CUDPSocket();
|
~CUDPSocket();
|
||||||
|
|
||||||
bool open();
|
bool open(unsigned int af = AF_UNSPEC);
|
||||||
bool open(const unsigned int af);
|
bool open(const sockaddr_storage& address);
|
||||||
bool open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned int port);
|
bool open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned int port);
|
||||||
|
|
||||||
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);
|
||||||
|
@ -57,11 +61,11 @@ public:
|
||||||
void close();
|
void close();
|
||||||
void close(const unsigned int index);
|
void close(const unsigned int index);
|
||||||
|
|
||||||
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 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 match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
|
||||||
static bool match_addr(const sockaddr_storage &addr1, const sockaddr_storage &addr2);
|
|
||||||
static bool isnone(const sockaddr_storage &addr);
|
static bool isNone(const sockaddr_storage& addr);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::string m_address[UDP_SOCKET_MAX];
|
std::string m_address[UDP_SOCKET_MAX];
|
||||||
|
|
Loading…
Reference in a new issue