From dc203f9f201e5a49677d3982f0b6c7d8610cc484 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Mon, 26 Apr 2010 19:08:39 -0500 Subject: Define comparator for irc::sockets::sockaddrs This only compares IP/port, which ignores IPv6 flow information and scope ID, which aren't important in testing for equality. --- src/socket.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/socket.cpp') diff --git a/src/socket.cpp b/src/socket.cpp index 3ee996193..a04523ddf 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -239,6 +239,17 @@ int irc::sockets::sockaddrs::sa_size() const return 0; } +bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const +{ + if (sa.sa_family != other.sa.sa_family) + return false; + if (sa.sa_family == AF_INET) + return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr); + if (sa.sa_family == AF_INET6) + return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16); + return !memcmp(this, &other, sizeof(*this)); +} + static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range) { const unsigned char* base; -- cgit v1.2.3