Add checking on AddFd that was missing (it assumed, like everything else)

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index cd5f74a0a02d7a7809e0bc70d08815bd3e3dfbae..27029a6e4b18344e90fd73af88ee1703f05d802e 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -908,7 +908,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 int InspIRCd::Run()
 {
        /* Until THIS point, ServerInstance == NULL */
-       
+
        this->Res = new DNS();
 
        LoadAllModules(this);
@@ -916,20 +916,34 @@ int InspIRCd::Run()
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
 
-       printf("\nInspIRCd is now running!\n");
-       
-       if (!Config->nofork)
+       if (!stats->BoundPortCount)
        {
-               fclose(stdout);
-               fclose(stderr);
-               fclose(stdin);
+               printf("\nI couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
+               Exit(ERROR);
        }
 
        /* Add the listening sockets used for client inbound connections
         * to the socket engine
         */
+       log(DEBUG,"%d listeners",stats->BoundPortCount);
        for (unsigned long count = 0; count < stats->BoundPortCount; count++)
-               SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
+       {
+               log(DEBUG,"Add listener: %d",Config->openSockfd[count]);
+               if (!SE->AddFd(Config->openSockfd[count],true,X_LISTEN))
+               {
+                       printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
+                       Exit(ERROR);
+               }
+       }
+
+       if (!Config->nofork)
+       {
+               fclose(stdout);
+               fclose(stderr);
+               fclose(stdin);
+       }
+
+       printf("\nInspIRCd is now running!\n");
 
        this->WritePID(Config->PID);