X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=3a15c8a56843da90ced2d5b4d9d8ce9b70a21d84;hb=3df81381bcfee4531599ddb417a31e7efca2528e;hp=a599631a40e02f6c506cdd4a49ac1ec1f1505688;hpb=fc349c873818311b6a45aeaace624a3cd3ec96f2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index a599631a4..3a15c8a56 100644 --- a/src/socket.cpp +++ b/src/socket.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. @@ -11,144 +11,16 @@ * --------------------------------------------------- */ -/* $Core: libIRCDsocket */ +/* $Core */ #include "inspircd.h" #include "socket.h" #include "socketengine.h" -/* 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) -{ - this->SetFd(irc::sockets::OpenTCPSocket(addr)); - if (this->GetFd() > -1) - { - 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); - } - /* Saves needless allocations */ - if (socketcount == 0) - { - /* 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]; - } - socketcount++; -} - -ListenSocket::~ListenSocket() -{ - if (this->GetFd() > -1) - { - ServerInstance->SE->DelFd(this); - ServerInstance->Logs->Log("SOCKET", DEBUG,"Shut down listener on fd %d", this->fd); - if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this)) - ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno)); - this->fd = -1; - } - socketcount--; - if (socketcount == 0) - { - delete[] sock_us; - delete[] client; - delete[] raddr; - } -} - -void ListenSocket::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; - case EVENT_WRITE: - ServerInstance->Logs->Log("SOCKET",DEBUG,"*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!"); - 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 (getpeername(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 (getpeername(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 will bind a socket to a port. It works for UDP/TCP. * It can only bind to IP addresses, if you wish to bind to hostnames * you should first resolve them using class 'Resolver'. - */ + */ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten) { /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */ @@ -271,14 +143,20 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten) } // Open a TCP Socket -int irc::sockets::OpenTCPSocket(char* addr, int socktype) +int irc::sockets::OpenTCPSocket(const char* addr, int socktype) { int sockfd; int on = 1; addr = addr; struct linger linger = { 0, 0 }; #ifdef IPV6 - if (strchr(addr,':') || (!*addr)) + if (!*addr) + { + sockfd = socket (PF_INET6, socktype, 0); + if (sockfd < 0) + sockfd = socket (PF_INET, socktype, 0); + } + else if (strchr(addr,':')) sockfd = socket (PF_INET6, socktype, 0); else sockfd = socket (PF_INET, socktype, 0); @@ -300,6 +178,7 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype) } } +// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) { char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; @@ -308,7 +187,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) std::vector > old_ports; /* XXX: Make a copy of the old ip/port pairs here */ - for (std::vector::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o) + for (std::vector::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o) old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort())); for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) @@ -316,10 +195,10 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF); Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF); Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF); - + if (strncmp(Addr, "::ffff:", 7) == 0) this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead."); - + if ((!*Type) || (!strcmp(Type,"clients"))) { irc::portparser portrange(configToken, false); @@ -330,7 +209,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) *Addr = 0; bool skip = false; - for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) + for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) { if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno)) { @@ -348,7 +227,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) } if (!skip) { - ListenSocket* ll = new ListenSocket(this, portno, Addr); + ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr); if (ll->GetFd() > -1) { bound++; @@ -356,7 +235,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) } else { - failed_ports.push_back(std::make_pair(Addr, portno)); + failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno))); } ports_found++; } @@ -369,7 +248,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) { for (size_t k = 0; k < old_ports.size(); ++k) { - for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) + for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) { if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second)) { @@ -397,4 +276,42 @@ int irc::sockets::insp_aton(const char* a, insp_inaddr* n) return inet_pton(AF_FAMILY, a, n); } +int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa) +{ + memset(sa, 0, sizeof(sa)); + if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0) + { + sa->in4.sin_family = AF_INET; + sa->in4.sin_port = htons(port); + return true; + } + else if (inet_pton(AF_INET6, addr, &sa->in6.sin6_addr) > 0) + { + sa->in6.sin6_family = AF_INET6; + sa->in6.sin6_port = htons(port); + return true; + } + return false; +} + +int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) { + char addrv[INET6_ADDRSTRLEN+1]; + if (sa->sa.sa_family == AF_INET) + { + if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv))) + return false; + addr = addrv; + port = ntohs(sa->in4.sin_port); + return true; + } + else if (sa->sa.sa_family == AF_INET6) + { + if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv))) + return false; + addr = addrv; + port = ntohs(sa->in6.sin6_port); + return true; + } + return false; +}