Remove uneccessary socket includes now included in socket.h

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 2f1b8bc1a3af5b3f0dcf1a6fc8c13a6466124203..a9873ff76cdc7e111fa3c1408df3e70df090cdc4 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -37,6 +37,7 @@
 #include <arpa/inet.h>
 #include <string>
 #include <deque>
+#include <sstream>
 
 #include "inspircd_io.h"
 #include "users.h"
@@ -47,29 +48,25 @@
 #include "command_parse.h"
 
 // some misc defines
-
 #define ERROR -1
-#define TRUE 1
-#define FALSE 0
-#define MAXSOCKS 64
 #define MAXCOMMAND 32
 
-/*
-flags for use with WriteMode
-
-#define WM_AND 1
-#define WM_OR 2
+// crucial defines
+#define ETIREDGERBILS EAGAIN
 
-flags for use with OnUserPreMessage and OnUserPreNotice
+// 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 TYPE_USER 1
-#define TYPE_CHANNEL 2
-#define TYPE_SERVER 3
+template<typename T> inline std::string ConvToStr(const T &in)
+{
+       std::stringstream tmp;
+       if (!(tmp << in)) return std::string();
+       return tmp.str();
+}
 
-#define IS_LOCAL(x) (x->fd > -1)
-#define IS_REMOTE(x) (x->fd < 0)
-#define IS_MODULE_CREATED(x) (x->fd == FD_MAGIC_NUMBER)
-*/
 
 class serverstats
 {
@@ -105,6 +102,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;
@@ -121,13 +119,24 @@ class InspIRCd
        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); 
+void Start(); 
+void SetSignals();
+bool DaemonSeed();
+void WritePID(const std::string &filename);
+
 /* userrec optimization stuff */
 void AddServerName(std::string servername);
 const char* FindServerNamePtr(std::string servername);
+bool FindServerName(std::string servername);
 
 #endif