X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=c33eee5a6aee2a352cd4414c5dfcdb4f5075b84d;hb=2b3394855d5adddb16285b905503d9ffe5a1d963;hp=67931e49bb5f83bda01967c0d2b19c48d951467e;hpb=2cd299419273914624dcc64afa7928577fe52bb3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 67931e49b..c33eee5a6 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -11,10 +11,8 @@ * --------------------------------------------------- */ -#include -#include "configreader.h" -#include "socket.h" #include "inspircd.h" +#include "socket.h" #include "socketengine.h" #include "wildcard.h" @@ -25,7 +23,7 @@ using namespace irc::sockets; * ((-1) << (8 - (mask % 8))) * But imho, it sucks in comparison to a nice neat lookup table. */ -const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used */ +const unsigned char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used */ 0x80, /* 10000000 - 1 bits */ 0xC0, /* 11000000 - 2 bits */ 0xE0, /* 11100000 - 3 bits */ @@ -36,27 +34,31 @@ const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used }; -ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance), desc("plaintext") +ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port) { - this->SetFd(sockfd); - if (!Instance->BindSocket(this->fd,port,addr)) - this->fd = -1; + this->SetFd(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 - this->family = AF_INET; -#else - this->family = AF_INET; + if ((!*addr) || (strchr(addr,':'))) + this->family = AF_INET6; + else #endif + this->family = AF_INET; + Instance->SE->AddFd(this); + } } ListenSocket::~ListenSocket() { if (this->GetFd() > -1) { - shutdown(this->fd, 2); - close(this->fd); + ServerInstance->SE->DelFd(this); + ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd); + if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this)) + ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno)); this->fd = -1; } } @@ -75,17 +77,15 @@ void ListenSocket::HandleEvent(EventType et, int errornum) length = sizeof(sockaddr_in6); } else +#endif { uslen = sizeof(sockaddr_in); length = sizeof(sockaddr_in); } -#else - uslen = sizeof(sockaddr_in); - length = sizeof(sockaddr_in); -#endif - incomingSockfd = accept (this->GetFd(), (sockaddr*)client, &length); - if ((incomingSockfd > -1) && (!getsockname(incomingSockfd, sock_us, &uslen))) + incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length); + + if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen))) { char buf[MAXBUF]; #ifdef IPV6 @@ -95,15 +95,14 @@ void ListenSocket::HandleEvent(EventType et, int errornum) in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port); } else +#endif { inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf)); in_port = ntohs(((sockaddr_in*)sock_us)->sin_port); } -#else - inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf)); - in_port = ntohs(((sockaddr_in*)sock_us)->sin_port); -#endif - NonBlocking(incomingSockfd); + + ServerInstance->SE->NonBlocking(incomingSockfd); + if (ServerInstance->Config->GetIOHook(in_port)) { try @@ -120,7 +119,7 @@ void ListenSocket::HandleEvent(EventType et, int errornum) } else { - shutdown(incomingSockfd,2); + ServerInstance->SE->Shutdown(incomingSockfd, 2); close(incomingSockfd); ServerInstance->stats->statsRefused++; } @@ -131,19 +130,19 @@ void ListenSocket::HandleEvent(EventType et, int errornum) /* 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) { - unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */ - unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */ + unsigned int divisor = mask_bits / 8; /* Number of whole bytes in the mask */ + unsigned int modulus = mask_bits % 8; /* Remaining bits in the mask after whole bytes are dealt with */ - /* First compare the whole bytes, if they dont match, return false */ - if (memcmp(address, mask, divisor)) - return false; - - /* Now if there are any remainder bits, we compare them with logic AND */ + /* First (this is faster) compare the odd bits with logic ops */ if (modulus) if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus])) /* If they dont match, return false */ return false; + /* Secondly (this is slower) compare the whole bytes */ + if (memcmp(address, mask, divisor)) + return false; + /* The address matches the mask, to mask_bits bits of mask */ return true; } @@ -295,18 +294,6 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma return MatchCIDRBits(addr_raw, mask_raw, bits); } -void irc::sockets::Blocking(int s) -{ - int flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags ^ O_NONBLOCK); -} - -void irc::sockets::NonBlocking(int s) -{ - int flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags | O_NONBLOCK); -} - /** 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'. @@ -401,7 +388,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten) ((sockaddr_in*)server)->sin_port = htons(port); size = sizeof(sockaddr_in); #endif - ret = bind(sockfd, server, size); + ret = SE->Bind(sockfd, server, size); delete[] server; if (ret < 0) @@ -412,19 +399,21 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten) { if (dolisten) { - if (listen(sockfd, Config->MaxConn) == -1) + if (SE->Listen(sockfd, Config->MaxConn) == -1) { this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); return false; } else { - NonBlocking(sockfd); + this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port); + SE->NonBlocking(sockfd); return true; } } else { + this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port); return true; } } @@ -450,39 +439,25 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype) } else { - setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on)); /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */ linger.l_onoff = 1; linger.l_linger = 1; - setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger,sizeof(linger)); + setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger)); return (sockfd); } } -/* XXX: Probably belongs in class InspIRCd */ -bool InspIRCd::HasPort(int port, char* addr) -{ - for (unsigned long count = 0; count < stats->BoundPortCount; count++) - { - if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr))) - { - return true; - } - } - return false; -} - -/* XXX: Probably belongs in class InspIRCd */ 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; - - ports_found = 0; + int bound = 0; + bool started_with_nothing = (Config->ports.size() == 0); + std::vector > old_ports; - int InitialPortCount = stats->BoundPortCount; + /* XXX: Make a copy of the old ip/port pairs here */ + 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++) { @@ -493,80 +468,66 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port if ((!*Type) || (!strcmp(Type,"clients"))) { irc::portparser portrange(configToken, false); - long portno = -1; + int portno = -1; while ((portno = portrange.GetToken())) { - if (!HasPort(portno, Addr)) - { - ports_found++; - Config->ports[clientportcount+InitialPortCount] = portno; - if (*Addr == '*') - *Addr = 0; + if (*Addr == '*') + *Addr = 0; - strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256); - clientportcount++; - } - } - } - - if (!bail) - { - int PortCount = clientportcount; - if (PortCount) - { - BoundPortCount = stats->BoundPortCount; - for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++) + bool skip = false; + for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) { - int fd = OpenTCPSocket(Config->addrs[count]); - if (fd == ERROR) - { - failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count])); - } - else + if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno)) { - Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]); - if (Config->openSockfd[BoundPortCount]->GetFd() > -1) + skip = true; + /* XXX: Here, erase from our copy of the list */ + for (std::vector >::iterator k = old_ports.begin(); k != old_ports.end(); ++k) { - if (!SE->AddFd(Config->openSockfd[BoundPortCount])) + if ((k->first == Addr) && (k->second == portno)) { - 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])); + old_ports.erase(k); + break; } - else - BoundPortCount++; } } } - return InitialPortCount + BoundPortCount; + if (!skip) + { + ListenSocket* ll = new ListenSocket(this, portno, Addr); + if (ll->GetFd() > -1) + { + bound++; + Config->ports.push_back(ll); + } + else + { + failed_ports.push_back(std::make_pair(Addr, portno)); + } + ports_found++; + } } - return InitialPortCount; } } - int PortCount = clientportcount; - - for (int count = 0; count < PortCount; count++) + /* XXX: Here, anything left in our copy list, close as removed */ + if (!started_with_nothing) { - int fd = OpenTCPSocket(Config->addrs[count]); - if (fd == ERROR) - { - failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count])); - } - else + for (size_t k = 0; k < old_ports.size(); ++k) { - Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]); - if (Config->openSockfd[BoundPortCount]->GetFd() > -1) + for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) { - BoundPortCount++; + if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second)) + { + this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second); + delete *n; + Config->ports.erase(n); + break; + } } - else - failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count])); } } - return BoundPortCount; + + return bound; } const char* irc::sockets::insp_ntoa(insp_inaddr n)