X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=294bc1e1f358b42f3fecf78c242ffeff7d88961e;hb=c2a5839bcbd6bebf0dd102a8dfd283e92c8a0507;hp=6e5aba1a2e810adf6698719e4f145274fcef3164;hpb=0c55e6d24b32f2cc4e2b8106f2f4032e3197c211;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index 6e5aba1a2..294bc1e1f 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>
@@ -25,6 +25,9 @@
  
 #ifndef __USERS_H__ 
 #define __USERS_H__ 
+
+#include "hashcomp.h"
+#include "cull_list.h"
  
 #define STATUS_OP	4
 #define STATUS_HOP	2
@@ -34,12 +37,14 @@
 #define CC_ALLOW	0
 #define CC_DENY		1
 
+template<typename T> string ConvToStr(const T &in);
+
 /** Holds a channel name to which a user has been invited.
  */
 class Invited : public classbase
 {
  public:
-	char channel[CHANMAX];
+	 irc::string channel;
 };
 
 
@@ -59,13 +64,13 @@ class ConnectClass : public classbase
 	int flood;
 	/** Host mask for this line
 	 */
-	char host[MAXBUF];
+	std::string host;
 	/** Number of seconds between pings for this line
 	 */
 	int pingtime;
 	/** (Optional) Password for this line
 	 */
-	char pass[MAXBUF];
+	std::string pass;
 
 	/** Threshold value for flood disconnect
 	 */
@@ -78,17 +83,17 @@ 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()
+	ConnectClass() : registration_timeout(0), flood(0), host(""), pingtime(0), pass(""), threshold(0), sendqmax(0), recvqmax(0)
 	{
-		registration_timeout = 0;
-		flood = 0;
-		pingtime = 0;
-		threshold = 0;
-		sendqmax = 0;
-		recvqmax = 0;
-		strlcpy(host,"",MAXBUF);
-		strlcpy(pass,"",MAXBUF);
 	}
 };
 
@@ -131,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.
 	 */
@@ -146,7 +151,7 @@ class userrec : public connection
 	 */
 	char modes[54];
 	
-	std::vector<ucrec> chans;
+	std::vector<ucrec*> chans;
 	
 	/** The server the user is connected to.
 	 */
@@ -188,7 +193,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.
@@ -207,6 +212,10 @@ class userrec : public connection
 	time_t reset_due;
 	long threshold;
 
+	/** IPV4 ip address
+	 */
+	in_addr ip4;
+
 	/* Write error string
 	 */
 	std::string WriteError;
@@ -316,6 +325,10 @@ class userrec : public connection
 	 */
 	InvitedList* GetInviteList();
 
+	void MakeHost(char* nhost);
+
+	char* MakeWildHost();
+
 	/** Shuts down and closes the user's socket
 	 */
 	void CloseSocket();
@@ -327,27 +340,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 FullConnectUser(userrec* user);
-void ConnectUser(userrec *user);
+void MaintainWhoWas(time_t TIME);
+void AddClient(int socket, int port, bool iscached, in_addr ip4);
+void FullConnectUser(userrec* user, CullList* Goners);
+userrec* ReHashNick(char* Old, char* New);
+void force_nickchange(userrec* user,const char* newnick);
+void ReadClassesAndTypes();
 
 #endif