diff --git a/UDPSocket.cpp b/UDPSocket.cpp index beec3ce..0bbe27b 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -118,6 +118,27 @@ bool CUDPSocket::match(const sockaddr_storage &addr1, const sockaddr_storage &ad } } +bool CUDPSocket::match_addr(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); + 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; diff --git a/UDPSocket.h b/UDPSocket.h index 46b2370..ad5b2a1 100644 --- a/UDPSocket.h +++ b/UDPSocket.h @@ -52,6 +52,7 @@ public: 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 match_addr(const sockaddr_storage &addr1, const sockaddr_storage &addr2); static bool isnone(const sockaddr_storage &addr); private: