X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=693685428bb3340b219cffe20a15b0dd6e624a6f;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=2a33442fed32097c6bf2ff6a846aa3f62a2f48e6;hpb=3e50e674c3aab0827e62d21e75b828bff0e88da7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 2a33442fe..693685428 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -25,19 +25,21 @@ #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 */ +/* 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 */ }; /* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */ @@ -46,10 +48,6 @@ bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mas 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 */ - /* We shouldnt match anything, /0 is always valid */ - if (!mask_bits) - return true; - /* First compare the whole bytes, if they dont match, return false */ if (memcmp(address, mask, divisor)) return false; @@ -64,6 +62,7 @@ bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mas return true; } +/* Match CIDR, but dont attempt to match() against leading *!*@ sections */ bool MatchCIDR(const char* address, const char* cidr_mask) { return MatchCIDR(address, cidr_mask, false); @@ -72,6 +71,9 @@ bool MatchCIDR(const char* address, const char* cidr_mask) /* 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) { @@ -90,23 +92,35 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern * of the @ symbol in each */ char* address_dupe = strdup(address); char* cidr_dupe = strdup(cidr_mask); - - char* username_mask_pos = strchr(cidr_dupe, '@'); - char* username_addr_pos = strchr(address_dupe, '@'); + + /* 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; - bool result = (match(address_dupe, cidr_dupe) && MatchCIDR(username_addr_pos + 1, username_mask_pos + 1)); + /* 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); @@ -114,6 +128,9 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern } else { + /* Make a copy of the cidr mask string, + * we're going to change it + */ mask = strdup(cidr_mask); } @@ -121,7 +138,8 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern 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) { @@ -150,6 +168,9 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern } else { + /* The address was valid ipv6, but the mask + * that goes with it wasnt. + */ free(mask); return false; } @@ -168,20 +189,38 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern } 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 Blocking(int s) +{ + int flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags ^ O_NONBLOCK); +} + +inline void 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'. @@ -233,7 +272,7 @@ bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port else { log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); - if (listen(sockfd, Config->MaxConn) == -1) + if (listen(sockfd, ServerInstance->Config->MaxConn) == -1) { log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); return false; @@ -272,6 +311,7 @@ int OpenTCPSocket() bool HasPort(int port, char* addr) { + ServerConfig* Config = ServerInstance->Config; for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++) { if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr))) @@ -288,6 +328,7 @@ int BindPorts(bool bail) insp_sockaddr client, server; int clientportcount = 0; int BoundPortCount = 0; + ServerConfig* Config = ServerInstance->Config; if (!bail) { @@ -320,19 +361,27 @@ int BindPorts(bool bail) 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])) - { - 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 (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count])) { - ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN); - BoundPortCount++; + 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++; + } } } } @@ -376,28 +425,20 @@ int BindPorts(bool bail) 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])) - { - 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++; + 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++; + } } } - - /* 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; }