kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index c31dbae5078612afc01989652be99dea1d6afb73..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,21 +916,12 @@ int InspIRCd::Run()
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
 
-       printf("\nInspIRCd is now running!\n");
-
        if (!stats->BoundPortCount)
        {
                printf("\nI couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
                Exit(ERROR);
        }
 
-       if (!Config->nofork)
-       {
-               fclose(stdout);
-               fclose(stderr);
-               fclose(stdin);
-       }
-
        /* Add the listening sockets used for client inbound connections
         * to the socket engine
         */
@@ -938,9 +929,22 @@ int InspIRCd::Run()
        for (unsigned long count = 0; count < stats->BoundPortCount; count++)
        {
                log(DEBUG,"Add listener: %d",Config->openSockfd[count]);
-               SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
+               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);
 
        /* main loop, this never returns */