irc::tokenstream is a token parser which using std::string and std::vector builds...

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 822be147e430cd1340162175301f7f9557c62e28..109e1f2be51f226297aae38e495098d95163a41d 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -17,49 +17,34 @@
 #ifndef __INSPIRCD_H__
 #define __INSPIRCD_H__
 
-#include "inspircd_config.h"
-#include <string>
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
 #include <time.h>
-#include <netdb.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-
-#ifndef _LINUX_C_LIB_VERSION
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#endif
-
-#include <arpa/inet.h>
 #include <string>
-#include <deque>
 #include <sstream>
-
-#include "inspircd_io.h"
+#include "inspircd_config.h"
 #include "users.h"
 #include "channels.h"
 #include "socket.h"
 #include "mode.h"
+#include "helperfuncs.h"
 #include "socketengine.h"
 #include "command_parse.h"
 
-// some misc defines
+/* Some misc defines */
 #define ERROR -1
 #define MAXCOMMAND 32
 
-// crucial defines
+/* Crucial defines */
 #define ETIREDGERBILS EAGAIN
 
-// This define is used in place of strcmp when we 
-// want to check if a char* string contains only one
-// letter. Pretty fast, its just two compares and an
-// addition.
+/* This define is used in place of strcmp when we 
+ * want to check if a char* string contains only one
+ * letter. Pretty fast, its just two compares and an
+ * addition.
+ */
 #define IS_SINGLE(x,y) ( (*x == y) && (*(x+1) == 0) )
 
+#define DELETE(x) { do_log(DEBUG,"%s:%d: delete()",__FILE__,__LINE__); if (x) { delete x; x = NULL; } else log(DEBUG,"Attempt to delete NULL pointer!"); }
+
 template<typename T> inline std::string ConvToStr(const T &in)
 {
        std::stringstream tmp;
@@ -67,8 +52,7 @@ template<typename T> inline std::string ConvToStr(const T &in)
        return tmp.str();
 }
 
-
-class serverstats
+class serverstats : public classbase
 {
   public:
        int statsAccept;
@@ -93,16 +77,24 @@ class serverstats
 };
 
 
-class InspIRCd
+class InspIRCd : public classbase
 {
-
  private:
        char MODERR[MAXBUF];
-        void erase_factory(int j);
-        void erase_module(int j);
+       bool expire_run;
+ 
+       void EraseFactory(int j);
+       void EraseModule(int j);
        void BuildISupport();
        void MoveTo(std::string modulename,int slot);
-        bool expire_run;
+       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;
@@ -111,25 +103,24 @@ 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();
 
 };
 
+/* Miscellaneous stuff here, moved from inspircd_io.h */
+void Exit(int status);
+
 /* userrec optimization stuff */
-void AddServerName(std::string servername);
-const char* FindServerNamePtr(std::string servername);
-bool FindServerName(std::string servername);
+void AddServerName(const std::string &servername);
+const char* FindServerNamePtr(const std::string &servername);
+bool FindServerName(const std::string &servername);
 
 #endif