X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=8e75c256c91479a57b6fa7b567b01b97fa2e63e2;hb=a1f073f66f4b985bf776b9be2015136209c0c311;hp=56fe5678b0b5500772318c2b234d8e0b5969efc2;hpb=7e918919b0fdb9d0ed7c8e8bd3b02bf86b1591e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 56fe5678b..8e75c256c 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -17,98 +17,85 @@
 #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 "inspircd_io.h"
+#include <sstream>
+#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 TRUE 1
-#define FALSE 0
-#define MAXSOCKS 64
 #define MAXCOMMAND 32
 
-// crucial defines
+/* 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
+/* 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
+#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!"); }
 
-#define IS_LOCAL(x) (x->fd > -1)
-#define IS_REMOTE(x) (x->fd < 0)
-#define IS_MODULE_CREATED(x) (x->fd == FD_MAGIC_NUMBER)
-*/
+template<typename T> inline std::string ConvToStr(const T &in)
+{
+	std::stringstream tmp;
+	if (!(tmp << in)) return std::string();
+	return tmp.str();
+}
 
-class serverstats
+class serverstats : public classbase
 {
   public:
-	int statsAccept;
-	int statsRefused;
-	int statsUnknown;
-	int statsCollisions;
-	int statsDns;
-	int statsDnsGood;
-	int statsDnsBad;
-	int statsConnects;
-	int statsSent;
-	int statsRecv;
-	int BoundPortCount;
+	unsigned long statsAccept;
+	unsigned long statsRefused;
+	unsigned long statsUnknown;
+	unsigned long statsCollisions;
+	unsigned long statsDns;
+	unsigned long statsDnsGood;
+	unsigned long statsDnsBad;
+	unsigned long statsConnects;
+	double statsSent;
+	double statsRecv;
+	unsigned long BoundPortCount;
 
 	serverstats()
 	{
 		statsAccept = statsRefused = statsUnknown = 0;
 		statsCollisions = statsDns = statsDnsGood = 0;
-		statsDnsBad = statsConnects = statsSent = statsRecv = 0;
+		statsDnsBad = statsConnects = 0;
+		statsSent = statsRecv = 0.0;
 		BoundPortCount = 0;
 	}
 };
 
 
-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;
@@ -117,25 +104,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