X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=4bf9dc30b96aecc55daee0f2c5b5810a709803b0;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=14fe580adf804e366bae87eb9a8d2e12bc18ec5d;hpb=f4a4901fee693791493c340fd380658a24d4cf26;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 14fe580ad..4bf9dc30b 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,28 +18,98 @@ #include "configreader.h" #include "socket.h" #include "inspircd.h" -#include "inspstring.h" -#include "helperfuncs.h" #include "socketengine.h" -#include "message.h" - -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern time_t TIME; - -/* Used when comparing CIDR masks for the modulus bits left over */ - -char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits */ - 0x80, /* 10000000 - 1 bits */ - 0xC0, /* 11000000 - 2 bits */ - 0xE0, /* 11100000 - 3 bits */ - 0xF0, /* 11110000 - 4 bits */ - 0xF8, /* 11111000 - 5 bits */ - 0xFC, /* 11111100 - 6 bits */ - 0xFE /* 11111110 - 7 bits */ +#include "wildcard.h" + +using namespace std; +using namespace irc::sockets; + +/* Used when comparing CIDR masks for the modulus bits left over. + * A lot of ircd's seem to do this: + * ((-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 */ + 0x80, /* 10000000 - 1 bits */ + 0xC0, /* 11000000 - 2 bits */ + 0xE0, /* 11100000 - 3 bits */ + 0xF0, /* 11110000 - 4 bits */ + 0xF8, /* 11111000 - 5 bits */ + 0xFC, /* 11111100 - 6 bits */ + 0xFE /* 11111110 - 7 bits */ }; -bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_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) +{ + 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) { 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 */ @@ -58,23 +128,96 @@ bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mas return true; } -bool MatchCIDR(const char* address, const char* cidr_mask) +/* Match CIDR, but dont attempt to match() against leading *!*@ sections */ +bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask) +{ + return MatchCIDR(address, cidr_mask, false); +} + +/* Match CIDR strings, e.g. 127.0.0.1 to 127.0.0.0/8 or 3ffe:1:5:6::8 to 3ffe:1::0/32 + * If you have a lot of hosts to match, youre probably better off building your mask once + * and then using the lower level MatchCIDRBits directly. + * + * This will also attempt to match any leading usernames or nicknames on the mask, using + * match(), when match_with_username is true. + */ +bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username) { unsigned char addr_raw[16]; unsigned char mask_raw[16]; unsigned int bits = 0; - char* mask = strdup(cidr_mask); + char* mask = NULL; + + /* The caller is trying to match ident@/bits. + * Chop off the ident@ portion, use match() on it + * seperately. + */ + if (match_with_username) + { + /* Duplicate the strings, and try to find the position + * of the @ symbol in each */ + char* address_dupe = strdup(address); + char* cidr_dupe = strdup(cidr_mask); + + /* Use strchr not strrchr, because its going to be nearer to the left */ + char* username_mask_pos = strrchr(cidr_dupe, '@'); + char* username_addr_pos = strrchr(address_dupe, '@'); + + /* Both strings have an @ symbol in them */ + if (username_mask_pos && username_addr_pos) + { + /* Zero out the location of the @ symbol */ + *username_mask_pos = *username_addr_pos = 0; + + /* Try and match() the strings before the @ + * symbols, and recursively call MatchCIDR without + * username matching enabled to match the host part. + */ + bool result = (match(address_dupe, cidr_dupe) && MatchCIDR(username_addr_pos + 1, username_mask_pos + 1, false)); + + /* Free the stuff we created */ + free(address_dupe); + free(cidr_dupe); + + /* Return a result */ + return result; + } + else + { + /* One or both didnt have an @ in, + * just match as CIDR + */ + free(address_dupe); + free(cidr_dupe); + mask = strdup(cidr_mask); + } + } + else + { + /* Make a copy of the cidr mask string, + * we're going to change it + */ + mask = strdup(cidr_mask); + } in_addr address_in4; in_addr mask_in4; - char* bits_chars = strchr(mask,'/'); + + /* Use strrchr for this, its nearer to the right */ + char* bits_chars = strrchr(mask,'/'); if (bits_chars) { bits = atoi(bits_chars + 1); *bits_chars = 0; } + else + { + /* No 'number of bits' field! */ + free(mask); + return false; + } #ifdef SUPPORT_IP6LINKS in6_addr address_in6; @@ -86,9 +229,15 @@ bool MatchCIDR(const char* address, const char* cidr_mask) { memcpy(&addr_raw, &address_in6.s6_addr, 16); memcpy(&mask_raw, &mask_in6.s6_addr, 16); + + if (bits > 128) + bits = 128; } else { + /* The address was valid ipv6, but the mask + * that goes with it wasnt. + */ free(mask); return false; } @@ -101,28 +250,49 @@ bool MatchCIDR(const char* address, const char* cidr_mask) { memcpy(&addr_raw, &address_in4.s_addr, 4); memcpy(&mask_raw, &mask_in4.s_addr, 4); + + if (bits > 32) + bits = 32; } else { + /* The address was valid ipv4, + * but the mask that went with it wasnt. + */ free(mask); return false; } } else { + /* The address was neither ipv4 or ipv6 */ free(mask); return false; } + /* Low-level-match the bits in the raw data */ free(mask); return MatchCIDRBits(addr_raw, mask_raw, bits); } +inline void irc::sockets::Blocking(int s) +{ + int flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags ^ O_NONBLOCK); +} + +inline 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'. */ -bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) +bool InspIRCd::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) { memset(&server,0,sizeof(server)); insp_inaddr addy; @@ -132,7 +302,7 @@ bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port 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;; } @@ -168,10 +338,10 @@ bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port } 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 @@ -184,7 +354,7 @@ bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port // Open a TCP Socket -int OpenTCPSocket() +int irc::sockets::OpenTCPSocket() { int sockfd; int on = 1; @@ -192,8 +362,7 @@ int OpenTCPSocket() if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0) { - log(DEFAULT,"Error creating TCP socket: %s",strerror(errno)); - return (ERROR); + return ERROR; } else { @@ -206,9 +375,10 @@ int OpenTCPSocket() } } -bool HasPort(int port, char* addr) +/* XXX: Probably belongs in class InspIRCd */ +bool InspIRCd::HasPort(int port, char* addr) { - for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++) + for (unsigned long count = 0; count < stats->BoundPortCount; count++) { if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr))) { @@ -218,7 +388,8 @@ bool HasPort(int port, char* addr) return false; } -int BindPorts(bool bail) +/* XXX: Probably belongs in class InspIRCd */ +int InspIRCd::BindPorts(bool bail) { char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; insp_sockaddr client, server; @@ -227,8 +398,8 @@ int BindPorts(bool bail) if (!bail) { - int InitialPortCount = ServerInstance->stats->BoundPortCount; - log(DEBUG,"Initial port count: %d",InitialPortCount); + int InitialPortCount = stats->BoundPortCount; + this->Log(DEBUG,"Initial port count: %d",InitialPortCount); for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) { @@ -245,38 +416,46 @@ int BindPorts(bool bail) strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256); clientportcount++; - log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type); + this->Log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type); } } int PortCount = clientportcount; if (PortCount) { + BoundPortCount = stats->BoundPortCount; for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++) { - if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR) - { - log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]); - return ERROR; - } - 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]); } 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) { - ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN); - BoundPortCount++; + if (!SE->AddFd(Config->openSockfd[BoundPortCount])) + { + 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]; + } + else + BoundPortCount++; } + /*if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count])) + { + this->Log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); + }*/ } } return InitialPortCount + BoundPortCount; } else { - log(DEBUG,"There is nothing new to bind!"); + this->Log(DEBUG,"There is nothing new to bind!"); } return InitialPortCount; } @@ -301,7 +480,7 @@ int BindPorts(bool bail) strlcpy(Config->addrs[clientportcount],Addr,256); clientportcount++; - log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type); + this->Log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type); } } @@ -309,42 +488,35 @@ int BindPorts(bool bail) for (int count = 0; count < PortCount; count++) { - if ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR) - { - log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]); - return ERROR; - } - - if (!BindSocket(Config->openSockfd[BoundPortCount],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]); } else { - /* well we at least bound to one socket so we'll continue */ - BoundPortCount++; + Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]); + if (Config->openSockfd[BoundPortCount]->GetFd() > -1) + { + BoundPortCount++; + } + /*if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count])) + { + this->Log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); + }*/ } } - - /* if we didn't bind to anything then abort */ - if (!BoundPortCount) - { - log(DEFAULT,"No ports bound, bailing!"); - printf("\nERROR: Could not bind any of %d ports! Please check your configuration.\n\n", PortCount); - return ERROR; - } - return BoundPortCount; } -const char* insp_ntoa(insp_inaddr n) +const char* irc::sockets::insp_ntoa(insp_inaddr n) { static char buf[1024]; inet_ntop(AF_FAMILY, &n, buf, sizeof(buf)); return buf; } -int insp_aton(const char* a, insp_inaddr* n) +int irc::sockets::insp_aton(const char* a, insp_inaddr* n) { return inet_pton(AF_FAMILY, a, n); }