Optimisations

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index bbb51d668ede0bb2e32d17f732fa6245b1e698d6..9f184e868cd3eec964cc5286fddc6cc41bd1b1f3 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -61,6 +61,8 @@ extern std::vector<userrec*> all_opers;
 extern user_hash clientlist;
 extern chan_hash chanlist;
 
+char LOG_FILE[MAXBUF];
+
 extern std::vector<userrec*> local_users;
 
 static char TIMESTR[26];
@@ -953,7 +955,7 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
  * uses the oper list, which means if you have 2000 users but only 5 opers,
  * it iterates 5 times.
  */
-void WriteOpers(char* text, ...)
+void WriteOpers(const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -968,6 +970,17 @@ void WriteOpers(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       WriteOpers_NoFormat(textbuffer);
+}
+
+void WriteOpers_NoFormat(const char* text)
+{
+       if (!text)
+       {
+               log(DEFAULT,"*** BUG *** WriteOpers_NoFormat was given an invalid parameter");
+               return;
+       }
+
        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
        {
                userrec* a = *i;
@@ -977,7 +990,7 @@ void WriteOpers(char* text, ...)
                        if (a->modebits & UM_SERVERNOTICE)
                        {
                                // send server notices to all with +s
-                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
+                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,text);
                        }
                }
        }
@@ -1150,7 +1163,7 @@ void strlower(char *n)
        if (n)
        {
                for (char* t = n; *t; t++)
-                       *t = lowermap[(unsigned)*t];
+                       *t = lowermap[(unsigned char)*t];
        }
 }
 
@@ -1791,3 +1804,77 @@ bool charremove(char* mp, char remove)
 
        return shift_down;
 }
+
+void OpenLog(char** argv, int argc)
+{
+       if (!*LOG_FILE)
+       {
+               if (Config->logpath == "")
+               {
+                       Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+               }
+       }
+       else
+       {
+               Config->log_file = fopen(LOG_FILE,"a+");
+
+               if (!Config->log_file)
+               {
+                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+                       Exit(ERROR);
+               }
+               
+               return;
+       }
+
+       Config->log_file = fopen(Config->logpath.c_str(),"a+");
+
+       if (!Config->log_file)
+       {
+               printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+               Exit(ERROR);
+       }
+}
+
+void CheckRoot()
+{
+       if (geteuid() == 0)
+       {
+               printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
+               log(DEFAULT,"InspIRCd: startup: not starting with UID 0!");
+               Exit(ERROR);
+       }
+}
+
+void CheckDie()
+{
+       if (*Config->DieValue)
+       {
+               printf("WARNING: %s\n\n",Config->DieValue);
+               log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue);
+               Exit(ERROR);
+       }
+}
+
+/* We must load the modules AFTER initializing the socket engine, now */
+void LoadAllModules(InspIRCd* ServerInstance)
+{
+       char configToken[MAXBUF];
+       Config->module_names.clear();
+       MODCOUNT = -1;
+                                        
+       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
+       {
+               Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
+               printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
+               
+               if (!ServerInstance->LoadModule(configToken))                
+               {
+                       log(DEFAULT,"Exiting due to a module loader error.");
+                       printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());
+                       Exit(0);
+               }
+       }
+       
+       log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);
+}