X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=2a74c0b683b1a848c7f4b78cb91668dde699dcc1;hb=467b276d9d0407ec412262525c43c28d47fdae2f;hp=e73a8f4cee9b9fa89df7c2e082c9a5f4182ea253;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/listensocket.cpp b/src/listensocket.cpp index e73a8f4ce..2a74c0b68 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -114,7 +114,7 @@ void ListenSocket::AcceptInternal() ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd); if (incomingSockfd < 0) { - ServerInstance->stats->statsRefused++; + ServerInstance->stats.Refused++; return; } @@ -125,25 +125,6 @@ void ListenSocket::AcceptInternal() irc::sockets::aptosa(bind_addr, bind_port, server); } - /* - * XXX - - * this is done as a safety check to keep the file descriptors within range of fd_ref_table. - * its a pretty big but for the moment valid assumption: - * file descriptors are handed out starting at 0, and are recycled as theyre freed. - * therefore if there is ever an fd over 65535, 65536 clients must be connected to the - * irc server at once (or the irc server otherwise initiating this many connections, files etc) - * which for the time being is a physical impossibility (even the largest networks dont have more - * than about 10,000 users on ONE server!) - */ - if (incomingSockfd >= SocketEngine::GetMaxFds()) - { - ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Server is full"); - SocketEngine::Shutdown(incomingSockfd, 2); - SocketEngine::Close(incomingSockfd); - ServerInstance->stats->statsRefused++; - return; - } - if (client.sa.sa_family == AF_INET6) { /* @@ -189,11 +170,11 @@ void ListenSocket::AcceptInternal() } if (res == MOD_RES_ALLOW) { - ServerInstance->stats->statsAccept++; + ServerInstance->stats.Accept++; } else { - ServerInstance->stats->statsRefused++; + ServerInstance->stats.Refused++; ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Refusing connection on %s - %s", bind_desc.c_str(), res == MOD_RES_DENY ? "Connection refused by module" : "Module for this port not found"); SocketEngine::Close(incomingSockfd);