Removed a pointless check in ./configure --clean that made it only work with one...

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 560541f4d0d724e64b6471c72452b2e5b4028151..b286ee96fe1b977cb994c664ee4cbd692aa50863 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,14 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -21,7 +18,6 @@
 #include "socketengine.h"
 #include "wildcard.h"
 
-using namespace std;
 using namespace irc::sockets;
 
 /* Used when comparing CIDR masks for the modulus bits left over.
@@ -84,9 +80,9 @@ void ListenSocket::HandleEvent(EventType et, int errornum)
                                ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port);
 #endif
                        }
-                       catch (ModuleException& modexcept)
+                       catch (CoreException& modexcept)
                        {
-                               ServerInstance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
+                               ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                        }
                }
                ServerInstance->stats->statsAccept++;
@@ -389,7 +385,7 @@ bool InspIRCd::HasPort(int port, char* addr)
 }
 
 /* XXX: Probably belongs in class InspIRCd */
-int InspIRCd::BindPorts(bool bail, int &ports_found)
+int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
 {
        char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
        insp_sockaddr client, server;
@@ -409,55 +405,20 @@ int InspIRCd::BindPorts(bool bail, int &ports_found)
 
                if ((!*Type) || (!strcmp(Type,"clients")))
                {
-                       irc::commasepstream portrange(configToken);
-                       std::string portno = "*";
-                       while ((portno = portrange.GetToken()) != "")
+                       irc::portparser portrange(configToken, false);
+                       long portno = -1;
+                       while ((portno = portrange.GetToken()))
                        {
-                               std::string::size_type dash = portno.rfind('-');
-                               if (dash != std::string::npos)
+                               if (!HasPort(portno, Addr))
                                {
-                                       this->Log(DEBUG,"Port range, %s", portno.c_str());
-                                       /* Range of ports */
-                                       std::string sbegin = portno.substr(0, dash);
-                                       std::string send = portno.substr(dash+1, portno.length());
-                                       long begin = atoi(sbegin.c_str());
-                                       long end = atoi(send.c_str());
-                                       if ((begin < 0) || (end < 0) || (begin > 65535) || (end > 65535) || (begin >= end))
-                                       {
-                                               this->Log(DEFAULT,"WARNING: Port range \"%d-%d\" discarded. begin >= end, or begin/end out of range.", begin, end);
-                                       }
-                                       else
-                                       {
-                                               for (int portval = begin; portval <= end; ++portval)
-                                               {
-                                                       if (!HasPort(portval, Addr))
-                                                       {
-                                                               ports_found++;
-                                                               Config->ports[clientportcount+InitialPortCount] = portval;
-                                                               if (*Addr == '*')
-                                                                       *Addr = 0;
-
-                                                               strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
-                                                               clientportcount++;
-                                                               this->Log(DEBUG,"NEW binding %s:%d [%s] from config (part of port range %s)",Addr, portval, Type, portno.c_str());
-                                                       }
-                                               }
-                                       }
-                               }
-                               else
-                               {
-                                       this->Log(DEBUG,"Single port, %s", portno.c_str());
-                                       /* Single port */
-                                       if (!HasPort(atoi(portno.c_str()), Addr))
-                                       {
-                                               ports_found++;
-                                               Config->ports[clientportcount+InitialPortCount] = atoi(portno.c_str());
-                                               if (*Addr == '*')
-                                                       *Addr = 0;
-                                               strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
-                                               clientportcount++;
-                                               this->Log(DEBUG,"NEW binding %s:%s [%s] from config (single port)",Addr, portno.c_str(), Type);
-                                       }
+                                       ports_found++;
+                                       Config->ports[clientportcount+InitialPortCount] = portno;
+                                       if (*Addr == '*')
+                                               *Addr = 0;
+
+                                       strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
+                                       clientportcount++;
+                                       this->Log(DEBUG,"NEW binding %s:%d [%s] from config",Addr, portno, Type);
                                }
                        }
                }
@@ -474,6 +435,7 @@ int InspIRCd::BindPorts(bool bail, int &ports_found)
                                        if (fd == ERROR)
                                        {
                                                this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]);
+                                               failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
                                        }
                                        else
                                        {
@@ -486,6 +448,7 @@ int InspIRCd::BindPorts(bool bail, int &ports_found)
                                                                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++;
@@ -510,6 +473,7 @@ int InspIRCd::BindPorts(bool bail, int &ports_found)
                if (fd == ERROR)
                {
                        this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]);
+                       failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
                }
                else
                {
@@ -518,6 +482,8 @@ int InspIRCd::BindPorts(bool bail, int &ports_found)
                        {
                                BoundPortCount++;
                        }
+                       else
+                               failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
                }
        }
        return BoundPortCount;