]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
An FJOIN is not bursting unless the source server is bursting
[user/henk/code/inspircd.git] / src / inspircd.cpp
index dd772f94e461055f174d4a0d45c21990691f6541..a921db193514338a9a0bdb31adefe6680f2d4f98 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* w00t was here. ;p */
-
 /* $Install: src/inspircd $(BINPATH) */
 #include "inspircd.h"
 #include <signal.h>
                #define RUSAGE_SELF 0
        #endif
 
-       /* CRT memory debugging */
-       #ifdef DEBUG
-       #define _CRTDBG_MAP_ALLOC
-       #include <stdlib.h>
-       #include <crtdbg.h>
-       #endif
-
        #include <pwd.h> // setuid
        #include <grp.h> // setgid
 #endif
 InspIRCd* SI = NULL;
 int* mysig = NULL;
 
+/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
+ * if it must.
+ *
+ * This is provided as a pointer so that modules can change it to their custom mapping tables,
+ * e.g. for national character support.
+ */
+unsigned const char *national_case_insensitive_map = rfc_case_insensitive_map;
+
 
 /* Moved from exitcodes.h -- due to duplicate symbols -- Burlex
  * XXX this is a bit ugly. -- w00t
@@ -82,6 +81,15 @@ const char* ExitCodes[] =
                "CreateEvent failed" /* 19 */
 };
 
+template<typename T> static void DeleteZero(T* n)
+{
+       if (n != NULL)
+       {
+               delete n;
+               n = NULL;
+       }
+}
+
 void InspIRCd::Cleanup()
 {
        if (Config)
@@ -124,102 +132,25 @@ void InspIRCd::Cleanup()
        for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
                delete (*itr);
 
-       /* Delete objects dynamically allocated in constructor
-        * (destructor would be more appropriate, but we're likely exiting)
-        */
-
-       // Must be deleted before modes as it decrements modelines
-       if (this->Users)
-       {
-               delete this->Users;
-               this->Users = 0;
-       }
-       
-       if (this->Modes)
-       {
-               delete this->Modes;
-               this->Modes = 0;
-       }
-
-       if (this->XLines)
-       {
-               delete this->XLines;
-               this->XLines = 0;
-       }
-
-       if (this->Parser)
-       {
-               delete this->Parser;
-               this->Parser = 0;
-
-       if (this->stats)
-       {
-               delete this->stats;
-               this->stats = 0;
-       }
-
-       if (this->Modules)
-       {
-               delete this->Modules;
-               this->Modules = 0;
-       }
-
-       if (this->BanCache)
-               delete this->BanCache;
-               this->BanCache = 0;
-       }
-
-       if (this->SNO)
-       {
-               delete this->SNO;
-               this->SNO = 0;
-       }
-
-       if (this->Config)
-       {
-               delete this->Config;
-               this->Config = 0;
-       }
-
-       if (this->Res)
-       {
-               delete this->Res;
-               this->Res = 0;
-       }
-
-       if (this->chanlist)
-       {
-               delete chanlist;
-               chanlist = 0;
-       }
-
-       if (this->PI)
-       {
-               delete this->PI;
-               this->PI = 0;
-       }
-       
-       if (this->Threads)
-       {
-               delete this->Threads;
-               this->Threads = 0;
-       }
-
-       /* Needs to be deleted after Res, DNS has a timer */
-       if (this->Timers)
-       {
-               delete this->Timers;
-               this->Timers = 0;
-       }
-
+       /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
+       /* Must be deleted before modes as it decrements modelines */
+       DeleteZero(this->Users);
+       DeleteZero(this->Modes);
+       DeleteZero(this->XLines);
+       DeleteZero(this->Parser);
+       DeleteZero(this->stats);
+       DeleteZero(this->Modules);
+       DeleteZero(this->BanCache);
+       DeleteZero(this->SNO);
+       DeleteZero(this->Config);
+       DeleteZero(this->Res);
+       DeleteZero(this->chanlist);
+       DeleteZero(this->PI);
+       DeleteZero(this->Threads);
+       DeleteZero(this->Timers);
        /* Close logging */
        this->Logs->CloseLogs();
-
-       if (this->Logs)
-       {
-               delete this->Logs;
-               this->Logs = 0;
-       }
+       DeleteZero(this->Logs);
 
        delete RehashFinishMutex;
 }
@@ -299,6 +230,8 @@ void InspIRCd::SetSignals()
        signal(SIGHUP, InspIRCd::SetSignal);
        signal(SIGPIPE, SIG_IGN);
        signal(SIGCHLD, SIG_IGN);
+       /* We want E2BIG not a signal! */
+       signal(SIGXFSZ, SIG_IGN);
 #endif
        signal(SIGTERM, InspIRCd::SetSignal);
 }
@@ -386,7 +319,7 @@ void InspIRCd::WritePID(const std::string &filename)
 InspIRCd::InspIRCd(int argc, char** argv)
        : GlobalCulls(this),
 
-        /* Functor initialisation. Note that the ordering here is very important. 
+        /* Functor initialisation. Note that the ordering here is very important.
          *
          * THIS MUST MATCH ORDER OF DECLARATION OF THE HandleWhateverFunc classes
          * within class InspIRCd.
@@ -418,7 +351,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 #ifdef WIN32
        // Strict, frequent checking of memory on debug builds
        _CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
-       
+
        // Avoid erroneous frees on early exit
        WindowsIPC = 0;
 #endif
@@ -467,10 +400,10 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->PI = new ProtocolInterface(this);
 
        this->s_signal = 0;
-       
+
        // Create base manager classes early, so nothing breaks
        this->Users = new UserManager(this);
-       
+
        this->Users->unregistered_count = 0;
 
        this->Users->clientlist = new user_hash();
@@ -581,16 +514,29 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        if (!ServerConfig::FileExists(this->ConfigFileName))
        {
-               printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
-               this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
-               Exit(EXIT_STATUS_CONFIG);
+#ifdef WIN32
+               /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
+               std::string txtconf = this->ConfigFileName;
+               txtconf.append(".txt");
+
+               if (ServerConfig::FileExists(txtconf.c_str()))
+               {
+                       strlcat(this->ConfigFileName, ".txt", MAXBUF);
+               }
+               else
+#endif
+               {
+                       printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
+                       this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
+                       Exit(EXIT_STATUS_CONFIG);
+               }
        }
 
        printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
        printf_c("(C) InspIRCd Development Team.\033[0m\n\n");
        printf_c("Developers:\n");
        printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\n");
-       printf_c("\t\033[1;32mpippijn, peavey, aquanight, fez, psychon, dz\033[0m\n\n");
+       printf_c("\t\033[1;32mpeavey, aquanight, psychon, dz, danieldg\033[0m\n\n");
        printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
 
        Config->ClearStack();
@@ -679,7 +625,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        printf("\n");
 
        this->Modules->LoadAll();
-       
+
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
        InitializeDisabledCommands(Config->DisabledCommands, this);
@@ -697,7 +643,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        }
 
        printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds());
-       
+
 #ifndef WINDOWS
        if (!Config->nofork)
        {
@@ -906,7 +852,7 @@ int InspIRCd::Run()
                                this->stats->LastCPU = ru.ru_utime;
                        }
 #else
-                       WindowsIPC->Check();    
+                       WindowsIPC->Check();
 #endif
                }
 
@@ -985,7 +931,6 @@ void InspIRCd::SetSignal(int signal)
  */
 ENTRYPOINT
 {
-       InspIRCd::national_case_sensitive_map = rfc_case_insensitive_map;
        SI = new InspIRCd(argc, argv);
        mysig = &SI->s_signal;
        SI->Run();