X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=d5ad7b4ce6cd5e4a68e3440343ea81c058de47a2;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=4de038ef14632e362fd0de5a797714a385a12e86;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 4de038ef1..d5ad7b4ce 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -3,13 +3,13 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * E-mail: + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -18,14 +18,9 @@ #include "configreader.h" #include "socket.h" #include "inspircd.h" -#include "inspstring.h" -#include "helperfuncs.h" #include "socketengine.h" #include "wildcard.h" -extern InspIRCd* ServerInstance; -extern time_t TIME; - using namespace std; using namespace irc::sockets; @@ -44,6 +39,75 @@ const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used 0xFE /* 11111110 - 7 bits */ }; + +ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance) +{ + this->SetFd(sockfd); + Instance->Log(DEBUG,"Binding to port %s:%d",addr,port); + if (!Instance->BindSocket(this->fd,client,server,port,addr)) + { + Instance->Log(DEBUG,"Binding failed!"); + this->fd = -1; + } +} + +void ListenSocket::HandleEvent(EventType et, int errornum) +{ + insp_sockaddr sock_us; // our port number + socklen_t uslen; // length of our port number + insp_sockaddr client; + socklen_t length; + int incomingSockfd, in_port; + + ServerInstance->Log(DEBUG,"Handle ListenSocket event"); + + uslen = sizeof(sock_us); + length = sizeof(client); + incomingSockfd = accept (this->GetFd(),(struct sockaddr*)&client, &length); + + if ((incomingSockfd > -1) && (!getsockname(incomingSockfd, (sockaddr*)&sock_us, &uslen))) + { +#ifdef IPV6 + in_port = ntohs(sock_us.sin6_port); +#else + in_port = ntohs(sock_us.sin_port); +#endif + ServerInstance->Log(DEBUG,"Accepted socket %d",incomingSockfd); + NonBlocking(incomingSockfd); + if (ServerInstance->Config->GetIOHook(in_port)) + { + try + { +#ifdef IPV6 + ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin6_addr), in_port); +#else + ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port); +#endif + } + catch (ModuleException& modexcept) + { + ServerInstance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); + } + } + ServerInstance->stats->statsAccept++; +#ifdef IPV6 + ServerInstance->Log(DEBUG,"Add ipv6 client"); + userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin6_addr); +#else + ServerInstance->Log(DEBUG,"Add ipv4 client"); + userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin_addr); +#endif + ServerInstance->Log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd); + } + else + { + ServerInstance->Log(DEBUG,"Accept failed on fd %d: %s",incomingSockfd,strerror(errno)); + shutdown(incomingSockfd,2); + close(incomingSockfd); + ServerInstance->stats->statsRefused++; + } +} + /* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */ bool irc::sockets::MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits) { @@ -151,6 +215,7 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma else { /* No 'number of bits' field! */ + free(mask); return false; } @@ -237,7 +302,7 @@ bool InspIRCd::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server if ((*addr) && (insp_aton(addr,&addy) < 1)) { - log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr); + this->Log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr); return false;; } @@ -273,10 +338,10 @@ bool InspIRCd::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server } else { - log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); + this->Log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); if (listen(sockfd, Config->MaxConn) == -1) { - log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); + this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); return false; } else @@ -297,8 +362,7 @@ int irc::sockets::OpenTCPSocket() if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0) { - log(DEFAULT,"Error creating TCP socket: %s",strerror(errno)); - return (ERROR); + return ERROR; } else { @@ -325,98 +389,83 @@ bool InspIRCd::HasPort(int port, char* addr) } /* XXX: Probably belongs in class InspIRCd */ -int InspIRCd::BindPorts(bool bail) +int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports) { char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; insp_sockaddr client, server; int clientportcount = 0; int BoundPortCount = 0; - if (!bail) + ports_found = 0; + + int InitialPortCount = stats->BoundPortCount; + this->Log(DEBUG,"Initial port count: %d",InitialPortCount); + + for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) { - int InitialPortCount = stats->BoundPortCount; - log(DEBUG,"Initial port count: %d",InitialPortCount); + 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); - for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) + if ((!*Type) || (!strcmp(Type,"clients"))) { - 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 (((!*Type) || (!strcmp(Type,"clients"))) && (!HasPort(atoi(configToken),Addr))) + irc::portparser portrange(configToken, false); + long portno = -1; + while ((portno = portrange.GetToken())) { - // modules handle server bind types now - Config->ports[clientportcount+InitialPortCount] = atoi(configToken); - if (*Addr == '*') - *Addr = 0; - - strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256); - clientportcount++; - log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type); + if (!HasPort(portno, Addr)) + { + ports_found++; + Config->ports[clientportcount+InitialPortCount] = portno; + if (*Addr == '*') + *Addr = 0; + + strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256); + clientportcount++; + this->Log(DEBUG,"NEW binding %s:%d [%s] from config",Addr, portno, Type); + } } } - int PortCount = clientportcount; - if (PortCount) + + if (!bail) { - for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++) + int PortCount = clientportcount; + if (PortCount) { - if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR) - { - log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]); - } - else + BoundPortCount = stats->BoundPortCount; + for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++) { - if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count])) + int fd = OpenTCPSocket(); + if (fd == ERROR) { - log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); + this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]); + failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count])); } else { - /* Associate the new open port with a slot in the socket engine */ - if (Config->openSockfd[count] > -1) + Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]); + if (Config->openSockfd[BoundPortCount]->GetFd() > -1) { - if (!SE->AddFd(Config->openSockfd[count],true,X_LISTEN)) + if (!SE->AddFd(Config->openSockfd[BoundPortCount])) { - log(DEFAULT,"ERK! Failed to add listening port to socket engine!"); - shutdown(Config->openSockfd[count],2); - close(Config->openSockfd[count]); + this->Log(DEFAULT,"ERK! Failed to add listening port to socket engine!"); + shutdown(Config->openSockfd[BoundPortCount]->GetFd(),2); + close(Config->openSockfd[BoundPortCount]->GetFd()); + delete Config->openSockfd[BoundPortCount]; + failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count])); } else BoundPortCount++; } } } + return InitialPortCount + BoundPortCount; } - return InitialPortCount + BoundPortCount; - } - else - { - log(DEBUG,"There is nothing new to bind!"); - } - return InitialPortCount; - } - - for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) - { - 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 ((!*Type) || (!strcmp(Type,"clients"))) - { - // modules handle server bind types now - Config->ports[clientportcount] = atoi(configToken); - - // If the client put bind "*", this is an unrealism. - // We don't actually support this as documented, but - // i got fed up of people trying it, so now it converts - // it to an empty string meaning the same 'bind to all'. - if (*Addr == '*') - *Addr = 0; - - strlcpy(Config->addrs[clientportcount],Addr,256); - clientportcount++; - log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type); + else + { + this->Log(DEBUG,"There is nothing new to bind!"); + } + return InitialPortCount; } } @@ -424,21 +473,21 @@ int InspIRCd::BindPorts(bool bail) for (int count = 0; count < PortCount; count++) { - if ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR) + int fd = OpenTCPSocket(); + if (fd == ERROR) { - log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]); + this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]); + failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count])); } else { - if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count])) + Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]); + if (Config->openSockfd[BoundPortCount]->GetFd() > -1) { - log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); - } - else - { - /* well we at least bound to one socket so we'll continue */ BoundPortCount++; } + else + failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count])); } } return BoundPortCount;