FIX channel user count stuff. next to do, order the user count list

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

diff --git a/src/socket.cpp b/src/socket.cpp
index f9b605d3be05a2a1377d18ece0befafca5489261..793e930ffb903665474b2800d490956227aa3f53 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -26,9 +26,6 @@
 extern InspIRCd* ServerInstance;
 extern ServerConfig* Config;
 extern time_t TIME;
-extern int openSockfd[MAX_DESCRIPTORS];
-
-InspSocket* socket_ref[MAX_DESCRIPTORS];
 
 /** This will bind a socket to a port. It works for UDP/TCP.
  * If a hostname is given to bind to, the function will first
@@ -167,20 +164,23 @@ int BindPorts(bool bail)
                {
                        for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++)
                        {
-                               if ((openSockfd[count] = OpenTCPSocket()) == ERROR)
+                               if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR)
                                {
-                                       log(DEBUG,"Bad fd %d binding port [%s:%d]",openSockfd[count],Config->addrs[count],Config->ports[count]);
+                                       log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]);
                                        return ERROR;
                                }
-                               if (!BindSocket(openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
+                               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 */
-                                       ServerInstance->SE->AddFd(openSockfd[count],true,X_LISTEN);
-                                       BoundPortCount++;
+                                       if (Config->openSockfd[count] > -1)
+                                       {
+                                               ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
+                                               BoundPortCount++;
+                                       }
                                }
                        }
                        return InitialPortCount + BoundPortCount;
@@ -220,13 +220,13 @@ int BindPorts(bool bail)
 
        for (int count = 0; count < PortCount; count++)
        {
-               if ((openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
+               if ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
                {
-                       log(DEBUG,"Bad fd %d binding port [%s:%d]",openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]);
+                       log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]);
                        return ERROR;
                }
 
-               if (!BindSocket(openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
+               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));
                }