Regressed buffering code

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8f757e0476886ed5c7a985ca1d1a6c1c9159d9dc..73b27dbe89aee09193aa1f0222151a758ec666a1 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -26,6 +26,9 @@ using namespace std;
 #include <sys/ioctl.h>
 #include <time.h>
 #include <string>
+#include <exception>
+#include <stdexcept>
+#include <new>
 #ifdef GCC3
 #include <ext/hash_map>
 #else
@@ -71,7 +74,7 @@ std::vector<userrec*> local_users;
 
 extern int MODCOUNT;
 extern char LOG_FILE[MAXBUF];
-int openSockfd[MAXSOCKS];
+int openSockfd[MAX_DESCRIPTORS];
 int yield_depth;
 int iterations = 0;
 sockaddr_in client,server;
@@ -193,15 +196,15 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->MakeLowerMap();
 
         OpenLog(argv, argc);
+       this->stats = new serverstats();
         Config->ClearStack();
         Config->Read(true,NULL);
         CheckRoot();
        this->ModeGrok = new ModeParser();
        this->Parser = new CommandParser();
-       this->stats = new serverstats();
         AddServerName(Config->ServerName);
         CheckDie();
-        stats->BoundPortCount = BindPorts();
+        stats->BoundPortCount = BindPorts(true);
 
        for(int t = 0; t < 255; t++)
                Config->global_implementation[t] = 0;
@@ -212,7 +215,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        SetSignals();
         if (!Config->nofork)
         {
-                if (DaemonSeed() == ERROR)
+               if (!DaemonSeed())
                 {
                         printf("ERROR: could not go into daemon mode. Shutting down.\n");
                         Exit(ERROR);
@@ -298,7 +301,6 @@ void InspIRCd::erase_module(int j)
 void InspIRCd::MoveTo(std::string modulename,int slot)
 {
        unsigned int v2 = 256;
-       log(DEBUG,"Moving %s to slot %d",modulename.c_str(),slot);
        for (unsigned int v = 0; v < Config->module_names.size(); v++)
        {
                if (Config->module_names[v] == modulename)
@@ -308,11 +310,7 @@ void InspIRCd::MoveTo(std::string modulename,int slot)
                        break;
                }
        }
-       if (v2 == (unsigned int)slot)
-       {
-               log(DEBUG,"Item %s already in slot %d!",modulename.c_str(),slot);
-       }
-       else if (v2 < 256)
+       if ((v2 != (unsigned int)slot) && (v2 < 256))
        {
                // Swap the module names over
                Config->module_names[v2] = Config->module_names[slot];
@@ -333,7 +331,6 @@ void InspIRCd::MoveTo(std::string modulename,int slot)
                        Config->implement_lists[v2][n] = Config->implement_lists[slot][n];
                        Config->implement_lists[slot][n] = x;
                }
-               log(DEBUG,"Moved %s to slot successfully",modulename.c_str());
        }
        else
        {
@@ -343,7 +340,6 @@ void InspIRCd::MoveTo(std::string modulename,int slot)
 
 void InspIRCd::MoveAfter(std::string modulename, std::string after)
 {
-       log(DEBUG,"Move %s after %s...",modulename.c_str(),after.c_str());
        for (unsigned int v = 0; v < Config->module_names.size(); v++)
        {
                if (Config->module_names[v] == after)
@@ -356,7 +352,6 @@ void InspIRCd::MoveAfter(std::string modulename, std::string after)
 
 void InspIRCd::MoveBefore(std::string modulename, std::string before)
 {
-       log(DEBUG,"Move %s before %s...",modulename.c_str(),before.c_str());
        for (unsigned int v = 0; v < Config->module_names.size(); v++)
        {
                if (Config->module_names[v] == before)
@@ -511,13 +506,7 @@ bool InspIRCd::LoadModule(const char* filename)
                                modules[MODCOUNT+1]->Implements(x);
 
                                for(int t = 0; t < 255; t++)
-                               {
                                        Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
-                                       if (Config->implement_lists[MODCOUNT+1][t])
-                                       {
-                                               log(DEBUG,"Add global implementation: %d %d => %d",MODCOUNT+1,t,Config->global_implementation[t]);
-                                       }
-                               }
                        }
                        else
                        {
@@ -561,15 +550,11 @@ bool InspIRCd::LoadModule(const char* filename)
                }
                else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE)
                {
-                       log(DEBUG,"Module %d wants PRIORITY_BEFORE",j);
                        put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
-                       log(DEBUG,"Before: %s",Config->module_names[modules[j]->Prioritize() >> 8].c_str());
                }
                else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER)
                {
-                       log(DEBUG,"Module %d wants PRIORITY_AFTER",j);
                        put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
-                       log(DEBUG,"After: %s",Config->module_names[modules[j]->Prioritize() >> 8].c_str());
                }
        }
        for (unsigned int j = 0; j < put_to_back.size(); j++)
@@ -604,7 +589,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
         sockaddr_in sock_us;     // our port number
         socklen_t uslen;         // length of our port number
 
-       if (yield_depth > 3)
+       if (yield_depth > 100)
                return;
 
        yield_depth++;
@@ -649,7 +634,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                 expire_run = false;
         }
 
-       if (iterations++ == 30)
+       if (iterations++ == 15)
        {
                iterations = 0;
                DoBackgroundUserStuff(TIME);
@@ -720,8 +705,9 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
               
                                 if ((s) && (!s->Poll()))
                                 {
-                                        log(DEBUG,"Socket poll returned false, close and bail");
+                                        log(DEBUG,"inspircd.cpp: Socket poll returned false, close and bail");
                                         SE->DelFd(s->GetFd());
+                                       socket_ref[activefds[activefd]] = NULL;
                                         for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
                                         {
                                                 s_del = (InspSocket*)*a;
@@ -773,7 +759,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                                                 }
                                                 catch (ModuleException& modexcept)
                                                 {
-                                                        log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+                                                        log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
                                                 }
                                         }
                                         stats->statsAccept++;
@@ -795,6 +781,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                                  * what we would do, so for now, its going
                                  * to safely do bugger all.
                                  */
+                               SE->DelFd(activefds[activefd]);
                         break;
                 }
         }
@@ -807,12 +794,16 @@ int InspIRCd::Run()
        
         LoadAllModules(this);
 
+       /* Just in case no modules were loaded - fix for bug #101 */
+       this->BuildISupport();
+
         printf("\nInspIRCd is now running!\n");
        
        if (!Config->nofork)
        {
-               freopen("/dev/null","w",stdout);
-               freopen("/dev/null","w",stderr);
+               fclose(stdout);
+               fclose(stderr);
+               fclose(stdin);
        }
 
        /* Add the listening sockets used for client inbound connections
@@ -844,9 +835,18 @@ int InspIRCd::Run()
 
 int main(int argc, char** argv)
 {
-        ServerInstance = new InspIRCd(argc, argv);
-        ServerInstance->Run();
-        delete ServerInstance;
-        return 0;
+       try
+       {
+               ServerInstance = new InspIRCd(argc, argv);
+               ServerInstance->Run();
+               delete ServerInstance;
+       }
+       catch (std::bad_alloc)
+       {
+               log(DEFAULT,"You are out of memory! (got exception std::bad_alloc!)");
+               send_error("**** OUT OF MEMORY **** We're gonna need a bigger boat!");
+               printf("Out of memory! (got exception std::bad_alloc!");
+       }
+       return 0;
 }