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

net/Resolver: move code to LocalAddressToString()

Browse Source
This commit is contained in:
Max Kellermann 2015-02-10 22:46:04 +01:00
parent 4e30e74739
commit cf5c10bbe6
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/Resolver.cxx
View File

@ -43,19 +43,27 @@
const Domain resolver_domain("resolver"); const Domain resolver_domain("resolver");
#ifdef HAVE_UN
static std::string
LocalAddressToString(const struct sockaddr_un &s_un, size_t size)
{
if (size < sizeof(s_un) || s_un.sun_path[0] == 0)
return "local";
return s_un.sun_path;
}
#endif
std::string std::string
sockaddr_to_string(SocketAddress address) sockaddr_to_string(SocketAddress address)
{ {
#ifdef HAVE_UN #ifdef HAVE_UN
if (address.GetFamily() == AF_UNIX) { if (address.GetFamily() == AF_UNIX)
/* return path of UNIX domain sockets */ /* return path of UNIX domain sockets */
const sockaddr_un &s_un = *(const sockaddr_un *) return LocalAddressToString(*(const sockaddr_un *)address.GetAddress(),
address.GetAddress(); address.GetSize());
if (address.GetSize() < sizeof(s_un) || s_un.sun_path[0] == 0)
return "local";
return s_un.sun_path;
}
#endif #endif
#if defined(HAVE_IPV6) && defined(IN6_IS_ADDR_V4MAPPED) #if defined(HAVE_IPV6) && defined(IN6_IS_ADDR_V4MAPPED)