Missing a changeover

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

diff --git a/include/inspircd.h b/include/inspircd.h
index e9d3b10ed53910ac6c6385c9f353f2e2adc6ace0..db30ca7cbd700c616df51e54e1d24617bf12a936 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>
@@ -39,10 +39,12 @@
 #include <deque>
 
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include "users.h"
 #include "channels.h"
 #include "socket.h"
+#include "mode.h"
+#include "socketengine.h"
+#include "command_parse.h"
 
 // some misc defines
 
@@ -52,22 +54,14 @@
 #define MAXSOCKS 64
 #define MAXCOMMAND 32
 
-// flags for use with WriteMode
+// crucial defines
+#define ETIREDGERBILS EAGAIN
 
-#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)
-
-typedef void (handlerfunc) (char**, int, userrec*);
+// 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
 {
@@ -82,12 +76,14 @@ class serverstats
        int statsConnects;
        int statsSent;
        int statsRecv;
+       int BoundPortCount;
 
        serverstats()
        {
                statsAccept = statsRefused = statsUnknown = 0;
                statsCollisions = statsDns = statsDnsGood = 0;
                statsDnsBad = statsConnects = statsSent = statsRecv = 0;
+               BoundPortCount = 0;
        }
 };
 
@@ -98,40 +94,37 @@ class InspIRCd
  private:
        char MODERR[MAXBUF];
         void erase_factory(int j);
-        void erase_module(int j);      
+        void erase_module(int j);
+       void BuildISupport();
+       void MoveTo(std::string modulename,int slot);
+        bool expire_run;
 
  public:
        time_t startup_time;
+       ModeParser* ModeGrok;
+       CommandParser* Parser;
+       SocketEngine* SE;
+       serverstats* stats;
 
+       void MakeLowerMap();
        std::string GetRevision();
        std::string GetVersionString();
        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();
 
 };
 
-/* prototypes */
-void force_nickchange(userrec* user,const char* newnick);
-void kill_link(userrec *user,const char* r);
-void kill_link_silent(userrec *user,const char* r);
-void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user);
-bool is_valid_cmd(const char* commandname, int pcnt, userrec * user);
-int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins);
-void AddWhoWas(userrec* u);
-void ConnectUser(userrec *user);
-userrec* ReHashNick(char* Old, char* New);
-/* optimization tricks to save us walking the user hash */
-void AddOper(userrec* user);
-void DeleteOper(userrec* user);
-void handle_version(char **parameters, int pcnt, userrec *user);
 /* userrec optimization stuff */
 void AddServerName(std::string servername);
 const char* FindServerNamePtr(std::string servername);
-void* dns_task(void* arg);
-void process_buffer(const char* cmdbuf,userrec *user);
-void FullConnectUser(userrec* user);
+bool FindServerName(std::string servername);
 
 #endif