X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=4805b77176e0f2f36c5d423017c2da713c620139;hb=9ad873886e518bf3621a88e8c48607ab79020c0a;hp=4ec6c2b0642453b7dfc31b9a563d7bec46e817d4;hpb=a3e0768758ca68429a29d9c78ce672f2d938c6e7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 4ec6c2b06..4805b7717 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -29,7 +29,16 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t : bind_tag(tag) , bind_sa(bind_to) { - fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0); + // Are we creating a UNIX socket? + if (bind_to.family() == AF_UNIX) + { + // Is 'replace' enabled? + const bool replace = tag->getBool("replace"); + if (replace && irc::sockets::isunix(bind_to.str())) + unlink(bind_to.str().c_str()); + } + + fd = socket(bind_to.family(), SOCK_STREAM, 0); if (this->fd == -1) return; @@ -41,7 +50,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t * is "::" or an IPv6 address, disable support so that an IPv4 bind will * work on the port (by us or another application). */ - if (bind_to.sa.sa_family == AF_INET6) + if (bind_to.family() == AF_INET6) { std::string addr = tag->getString("address"); /* This must be >= sizeof(DWORD) on Windows */ @@ -66,6 +75,14 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t #endif } + if (bind_to.family() == AF_UNIX) + { + const std::string permissionstr = tag->getString("permissions"); + unsigned int permissions = strtoul(permissionstr.c_str(), NULL, 8); + if (permissions && permissions <= 07777) + chmod(bind_to.str().c_str(), permissions); + } + SocketEngine::SetReuse(fd); int rv = SocketEngine::Bind(this->fd, bind_to); if (rv >= 0) @@ -108,8 +125,12 @@ ListenSocket::~ListenSocket() { ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd); SocketEngine::Shutdown(this, 2); + if (SocketEngine::Close(this) != 0) ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to cancel listener: %s", strerror(errno)); + + if (bind_sa.family() == AF_UNIX && unlink(bind_sa.un.sun_path)) + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to unlink UNIX socket: %s", strerror(errno)); } } @@ -134,7 +155,7 @@ void ListenSocket::OnEventHandlerRead() ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Can't get peername: %s", strerror(errno)); } - if (client.sa.sa_family == AF_INET6) + if (client.family() == AF_INET6) { /* * This case is the be all and end all patch to catch and nuke 4in6 @@ -163,6 +184,14 @@ void ListenSocket::OnEventHandlerRead() memcpy(&server.in4.sin_addr.s_addr, server.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t)); } } + else if (client.family() == AF_UNIX) + { + // Clients connecting via UNIX sockets don't have paths so give them + // the server path as defined in RFC 1459 section 8.1.1. + // + // strcpy is safe here because sizeof(sockaddr_un.sun_path) is equal on both. + strcpy(client.un.sun_path, server.un.sun_path); + } SocketEngine::NonBlocking(incomingSockfd); @@ -171,7 +200,7 @@ void ListenSocket::OnEventHandlerRead() if (res == MOD_RES_PASSTHRU) { std::string type = bind_tag->getString("type", "clients"); - if (type == "clients") + if (stdalgo::string::equalsci(type, "clients")) { ServerInstance->Users->AddUser(incomingSockfd, this, &client, &server); res = MOD_RES_ALLOW;