kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 61c27a7c9a95b75987393e7c23075631918082d1..1916bb555989bede5609ab1458c7ddccaa54698a 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -28,16 +28,19 @@ 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 +49,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;
@@ -94,9 +93,10 @@ 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)
@@ -139,7 +139,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)
        {
@@ -346,19 +347,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++;
+                                               }
                                        }
                                }
                        }
@@ -402,28 +411,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;
 }