X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=a6b5f74e4fbde68a165825a77725131be4036f7c;hb=a97624bd4b0ea052ca1380f9164769d6a6cab2a3;hp=3a9e151507b9b79ca2be8e372fe46d599cde8a0f;hpb=98659aa0dcac7636627846555ef7d5f807152b7e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/usermanager.h b/include/usermanager.h
index 3a9e15150..a6b5f74e4 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -19,7 +19,7 @@
 /** A list of ip addresses cross referenced against clone counts */
 typedef std::map<irc::string, unsigned int> clonemap;
 
-class CoreExport UserManager : public classbase
+class CoreExport UserManager : public Extensible
 {
  private:
 	InspIRCd *ServerInstance;
@@ -28,11 +28,10 @@ class CoreExport UserManager : public classbase
 	 */
 	clonemap local_clones;
  public:
-	UserManager(InspIRCd *Instance)
+	UserManager(InspIRCd *Instance) : ServerInstance(Instance)
 	{
-		ServerInstance = Instance;
 	}
-	
+
 	~UserManager()
 	{
 		for (user_hash::iterator i = clientlist->begin();i != clientlist->end();i++)
@@ -74,12 +73,12 @@ class CoreExport UserManager : public classbase
 	 * initialize it as not yet registered, and add it to the socket engine.
 	 * @param Instance a pointer to the server instance
 	 * @param socket The socket id (file descriptor) this user is on
-	 * @param port The port number this user connected on
 	 * @param iscached This variable is reserved for future use
-	 * @param ip The IP address of the user
+	 * @param client The IP address and client port of the user
+	 * @param server The server IP address and port used by the user
 	 * @return This function has no return value, but a call to AddClient may remove the user.
 	 */
-	void AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
+	void AddUser(InspIRCd* Instance, int socket, bool iscached, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);
 
 	/** Disconnect a user gracefully
  	 * @param user The user to remove
@@ -100,7 +99,7 @@ class CoreExport UserManager : public classbase
 	void AddGlobalClone(User *user);
 
 	/** Remove all clone counts from the user, you should
-	 * use this if you change the user's IP address 
+	 * use this if you change the user's IP address
 	 * after they have registered.
 	 * @param user The user to remove
 	 */