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 b68de7159764198b90325539934ea8f80883625d..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,9 +405,9 @@ int InspIRCd::BindPorts(bool bail, int &ports_found)
 
                if ((!*Type) || (!strcmp(Type,"clients")))
                {
-                       irc::portparser portrange(configToken);
+                       irc::portparser portrange(configToken, false);
                        long portno = -1;
-                       while (portno = portrange.GetToken())
+                       while ((portno = portrange.GetToken()))
                        {
                                if (!HasPort(portno, Addr))
                                {
@@ -439,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
                                        {
@@ -451,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++;
@@ -475,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
                {
@@ -483,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;