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

net/*, ...: use AF_LOCAL instead of AF_UNIX

Browse Source
This commit is contained in:
Max Kellermann
2017-08-10 12:26:15 +02:00
parent 796956970e
commit 54de8b8e77
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/ClientNew.cxx
View File

@@ -65,7 +65,7 @@ client_new(EventLoop &loop, Partition &partition,
assert(fd >= 0); assert(fd >= 0);
#ifdef HAVE_LIBWRAP #ifdef HAVE_LIBWRAP
if (address.GetFamily() != AF_UNIX) { if (address.GetFamily() != AF_LOCAL) {
// TODO: shall we obtain the program name from argv[0]? // TODO: shall we obtain the program name from argv[0]?
const char *progname = "mpd"; const char *progname = "mpd";

2
src/net/AllocatedSocketAddress.cxx
View File

@@ -82,7 +82,7 @@ AllocatedSocketAddress::SetLocal(const char *path) noexcept
struct sockaddr_un *sun; struct sockaddr_un *sun;
SetSize(sizeof(*sun) - sizeof(sun->sun_path) + path_length); SetSize(sizeof(*sun) - sizeof(sun->sun_path) + path_length);
sun = (struct sockaddr_un *)address; sun = (struct sockaddr_un *)address;
sun->sun_family = AF_UNIX; sun->sun_family = AF_LOCAL;
memcpy(sun->sun_path, path, path_length); memcpy(sun->sun_path, path, path_length);
if (is_abstract) if (is_abstract)

2
src/net/ToString.cxx
View File

@@ -116,7 +116,7 @@ std::string
ToString(SocketAddress address) noexcept ToString(SocketAddress address) noexcept
{ {
#ifdef HAVE_UN #ifdef HAVE_UN
if (address.GetFamily() == AF_UNIX) if (address.GetFamily() == AF_LOCAL)
/* return path of UNIX domain sockets */ /* return path of UNIX domain sockets */
return LocalAddressToString(*(const sockaddr_un *)address.GetAddress(), return LocalAddressToString(*(const sockaddr_un *)address.GetAddress(),
address.GetSize()); address.GetSize());

4
src/output/plugins/httpd/HttpdOutputPlugin.cxx
View File

@@ -42,7 +42,7 @@
#include <errno.h> #include <errno.h>
#ifdef HAVE_LIBWRAP #ifdef HAVE_LIBWRAP
#include <sys/socket.h> /* needed for AF_UNIX */ #include <sys/socket.h> /* needed for AF_LOCAL */
#include <tcpd.h> #include <tcpd.h>
#endif #endif
@@ -157,7 +157,7 @@ HttpdOutput::OnAccept(int fd, SocketAddress address, gcc_unused int uid)
connected */ connected */
#ifdef HAVE_LIBWRAP #ifdef HAVE_LIBWRAP
if (address.GetFamily() != AF_UNIX) { if (address.GetFamily() != AF_LOCAL) {
const auto hostaddr = ToString(address); const auto hostaddr = ToString(address);
// TODO: shall we obtain the program name from argv[0]? // TODO: shall we obtain the program name from argv[0]?
const char *progname = "mpd"; const char *progname = "mpd";