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 79435ea580fc3e1d9977a5ead776b2cae8f1a014..27029a6e4b18344e90fd73af88ee1703f05d802e 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -589,7 +589,6 @@ bool InspIRCd::LoadModule(const char* filename)
                try
                {
                        ircd_module* a = new ircd_module(modfile);
-                       log(DEBUG,"ircd_module constructor success, MODCOUNT %d",MODCOUNT);
                        factory[MODCOUNT+1] = a;
                        if (factory[MODCOUNT+1]->LastError())
                        {
@@ -597,10 +596,8 @@ bool InspIRCd::LoadModule(const char* filename)
                                snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError());
                                return false;
                        }
-                       log(DEBUG,"No last error");
                        if ((int)factory[MODCOUNT+1]->factory != -1)
                        {
-                               log(DEBUG,"Factory ptr: %0x",&factory[MODCOUNT+1]->factory);
                                Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
                                modules[MODCOUNT+1] = m;
                                /* save the module and the module's classfactory, if
@@ -911,7 +908,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 int InspIRCd::Run()
 {
        /* Until THIS point, ServerInstance == NULL */
-       
+
        this->Res = new DNS();
 
        LoadAllModules(this);
@@ -919,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);