Removed some debug notices that were mistakenly in the DEFAULT loglevel

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

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 897bc5aab42e83d849f773949f4d030efcf4ab75..3788055a4e78a3f8e5e6178b8799b1eb1981c560 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -44,14 +44,15 @@ extern std::vector<ircd_module*> factory;
 ServerConfig::ServerConfig()
 {
        this->ClearStack();
-       *ServerName = *Network = *ServerDesc = *AdminName = '\0';
-       *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+       *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+       *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
        *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
        *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
        log_file = NULL;
        nofork = false;
        unlimitcore = false;
        AllowHalfop = true;
+       HideSplits = false;
        dns_timeout = 5;
        MaxTargets = 20;
        NetBufferSize = 10240;
@@ -149,6 +150,7 @@ void ServerConfig::Read(bool bail, userrec* user)
 {
         char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF],MT[MAXBUF];
         char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF],SLIMT[MAXBUF];
+       char localmax[MAXBUF],globalmax[MAXBUF],HS[MAXBUF];
         ConnectClass c;
         std::stringstream errstr;
         include_stack.clear();
@@ -224,11 +226,17 @@ void ServerConfig::Read(bool bail, userrec* user)
        ConfValue("options","operonlystats",0,Config->OperOnlyStats,&Config->config_f);
        ConfValue("options","customversion",0,Config->CustomVersion,&Config->config_f);
        ConfValue("options","maxtargets",0,MT,&Config->config_f);
+       ConfValue("options","hidesplits",0,HS,&Config->config_f);
+       ConfValue("options","hidewhois",0,Config->HideWhoisServer,&Config->config_f);
+       ConfValue("options","tempdir",0,Config->TempDir,&Config->config_f);
 
+       if (!*Config->TempDir)
+               strlcpy(Config->TempDir,"/tmp",1024);
+       Config->HideSplits = ((*HS == 'y') || (*HS == 'Y') || (*HS == '1') || (*HS == 't') || (*HS == 'T'));
         Config->SoftLimit = atoi(SLIMT);
        if (*MT)
                Config->MaxTargets = atoi(MT);
-       if (Config->MaxTargets < 0) || (Config->MaxTargets > 31)
+       if ((Config->MaxTargets < 0) || (Config->MaxTargets > 31))
        {
                log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
                Config->MaxTargets = 20;
@@ -293,6 +301,8 @@ void ServerConfig::Read(bool bail, userrec* user)
                 ConfValue("connect","threshold",i,thold,&Config->config_f);
                 ConfValue("connect","sendq",i,sqmax,&Config->config_f);
                 ConfValue("connect","recvq",i,rqmax,&Config->config_f);
+               ConfValue("connect","localmax",i,localmax,&Config->config_f);
+               ConfValue("connect","globalmax",i,globalmax,&Config->config_f);
                 if (*Value)
                 {
                         c.host = Value;
@@ -306,6 +316,16 @@ void ServerConfig::Read(bool bail, userrec* user)
                         c.threshold = 5;
                         c.sendqmax = 262144; // 256k
                         c.recvqmax = 4096;   // 4k
+                       c.maxlocal = 3;
+                       c.maxglobal = 3;
+                       if (atoi(localmax)>0)
+                       {
+                               c.maxlocal = atoi(localmax);
+                       }
+                       if (atoi(globalmax)>0)
+                       {
+                               c.maxglobal = atoi(globalmax);
+                       }
                         if (atoi(thold)>0)
                         {
                                 c.threshold = atoi(thold);
@@ -400,12 +420,14 @@ void ServerConfig::Read(bool bail, userrec* user)
                         if (ServerInstance->UnloadModule(removing->c_str()))
                         {
                                 WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
-                                WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+                                if (user)
+                                       WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
                                 rem++;
                         }
                         else
                         {
-                                WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+                               if (user)
+                                       WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
                         }
                 }
                 if (!added_modules.empty())
@@ -414,12 +436,14 @@ void ServerConfig::Read(bool bail, userrec* user)
                         if (ServerInstance->LoadModule(adding->c_str()))
                         {
                                 WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
-                                WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+                               if (user)
+                                       WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
                                 add++;
                         }
                         else
                         {
-                                WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+                               if (user)
+                                       WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
                         }
                 }
                 log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),
@@ -751,7 +775,7 @@ bool ServerConfig::LoadConf(const char* filename, std::stringstream *target, std
                                                                        break;
                                                                }
                                                        }
-                                                       log(DEFAULT,"Opening included file '%s'",buf);
+                                                       log(DEBUG,"Opening included file '%s'",buf);
                                                        if (*buf != '/')
                                                        {
                                                                strlcpy(confpath,CONFIG_FILE,10240);