oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

net/SocketAddress: reimplement IsV6Any() using IPv6Address::IsAny()

Browse Source
This commit is contained in:
Max Kellermann 2018-08-21 10:46:20 +02:00
parent a84b83f20f
commit 94092f1f90
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/SocketAddress.cxx
View File

@ -29,6 +29,7 @@
#include "config.h" #include "config.h"
#include "SocketAddress.hxx" #include "SocketAddress.hxx"
#include "IPv6Address.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <string.h> #include <string.h>
@ -78,9 +79,7 @@ SocketAddress::GetLocalRaw() const noexcept
bool bool
SocketAddress::IsV6Any() const noexcept SocketAddress::IsV6Any() const noexcept
{ {
return GetFamily() == AF_INET6 && return GetFamily() == AF_INET6 && IPv6Address(*this).IsAny();
memcmp(&((const struct sockaddr_in6 *)(const void *)GetAddress())->sin6_addr,
&in6addr_any, sizeof(in6addr_any)) == 0;
} }
unsigned unsigned
@ -94,7 +93,7 @@ SocketAddress::GetPort() const noexcept
return ntohs(((const struct sockaddr_in *)(const void *)address)->sin_port); return ntohs(((const struct sockaddr_in *)(const void *)address)->sin_port);
case AF_INET6: case AF_INET6:
return ntohs(((const struct sockaddr_in6 *)(const void *)address)->sin6_port); return IPv6Address(*this).GetPort();
default: default:
return 0; return 0;