X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=e7ad4b9d939a8ac6204b7cd31c40bf3071b92b4c;hb=c330b24501fc56516fef098428889a0a526e706a;hp=43150d16968dace908088ab0590ea5b84f51163e;hpb=7972cc32495597ac411a51a40d41e0bb42f80a44;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index 43150d169..e7ad4b9d9 100644
--- a/include/users.h
+++ b/include/users.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,7 +37,7 @@
 #define CC_ALLOW	0
 #define CC_DENY		1
 
-template<typename T> inline string ConvToStr(const T &in);
+template<typename T> string ConvToStr(const T &in);
 
 /** Holds a channel name to which a user has been invited.
  */
@@ -83,6 +83,14 @@ class ConnectClass : public classbase
 	/** Maximum size of recvq for users in this class (bytes)
 	 */
 	long recvqmax;
+
+	/** Local max when connecting by this connection class
+	 */
+	long maxlocal;
+
+	/** Global max when connecting by this connection class
+	 */
+	long maxglobal;
 	
 	ConnectClass() : registration_timeout(0), flood(0), host(""), pingtime(0), pass(""), threshold(0), sendqmax(0), recvqmax(0)
 	{
@@ -128,7 +136,7 @@ class userrec : public connection
 	/** The host displayed to non-opers (used for cloaking etc).
 	 * This usually matches the value of userrec::host.
 	 */
-	char dhost[160];
+	char dhost[64];
 	
 	/** The users full name.
 	 */
@@ -142,8 +150,15 @@ class userrec : public connection
 	 * an optional + character.
 	 */
 	char modes[54];
+
+	/** This contains a bitmask of the RFC modes +swi,
+	 * which can be used for fast lookup when iterating all the users.
+	 * It is maintained by the mode parser and matches the character
+	 * modes stored in 'modes'.
+	 */
+	char modebits;
 	
-	std::vector<ucrec> chans;
+	std::vector<ucrec*> chans;
 	
 	/** The server the user is connected to.
 	 */
@@ -185,7 +200,7 @@ class userrec : public connection
 	 * This is stored even if the <connect> block doesnt need a password, so that
 	 * modules may check it.
 	 */
-	char password[MAXBUF];
+	char password[64];
 
 	/** User's receive queue.
 	 * Lines from the IRCd awaiting processing are stored here.
@@ -204,6 +219,10 @@ class userrec : public connection
 	time_t reset_due;
 	long threshold;
 
+	/** IPV4 ip address
+	 */
+	in_addr ip4;
+
 	/* Write error string
 	 */
 	std::string WriteError;
@@ -313,6 +332,10 @@ class userrec : public connection
 	 */
 	InvitedList* GetInviteList();
 
+	void MakeHost(char* nhost);
+
+	char* MakeWildHost();
+
 	/** Shuts down and closes the user's socket
 	 */
 	void CloseSocket();
@@ -324,29 +347,36 @@ class userrec : public connection
 #endif
 };
 
-/** A lightweight userrec used by WHOWAS
- */
-class WhoWasUser
+class WhoWasGroup
 {
  public:
-	char nick[NICKMAX];
-	char ident[IDENTMAX+1];
-	char dhost[160];
-	char host[160];
-	char fullname[MAXGECOS+1];
-	char server[256];
+	char* host;
+	char* dhost;
+	char* ident;
+	char* server;
+	char* gecos;
 	time_t signon;
+
+	WhoWasGroup(userrec* user);
+	~WhoWasGroup();
 };
 
+typedef std::deque<WhoWasGroup*> whowas_set;
+typedef std::map<irc::string,whowas_set*> whowas_users;
+
+/** A lightweight userrec used by WHOWAS
+ */
+
 void AddOper(userrec* user);
 void DeleteOper(userrec* user);
 void kill_link(userrec *user,const char* r);
 void kill_link_silent(userrec *user,const char* r);
 void AddWhoWas(userrec* u);
-void AddClient(int socket, char* host, int port, bool iscached, char* ip);
+void MaintainWhoWas(time_t TIME);
+void AddClient(int socket, int port, bool iscached, in_addr ip4);
 void FullConnectUser(userrec* user, CullList* Goners);
-//void ConnectUser(userrec *user, CullList* Goners);
 userrec* ReHashNick(char* Old, char* New);
 void force_nickchange(userrec* user,const char* newnick);
+void ReadClassesAndTypes();
 
 #endif