X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=693685428bb3340b219cffe20a15b0dd6e624a6f;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=561435a2a5c50e7eadc06f13d60ef7d09950d8b3;hpb=ab2c48b5c1dc2da0ef220c90446f32f15c2284fd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 561435a2a..693685428 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -14,268 +14,443 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include +#include "configreader.h" #include "socket.h" #include "inspircd.h" -#include "inspircd_io.h" #include "inspstring.h" #include "helperfuncs.h" #include "socketengine.h" +#include "wildcard.h" +#include "message.h" -extern SocketEngine* SE; - -extern int boundPortCount; -extern int openSockfd[MAXSOCKS]; +extern InspIRCd* ServerInstance; extern time_t TIME; -InspSocket* socket_ref[65535]; +/* 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 */ +}; -InspSocket::InspSocket() +/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */ +bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits) { - this->state = I_DISCONNECTED; + 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 */ + + /* 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 */ + if (modulus) + if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus])) + /* If they dont match, return false */ + return false; + + /* The address matches the mask, to mask_bits bits of mask */ + return true; } -InspSocket::InspSocket(int newfd, char* ip) +/* Match CIDR, but dont attempt to match() against leading *!*@ sections */ +bool MatchCIDR(const char* address, const char* cidr_mask) { - this->fd = newfd; - this->state = I_CONNECTED; - this->IP = ip; - SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; + return MatchCIDR(address, cidr_mask, false); } -InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime) +/* 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 MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username) { - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) + unsigned char addr_raw[16]; + unsigned char mask_raw[16]; + unsigned int bits = 0; + 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) { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - log(DEBUG,"OpenTCPSocket() error"); - return; + /* 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 { - if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR) - { - this->Close(); - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - log(DEBUG,"BindSocket() error %s",strerror(errno)); - return; - } - else - { - this->state = I_LISTENING; - SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - log(DEBUG,"New socket now in I_LISTENING state"); - return; - } - } - } else { - char* ip; - this->host = host; - hostent* hoste = gethostbyname(host.c_str()); - if (!hoste) { - ip = (char*)host.c_str(); - } else { - struct in_addr* ia = (in_addr*)hoste->h_addr; - ip = inet_ntoa(*ia); + /* 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; + + + /* 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! */ + return false; + } - this->IP = ip; +#ifdef SUPPORT_IP6LINKS + in6_addr address_in6; + in6_addr mask_in6; - timeout_end = time(NULL)+maxtime; - timeout = false; - if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + if (inet_pton(AF_INET6, address, &address_in6) > 0) + { + if (inet_pton(AF_INET6, mask, &mask_in6) > 0) + { + memcpy(&addr_raw, &address_in6.s6_addr, 16); + memcpy(&mask_raw, &mask_in6.s6_addr, 16); + + if (bits > 128) + bits = 128; + } + else { - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - return; + /* The address was valid ipv6, but the mask + * that goes with it wasnt. + */ + free(mask); + return false; } - this->port = port; - inet_aton(ip,&addy); - addr.sin_family = AF_INET; - addr.sin_addr = addy; - addr.sin_port = htons(this->port); - - int flags; - flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); - - if(connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1) - { - if (errno != EINPROGRESS) - { - this->Close(); - this->OnError(I_ERR_CONNECT); - this->state = I_ERROR; - return; - } - } - this->state = I_CONNECTING; - SE->AddFd(this->fd,false,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - return; } -} + else +#endif + if (inet_pton(AF_INET, address, &address_in4) > 0) + { + if (inet_pton(AF_INET, mask, &mask_in4) > 0) + { + memcpy(&addr_raw, &address_in4.s_addr, 4); + memcpy(&mask_raw, &mask_in4.s_addr, 4); -void InspSocket::Close() -{ - if (this->fd != -1) + if (bits > 32) + bits = 32; + } + else + { + /* The address was valid ipv4, + * but the mask that went with it wasnt. + */ + free(mask); + return false; + } + } + else { - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); - socket_ref[this->fd] = NULL; - this->fd = -1; + /* 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 Blocking(int s) +{ + int flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags ^ O_NONBLOCK); } -std::string InspSocket::GetIP() +inline void NonBlocking(int s) { - return this->IP; + int flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags | O_NONBLOCK); } -char* InspSocket::Read() + +/** 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) { - int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); - if (n > 0) + memset(&server,0,sizeof(server)); + insp_inaddr addy; + + if (*addr == '*') + *addr = 0; + + if ((*addr) && (insp_aton(addr,&addy) < 1)) + { + log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr); + return false;; + } + +#ifdef IPV6 + server.sin6_family = AF_FAMILY; +#else + server.sin_family = AF_FAMILY; +#endif + if (!*addr) { - ibuf[n] = 0; - return ibuf; +#ifdef IPV6 + memcpy(&addy, &server.sin6_addr, sizeof(in6_addr)); +#else + server.sin_addr.s_addr = htonl(INADDR_ANY); +#endif } else { - log(DEBUG,"EOF or error on socket"); - return NULL; +#ifdef IPV6 + memcpy(&addy, &server.sin6_addr, sizeof(in6_addr)); +#else + server.sin_addr = addy; +#endif + } +#ifdef IPV6 + server.sin6_port = htons(port); +#else + server.sin_port = htons(port); +#endif + if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0) + { + return false; + } + else + { + log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); + if (listen(sockfd, ServerInstance->Config->MaxConn) == -1) + { + log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); + return false; + } + else + { + NonBlocking(sockfd); + return true; + } } } -// There are two possible outcomes to this function. -// It will either write all of the data, or an undefined amount. -// If an undefined amount is written the connection has failed -// and should be aborted. -int InspSocket::Write(std::string data) -{ - this->Buffer = this->Buffer + data; - this->FlushWriteBuffer(); - return data.length(); -} -void InspSocket::FlushWriteBuffer() +// Open a TCP Socket +int OpenTCPSocket() { - int result = 0; - if (this->Buffer.length()) + int sockfd; + int on = 1; + struct linger linger = { 0 }; + + if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0) { - result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0); - if (result > 0) - { - /* If we wrote some, advance the buffer forwards */ - char* n = (char*)this->Buffer.c_str(); - n += result; - this->Buffer = n; - } + log(DEFAULT,"Error creating TCP socket: %s",strerror(errno)); + return (ERROR); + } + else + { + setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &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)); + return (sockfd); } } -bool InspSocket::Timeout(time_t current) +bool HasPort(int port, char* addr) { - if ((this->state == I_CONNECTING) && (current > timeout_end)) + ServerConfig* Config = ServerInstance->Config; + for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++) { - // for non-listening sockets, the timeout can occur - // which causes termination of the connection after - // the given number of seconds without a successful - // connection. - this->OnTimeout(); - this->OnError(I_ERR_TIMEOUT); - timeout = true; - this->state = I_ERROR; - return true; + if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr))) + { + return true; + } } - if (this->Buffer.length()) - this->FlushWriteBuffer(); return false; } -bool InspSocket::Poll() +int BindPorts(bool bail) { - int incoming = -1; - - switch (this->state) + char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; + insp_sockaddr client, server; + int clientportcount = 0; + int BoundPortCount = 0; + ServerConfig* Config = ServerInstance->Config; + + if (!bail) { - case I_CONNECTING: - this->SetState(I_CONNECTED); - /* Our socket was in write-state, so delete it and re-add it - * in read-state. - */ - SE->DelFd(this->fd); - SE->AddFd(this->fd,true,X_ESTAB_MODULE); - return this->OnConnected(); - break; - case I_LISTENING: - length = sizeof (client); - incoming = accept (this->fd, (sockaddr*)&client,&length); - this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr)); - return true; - break; - case I_CONNECTED: - return this->OnDataReady(); - break; - default: - break; + int InitialPortCount = ServerInstance->stats->BoundPortCount; + log(DEBUG,"Initial port count: %d",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"))) && (!HasPort(atoi(configToken),Addr))) + { + // 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); + } + } + int PortCount = clientportcount; + if (PortCount) + { + 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]); + } + else + { + if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count])) + { + log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); + } + else + { + /* Associate the new open port with a slot in the socket engine */ + if (Config->openSockfd[count] > -1) + { + if (!ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN)) + { + log(DEFAULT,"ERK! Failed to add listening port to socket engine!"); + shutdown(Config->openSockfd[count],2); + close(Config->openSockfd[count]); + } + else + BoundPortCount++; + } + } + } + } + return InitialPortCount + BoundPortCount; + } + else + { + log(DEBUG,"There is nothing new to bind!"); + } + return InitialPortCount; } - return true; -} + 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); -void InspSocket::SetState(InspSocketState s) -{ - log(DEBUG,"Socket state change"); - this->state = s; -} + if ((!*Type) || (!strcmp(Type,"clients"))) + { + // modules handle server bind types now + Config->ports[clientportcount] = atoi(configToken); -InspSocketState InspSocket::GetState() -{ - return this->state; + // 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); + } + } + + int PortCount = clientportcount; + + 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]); + } + else + { + if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count])) + { + 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++; + } + } + } + return BoundPortCount; } -int InspSocket::GetFd() +const char* insp_ntoa(insp_inaddr n) { - return this->fd; + static char buf[1024]; + inet_ntop(AF_FAMILY, &n, buf, sizeof(buf)); + return buf; } -bool InspSocket::OnConnected() { return true; } -void InspSocket::OnError(InspSocketError e) { return; } -int InspSocket::OnDisconnect() { return 0; } -int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; } -bool InspSocket::OnDataReady() { return true; } -void InspSocket::OnTimeout() { return; } -void InspSocket::OnClose() { return; } - -InspSocket::~InspSocket() +int insp_aton(const char* a, insp_inaddr* n) { - this->Close(); + return inet_pton(AF_FAMILY, a, n); } -/* -int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr) -int OpenTCPSocket (void) -*/