X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=e0a18a043fab7a86bafe734fa8f463e1c28ccb73;hb=74066e0f563ef630e432d3bbb10544318b70ade3;hp=936dd85e9e1f0911616974f1418a9df8d8ade2de;hpb=f7bfee1e9210b83d0cb544ce14aa52f8637bdf21;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 936dd85e9..e0a18a043 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -17,41 +17,52 @@ #include "socket.h" #include "socketengine.h" +/* Private static member data must be declared in this manner */ +irc::sockets::sockaddrs ListenSocketBase::client; +irc::sockets::sockaddrs ListenSocketBase::server; -/* Private static member data must be initialized in this manner */ -unsigned int ListenSocket::socketcount = 0; -sockaddr* ListenSocket::sock_us = NULL; -sockaddr* ListenSocket::client = NULL; -sockaddr* ListenSocket::raddr = NULL; - -ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port) +ListenSocketBase::ListenSocketBase(int port, const std::string &addr, const std::string &Type, const std::string &Hook) + : type(Type), hook(Hook), bind_port(port) { - this->SetFd(irc::sockets::OpenTCPSocket(addr)); - if (this->GetFd() > -1) + irc::sockets::sockaddrs bind_to; + + // canonicalize address if it is defined + if (!irc::sockets::aptosa(addr, port, &bind_to)) { - if (!Instance->BindSocket(this->fd,port,addr)) - this->fd = -1; -#ifdef IPV6 - if ((!*addr) || (strchr(addr,':'))) - this->family = AF_INET6; - else -#endif - this->family = AF_INET; - Instance->SE->AddFd(this); + // malformed address + bind_addr = addr; + bind_desc = addr + ":" + ConvToStr(port); + this->fd = -1; } - /* Saves needless allocations */ - if (socketcount == 0) + else { - /* All instances of ListenSocket share these, so reference count it */ - ServerInstance->Logs->Log("SOCKET", DEBUG,"Allocate sockaddr structures"); - sock_us = new sockaddr[2]; - client = new sockaddr[2]; - raddr = new sockaddr[2]; + irc::sockets::satoap(&bind_to, bind_addr, port); + bind_desc = irc::sockets::satouser(&bind_to); + + this->fd = irc::sockets::OpenTCPSocket(bind_addr); + } + + if (this->fd > -1) + { + int rv = ServerInstance->SE->Bind(this->fd, &bind_to.sa, sizeof(bind_to)); + if (rv >= 0) + rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn); + + if (rv < 0) + { + ServerInstance->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); + this->fd = -1; + } + else + { + ServerInstance->SE->NonBlocking(this->fd); + ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); + } } - socketcount++; } -ListenSocket::~ListenSocket() +ListenSocketBase::~ListenSocketBase() { if (this->GetFd() > -1) { @@ -61,86 +72,102 @@ ListenSocket::~ListenSocket() ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno)); this->fd = -1; } - socketcount--; - if (socketcount == 0) +} + +/* Just seperated into another func for tidiness really.. */ +void ListenSocketBase::AcceptInternal() +{ + ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensoket"); + int incomingSockfd; + + socklen_t length = sizeof(client); + incomingSockfd = ServerInstance->SE->Accept(this, &client.sa, &length); + + if (incomingSockfd < 0) + { + ServerInstance->SE->Shutdown(incomingSockfd, 2); + ServerInstance->SE->Close(incomingSockfd); + ServerInstance->stats->statsRefused++; + return; + } + + socklen_t sz = sizeof(server); + if (getsockname(incomingSockfd, &server.sa, &sz)) + ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno)); + + /* + * 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 >= ServerInstance->SE->GetMaxFds()) { - delete[] sock_us; - delete[] client; - delete[] raddr; + ServerInstance->Logs->Log("SOCKET", DEBUG, "Server is full"); + ServerInstance->SE->Shutdown(incomingSockfd, 2); + ServerInstance->SE->Close(incomingSockfd); + ServerInstance->stats->statsRefused++; + return; } + + if (client.sa.sa_family == AF_INET6) + { + /* + * This case is the be all and end all patch to catch and nuke 4in6 + * instead of special-casing shit all over the place and wreaking merry + * havoc with crap, instead, we just recreate sockaddr and strip ::ffff: prefix + * if it's a 4in6 IP. + * + * This is, of course, much improved over the older way of handling this + * (pretend it doesn't exist + hack around it -- yes, both were done!) + * + * Big, big thanks to danieldg for his work on this. + * -- w00t + */ + static const unsigned char prefix4in6[12] = { 0,0,0,0, 0,0,0,0, 0,0,0xFF,0xFF }; + if (!memcmp(prefix4in6, &client.in6.sin6_addr, 12)) + { + // recreate as a sockaddr_in using the IPv4 IP + uint16_t sport = client.in6.sin6_port; + uint32_t addr = *reinterpret_cast(client.in6.sin6_addr.s6_addr + 12); + client.in4.sin_family = AF_INET; + client.in4.sin_port = sport; + client.in4.sin_addr.s_addr = addr; + + sport = server.in6.sin6_port; + addr = *reinterpret_cast(server.in6.sin6_addr.s6_addr + 12); + server.in4.sin_family = AF_INET; + server.in4.sin_port = sport; + server.in4.sin_addr.s_addr = addr; + } + } + + ServerInstance->SE->NonBlocking(incomingSockfd); + ServerInstance->stats->statsAccept++; + this->OnAcceptReady(incomingSockfd); } -void ListenSocket::HandleEvent(EventType e, int err) +void ListenSocketBase::HandleEvent(EventType e, int err) { switch (e) { case EVENT_ERROR: ServerInstance->Logs->Log("SOCKET",DEFAULT,"ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err)); - break; + break; case EVENT_WRITE: ServerInstance->Logs->Log("SOCKET",DEBUG,"*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!"); - break; + break; case EVENT_READ: - { - ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensoket"); - socklen_t uslen, length; // length of our port number - int incomingSockfd, in_port; - -#ifdef IPV6 - if (this->family == AF_INET6) - { - uslen = sizeof(sockaddr_in6); - length = sizeof(sockaddr_in6); - } - else -#endif - { - uslen = sizeof(sockaddr_in); - length = sizeof(sockaddr_in); - } - - incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length); - - if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen))) - { - char buf[MAXBUF]; - char target[MAXBUF]; - - *target = *buf = '\0'; - -#ifdef IPV6 - if (this->family == AF_INET6) - { - in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port); - inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); - socklen_t raddrsz = sizeof(sockaddr_in6); - if (getsockname(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0) - inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target)); - else - ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno)); - } - else -#endif - { - inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf)); - in_port = ntohs(((sockaddr_in*)sock_us)->sin_port); - socklen_t raddrsz = sizeof(sockaddr_in); - if (getsockname(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0) - inet_ntop(AF_INET, &((const sockaddr_in*)raddr)->sin_addr, target, sizeof(target)); - else - ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno)); - } - ServerInstance->SE->NonBlocking(incomingSockfd); - ServerInstance->stats->statsAccept++; - ServerInstance->Users->AddUser(ServerInstance, incomingSockfd, in_port, false, this->family, client, target); - } - else - { - ServerInstance->SE->Shutdown(incomingSockfd, 2); - ServerInstance->SE->Close(incomingSockfd); - ServerInstance->stats->statsRefused++; - } - } - break; + this->AcceptInternal(); + break; } } + +void ClientListenSocket::OnAcceptReady(int nfd) +{ + ServerInstance->Users->AddUser(nfd, this, &client, &server); +}