X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=5a8dbcf97cd1439f0e195e5c0735cb4707a3781d;hb=65d0d4fb366ef527f7bde471fc809d48fc26ccf2;hp=1499e9847251586fbfbe2436b4500da64336954a;hpb=e86afd775c59441ff66222b2c3142b01ec2113af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 1499e9847..5a8dbcf97 100644
--- 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,9 +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
 
@@ -51,12 +54,15 @@
 #define MAXSOCKS 64
 #define MAXCOMMAND 32
 
-// flags for use with WriteMode
+#define ETIREDGERBILS EAGAIN
+
+/*
+flags for use with WriteMode
 
 #define WM_AND 1
 #define WM_OR 2
 
-// flags for use with OnUserPreMessage and OnUserPreNotice
+flags for use with OnUserPreMessage and OnUserPreNotice
 
 #define TYPE_USER 1
 #define TYPE_CHANNEL 2
@@ -65,8 +71,7 @@
 #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 std::deque<std::string> file_cache;
+*/
 
 class serverstats
 {
@@ -81,76 +86,54 @@ 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;
 	}
 };
 
-typedef void (handlerfunc) (char**, int, userrec*);
-
-/* prototypes */
-int InspIRCd(char** argv, int argc);
-int InitConfig(void);
-void ReadConfig(bool bail,userrec* user);
-
-std::string getservername();
-std::string getserverdesc();
-std::string getnetworkname();
-std::string getadminname();
-std::string getadminemail();
-std::string getadminnick();
-void readfile(file_cache &F, const char* fname);
-bool ModeDefined(char c, int i);
-bool ModeDefinedOper(char c, int i);
-int ModeDefinedOn(char c, int i);
-int ModeDefinedOff(char c, int i);
-void ModeMakeList(char modechar);
-bool ModeIsListMode(char modechar, int type);
-chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override);
-chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local);
-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);
-std::string GetRevision();
-int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins);
-void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason);
-void AddWhoWas(userrec* u);
-void update_stats_l(int fd,int data_out);
-void ConnectUser(userrec *user);
-void DoSplitEveryone();
-userrec* ReHashNick(char* Old, char* New);
-bool LoadModule(const char* filename);
-bool UnloadModule(const char* filename);
-char* ModuleError();
-void NoticeAll(userrec *source, bool local_only, char* text, ...);
-void ServerNoticeAll(char* text, ...);
-void ServerPrivmsgAll(char* text, ...);
-void NoticeAllOpers(userrec *source, bool local_only, char* text, ...);
-
-// 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);
+class InspIRCd
+{
 
-std::string GetVersionString();
+ private:
+	char MODERR[MAXBUF];
+        void erase_factory(int j);
+        void erase_module(int j);
+	void BuildISupport();
+	void MoveTo(std::string modulename,int slot);
+
+ 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();
 
-void* dns_task(void* arg);
+};
 
-void process_buffer(const char* cmdbuf,userrec *user);
-void FullConnectUser(userrec* user);
-chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created);
+/* userrec optimization stuff */
+void AddServerName(std::string servername);
+const char* FindServerNamePtr(std::string servername);
+bool FindServerName(std::string servername);
 
 #endif