Move lots of spanningtree items to commands

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

diff --git a/include/inspircd.h b/include/inspircd.h
index e79a56f53387e6f3e873292381c3f46e543da2aa..89f0a08ee42fad27a8e29581791f056a6985be6d 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -26,7 +26,6 @@
 #else
 #include "inspircd_win32wrapper.h"
 /** Windows defines these already */
-#undef DELETE
 #undef ERROR
 #endif
 
@@ -53,15 +52,13 @@
 #include <map>
 #include <bitset>
 #include <set>
+#include <time.h>
+#include "inspircd_config.h"
+#include "inspircd_version.h"
+#include "typedefs.h"
 
-/** A list of failed port bindings, used for informational purposes on startup */
-typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
-
-class InspIRCd;
 CoreExport extern InspIRCd* ServerInstance;
 
-#include "inspircd_config.h"
-#include "inspircd_version.h"
 #include "caller.h"
 #include "cull_list.h"
 #include "extensible.h"
@@ -71,7 +68,6 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "channels.h"
 #include "timer.h"
 #include "hashcomp.h"
-#include "typedefs.h"
 #include "logger.h"
 #include "usermanager.h"
 #include "socket.h"
@@ -83,10 +79,10 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "filelogger.h"
 #include "caller.h"
 #include "modules.h"
+#include "threadengine.h"
 #include "configreader.h"
 #include "inspstring.h"
 #include "protocol.h"
-#include "threadengine.h"
 
 #ifndef PATH_MAX
 #warning Potentially broken system, PATH_MAX undefined
@@ -227,7 +223,7 @@ class serverstats
        timeval LastCPU;
        /** Time last sample was read
         */
-       timeval LastSampled;
+       timespec LastSampled;
        /** The constructor initializes all the counts to zero
         */
        serverstats()
@@ -237,8 +233,6 @@ class serverstats
        }
 };
 
-class InspIRCd;
-
 DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t);
 DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
 DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
@@ -246,34 +240,6 @@ DEFINE_HANDLER2(IsChannelHandler, bool, const char*, size_t);
 DEFINE_HANDLER1(IsSIDHandler, bool, const std::string&);
 DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 
-/* Forward declaration - required */
-class XLineManager;
-class BanCacheManager;
-
-/** The background thread for config reading, so that reading from executable includes
- * does not block.
- */
-class CoreExport ConfigReaderThread : public Thread
-{
-       ServerConfig* Config;
-       bool done;
- public:
-       std::string TheUserUID;
-       ConfigReaderThread(const std::string &useruid)
-               : Thread(), done(false), TheUserUID(useruid)
-       {
-       }
-
-       virtual ~ConfigReaderThread()
-       {
-       }
-
-       void Run();
-       /** Run in the main thread to apply the configuration */
-       void Finish();
-       bool IsDone() { return done; }
-};
-
 /** The main class of the irc server.
  * This class contains instances of all the other classes in this software.
  * Amongst other things, it contains a ModeParser, a DNS object, a CommandParser
@@ -315,17 +281,9 @@ class CoreExport InspIRCd
         */
        bool AllModulesReportReady(LocalUser* user);
 
-       /** Logfile pathname specified on the commandline, or empty string
-        */
-       char LogFileName[MAXBUF];
-
        /** The current time, updated in the mainloop
         */
-       time_t TIME;
-
-       /** The time that was recorded last time around the mainloop
-        */
-       time_t OLDTIME;
+       struct timespec TIME;
 
        /** A 64k buffer used to read socket data into
         * NOTE: update ValidateNetBufferSize if you change this
@@ -462,7 +420,7 @@ class CoreExport InspIRCd
 
        /** List of the open ports
         */
-       std::vector<ListenSocketBase *> ports;
+       std::vector<ListenSocket*> ports;
 
        /** Set to the current signal recieved
         */
@@ -485,7 +443,11 @@ class CoreExport InspIRCd
         * it is much faster than calling time() directly.
         * @return The current time as an epoch value (time_t)
         */
-       time_t Time();
+       inline time_t Time() { return TIME.tv_sec; }
+       /** The fractional time at the start of this mainloop iteration (nanoseconds) */
+       inline long Time_ns() { return TIME.tv_nsec; }
+       /** Update the current time. Don't call this unless you have reason to do so. */
+       void UpdateTime();
 
        /** Bind all ports specified in the configuration file.
         * @return The number of ports bound without error
@@ -637,7 +599,10 @@ class CoreExport InspIRCd
         * @param f A Command command handler object to add
         * @throw ModuleException Will throw ModuleExcption if the command already exists
         */
-       void AddCommand(Command *f);
+       inline void AddCommand(Command *f)
+       {
+               Modules->AddService(*f);
+       }
 
        /** Send a modechange.
         * The parameters provided are identical to that sent to the
@@ -742,11 +707,6 @@ class CoreExport InspIRCd
         */
        bool SilentULine(const std::string& server);
 
-       /** Returns the subversion revision ID of this ircd
-        * @return The revision ID or an empty string
-        */
-       std::string GetRevision();
-
        /** Returns the full version string of this ircd
         * @return The version string
         */
@@ -858,7 +818,7 @@ class CommandModule : public Module
 
        Version GetVersion()
        {
-               return Version(cmd.command, VF_VENDOR|VF_CORE);
+               return Version(cmd.name, VF_VENDOR|VF_CORE);
        }
 };