More cleanup

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 3978eebf0b786c991b0af9a51950c4581532a9d4..db30ca7cbd700c616df51e54e1d24617bf12a936 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -54,24 +54,14 @@
 #define MAXSOCKS 64
 #define MAXCOMMAND 32
 
+// crucial defines
 #define ETIREDGERBILS EAGAIN
 
-/*
-flags for use with WriteMode
-
-#define WM_AND 1
-#define WM_OR 2
-
-flags for use with OnUserPreMessage and OnUserPreNotice
-
-#define TYPE_USER 1
-#define TYPE_CHANNEL 2
-#define TYPE_SERVER 3
-
-#define IS_LOCAL(x) (x->fd > -1)
-#define IS_REMOTE(x) (x->fd < 0)
-#define IS_MODULE_CREATED(x) (x->fd == FD_MAGIC_NUMBER)
-*/
+// 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) )
 
 class serverstats
 {
@@ -107,6 +97,7 @@ class InspIRCd
         void erase_module(int j);
        void BuildISupport();
        void MoveTo(std::string modulename,int slot);
+        bool expire_run;
 
  public:
        time_t startup_time;
@@ -126,6 +117,7 @@ class InspIRCd
        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();
 
 };