Refactor port binding, warning not yet tested fully

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 67931e49bb5f83bda01967c0d2b19c48d951467e..a828d1ece8d4d5b943ebf74d19ed22f7f2088381 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -36,27 +36,33 @@ const char inverted_bits[8] = {     0x00, /* 00000000 - 0 bits - never actually used
 };
 
 
-ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance), desc("plaintext")
+ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
 {
-       this->SetFd(sockfd);
-       if (!Instance->BindSocket(this->fd,port,addr))
-               this->fd = -1;
+       this->SetFd(OpenTCPSocket(addr));
+       if (this->GetFd() > -1)
+       {
+               if (!Instance->BindSocket(this->fd,port,addr))
+                       this->fd = -1;
 #ifdef IPV6
-       if ((!*addr) || (strchr(addr,':')))
-               this->family = AF_INET6;
-       else
-               this->family = AF_INET;
+               if ((!*addr) || (strchr(addr,':')))
+                       this->family = AF_INET6;
+               else
+                       this->family = AF_INET;
 #else
-       this->family = AF_INET;
+               this->family = AF_INET;
 #endif
+               Instance->SE->AddFd(this);
+       }
 }
 
 ListenSocket::~ListenSocket()
 {
        if (this->GetFd() > -1)
        {
-               shutdown(this->fd, 2);
-               close(this->fd);
+               ServerInstance->SE->DelFd(this);
+               ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
+               if (shutdown(this->fd, 2) || close(this->fd))
+                       ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
                this->fd = -1;
        }
 }
@@ -419,12 +425,14 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
                        }
                        else
                        {
+                               this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
                                NonBlocking(sockfd);
                                return true;
                        }
                }
                else
                {
+                       this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
                        return true;
                }
        }
@@ -459,30 +467,11 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype)
        }
 }
 
-/* XXX: Probably belongs in class InspIRCd */
-bool InspIRCd::HasPort(int port, char* addr)
-{
-       for (unsigned long count = 0; count < stats->BoundPortCount; count++)
-       {
-               if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
-               {
-                       return true;
-               }
-       }
-       return false;
-}
-
 /* XXX: Probably belongs in class InspIRCd */
 int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
 {
        char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
-       insp_sockaddr client, server;
-       int clientportcount = 0;
-       int BoundPortCount = 0;
-
-       ports_found = 0;
-
-       int InitialPortCount = stats->BoundPortCount;
+       int bound = 0;
 
        for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
        {
@@ -493,80 +482,34 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
                if ((!*Type) || (!strcmp(Type,"clients")))
                {
                        irc::portparser portrange(configToken, false);
-                       long portno = -1;
+                       int portno = -1;
                        while ((portno = portrange.GetToken()))
                        {
-                               if (!HasPort(portno, Addr))
+                               if (*Addr == '*')
+                                       *Addr = 0;
+
+                               bool skip = false;
+                               for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+                                       if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
+                                               skip = true;
+                               if (!skip)
                                {
-                                       ports_found++;
-                                       Config->ports[clientportcount+InitialPortCount] = portno;
-                                       if (*Addr == '*')
-                                               *Addr = 0;
-
-                                       strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
-                                       clientportcount++;
-                               }
-                       }
-               }
-
-               if (!bail)
-               {
-                       int PortCount = clientportcount;
-                       if (PortCount)
-                       {
-                               BoundPortCount = stats->BoundPortCount;
-                               for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++)
-                               {
-                                       int fd = OpenTCPSocket(Config->addrs[count]);
-                                       if (fd == ERROR)
+                                       ListenSocket* ll = new ListenSocket(this, portno, Addr);
+                                       if (ll->GetFd() > -1)
                                        {
-                                               failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
+                                               bound++;
+                                               Config->ports.push_back(ll);
                                        }
                                        else
                                        {
-                                               Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
-                                               if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
-                                               {
-                                                       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];
-                                                               failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
-                                                       }
-                                                       else
-                                                               BoundPortCount++;
-                                               }
+                                               failed_ports.push_back(std::make_pair(Addr, portno));
                                        }
+                                       ports_found++;
                                }
-                               return InitialPortCount + BoundPortCount;
-                       }
-                       return InitialPortCount;
-               }
-       }
-
-       int PortCount = clientportcount;
-
-       for (int count = 0; count < PortCount; count++)
-       {
-               int fd = OpenTCPSocket(Config->addrs[count]);
-               if (fd == ERROR)
-               {
-                       failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
-               }
-               else
-               {
-                       Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
-                       if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
-                       {
-                               BoundPortCount++;
                        }
-                       else
-                               failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
                }
        }
-       return BoundPortCount;
+       return bound;
 }
 
 const char* irc::sockets::insp_ntoa(insp_inaddr n)