Fix null dereference caused by tracking dummy

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index f240c2ecbfe950101a893e7f1bba640c1a36f437..93ba8bfa618972925ef358d0885ea0c844912fa3 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -57,27 +57,13 @@
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
 
-/** A cached text file stored with its contents as lines
- */
-typedef std::deque< std::string > file_cache;
-
-/** A configuration key and value pair
- */
-typedef std::pair< std::string, std::string > KeyVal;
-
-/** A list of related configuration keys and values
- */
-typedef std::vector< KeyVal > KeyValList;
-
-/** An entire config file, built up of KeyValLists
- */
-typedef std::multimap< std::string, KeyValList > ConfigDataHash;
-
 class InspIRCd;
-extern InspIRCd* ServerInstance;
+CoreExport extern InspIRCd* ServerInstance;
 
 #include "inspircd_config.h"
 #include "inspircd_version.h"
+#include "caller.h"
+#include "cull_list.h"
 #include "extensible.h"
 #include "numerics.h"
 #include "uid.h"
@@ -94,7 +80,6 @@ extern InspIRCd* ServerInstance;
 #include "mode.h"
 #include "socketengine.h"
 #include "snomasks.h"
-#include "cull_list.h"
 #include "filelogger.h"
 #include "caller.h"
 #include "modules.h"
@@ -381,6 +366,8 @@ class CoreExport InspIRCd : public classbase
        /** Global cull list, will be processed on next iteration
         */
        CullList GlobalCulls;
+       /** Actions that must happen outside of the current call stack */
+       ActionList AtomicActions;
 
        /**** Functors ****/
 
@@ -421,10 +408,6 @@ class CoreExport InspIRCd : public classbase
         */
        void BuildISupport();
 
-       /** List of server names we've seen.
-        */
-       servernamelist servernames;
-
        /** Time this ircd was booted
         */
        time_t startup_time;
@@ -433,6 +416,8 @@ class CoreExport InspIRCd : public classbase
         */
        std::string ConfigFileName;
 
+       ExtensionManager Extensions;
+
        /** Mode handler, handles mode setting and removal
         */
        ModeParser* Modes;
@@ -512,6 +497,14 @@ class CoreExport InspIRCd : public classbase
         */
        ProtocolInterface* PI;
 
+       /** Holds extensible for user nickforced
+        */
+       LocalIntExt NICKForced;
+
+       /** Holds extensible for user operquit
+        */
+       LocalStringExt OperQuit;
+
        /** Get the current time
         * Because this only calls time() once every time around the mainloop,
         * it is much faster than calling time() directly.
@@ -532,24 +525,6 @@ class CoreExport InspIRCd : public classbase
         */
        bool BindSocket(int sockfd, int port, const char* addr, bool dolisten = true);
 
-       /** Adds a server name to the list of servers we've seen
-        * @param The servername to add
-        */
-       void AddServerName(const std::string &servername);
-
-       /** Finds a cached char* pointer of a server name,
-        * This is used to optimize User by storing only the pointer to the name
-        * @param The servername to find
-        * @return A pointer to this name, gauranteed to never become invalid
-        */
-       const char* FindServerNamePtr(const std::string &servername);
-
-       /** Returns true if we've seen the given server name before
-        * @param The servername to find
-        * @return True if we've seen this server name before
-        */
-       bool FindServerName(const std::string &servername);
-
        /** Gets the GECOS (description) field of the given server.
         * If the servername is not that of the local server, the name
         * is passed to handling modules which will attempt to determine
@@ -741,12 +716,6 @@ class CoreExport InspIRCd : public classbase
         */
        void RehashServer();
 
-       /** Return the channel whos index number matches that provided
-        * @param The index number of the channel to fetch
-        * @return A channel record, or NUll if index < 0 or index >= InspIRCd::ChannelCount()
-        */
-       Channel* GetChannelIndex(long index);
-
        /** Dump text to a user target, splitting it appropriately to fit
         * @param User the user to dump the text to
         * @param LinePrefix text to prefix each complete line with