Change std::pair<bool,std::string> to neater typedef "ModePair"

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 8be2874dc5ebf80c2dd1d988d6260a902cd334f5..8e75c256c91479a57b6fa7b567b01b97fa2e63e2 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -25,6 +25,7 @@
 #include "channels.h"
 #include "socket.h"
 #include "mode.h"
+#include "helperfuncs.h"
 #include "socketengine.h"
 #include "command_parse.h"
 
@@ -51,41 +52,50 @@ template<typename T> inline std::string ConvToStr(const T &in)
        return tmp.str();
 }
 
-class serverstats
+class serverstats : public classbase
 {
   public:
-       int statsAccept;
-       int statsRefused;
-       int statsUnknown;
-       int statsCollisions;
-       int statsDns;
-       int statsDnsGood;
-       int statsDnsBad;
-       int statsConnects;
-       int statsSent;
-       int statsRecv;
-       int BoundPortCount;
+       unsigned long statsAccept;
+       unsigned long statsRefused;
+       unsigned long statsUnknown;
+       unsigned long statsCollisions;
+       unsigned long statsDns;
+       unsigned long statsDnsGood;
+       unsigned long statsDnsBad;
+       unsigned long statsConnects;
+       double statsSent;
+       double statsRecv;
+       unsigned long BoundPortCount;
 
        serverstats()
        {
                statsAccept = statsRefused = statsUnknown = 0;
                statsCollisions = statsDns = statsDnsGood = 0;
-               statsDnsBad = statsConnects = statsSent = statsRecv = 0;
+               statsDnsBad = statsConnects = 0;
+               statsSent = statsRecv = 0.0;
                BoundPortCount = 0;
        }
 };
 
 
-class InspIRCd
+class InspIRCd : public classbase
 {
  private:
        char MODERR[MAXBUF];
        bool expire_run;
  
-       void erase_factory(int j);
-       void erase_module(int j);
+       void EraseFactory(int j);
+       void EraseModule(int j);
        void BuildISupport();
        void MoveTo(std::string modulename,int slot);
+       void Start();
+       void SetSignals();
+       bool DaemonSeed();
+       void MakeLowerMap();
+       void MoveToLast(std::string modulename);
+       void MoveToFirst(std::string modulename);
+       void MoveAfter(std::string modulename, std::string after);
+       void MoveBefore(std::string modulename, std::string before);
 
  public:
        time_t startup_time;
@@ -94,16 +104,12 @@ class InspIRCd
        SocketEngine* SE;
        serverstats* stats;
 
-       void MakeLowerMap();
        std::string GetRevision();
        std::string GetVersionString();
+       void WritePID(const std::string &filename);
        char* ModuleError();
        bool LoadModule(const char* filename);
        bool UnloadModule(const char* filename);
-       void MoveToLast(std::string modulename);
-       void MoveToFirst(std::string modulename);
-       void MoveAfter(std::string modulename, std::string after);
-       void MoveBefore(std::string modulename, std::string before);
        InspIRCd(int argc, char** argv);
        void DoOneIteration(bool process_module_sockets);
        int Run();
@@ -111,11 +117,7 @@ class InspIRCd
 };
 
 /* Miscellaneous stuff here, moved from inspircd_io.h */
-void Exit(int status); 
-void Start(); 
-void SetSignals();
-bool DaemonSeed();
-void WritePID(const std::string &filename);
+void Exit(int status);
 
 /* userrec optimization stuff */
 void AddServerName(const std::string &servername);