X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=6fdddf115abfe129b344901acf8532a5f0a4de2c;hb=db2a4c2c15bb170464bbff464d7cc79cd098df26;hp=6ec80c9db27ec3df018a822855ac1a57d6af7a47;hpb=2be353eececbfb9ab811ac74134ed7437b641369;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/usermanager.h b/include/usermanager.h
index 6ec80c9db..6fdddf115 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -17,21 +17,15 @@
 #include <list>
 
 /** A list of ip addresses cross referenced against clone counts */
-typedef std::map<irc::string, unsigned int> clonemap;
+typedef std::map<irc::sockets::cidr_mask, unsigned int> clonemap;
 
-class CoreExport UserManager : public Extensible
+class CoreExport UserManager
 {
  private:
-	InspIRCd *ServerInstance;
-
 	/** Map of local ip addresses for clone counting
 	 */
 	clonemap local_clones;
  public:
-	UserManager(InspIRCd *Instance) : ServerInstance(Instance)
-	{
-	}
-	
 	~UserManager()
 	{
 		for (user_hash::iterator i = clientlist->begin();i != clientlist->end();i++)
@@ -39,6 +33,8 @@ class CoreExport UserManager : public Extensible
 			delete i->second;
 		}
 		clientlist->clear();
+		delete clientlist;
+		delete uuidlist;
 	}
 
 	/** Client list, a hash_map containing all clients, local and remote
@@ -52,7 +48,7 @@ class CoreExport UserManager : public Extensible
 
 	/** Local client list, a vector containing only local clients
 	 */
-	std::vector<User*> local_users;
+	std::vector<LocalUser*> local_users;
 
 	/** Oper list, a vector containing all local and remote opered users
 	 */
@@ -73,18 +69,18 @@ class CoreExport UserManager : public Extensible
 	 * 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 via The socket that this user connected using
+	 * @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(int socket, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);
 
 	/** Disconnect a user gracefully
- 	 * @param user The user to remove
- 	 * @param r The quit reason to show to normal users
- 	 * @param oreason The quit reason to show to opers
- 	 * @return Although this function has no return type, on exit the user provided will no longer exist.
+	 * @param user The user to remove
+	 * @param r The quit reason to show to normal users
+	 * @param oreason The quit reason to show to opers
+	 * @return Although this function has no return type, on exit the user provided will no longer exist.
 	 */
 	void QuitUser(User *user, const std::string &quitreason, const char* operreason = "");
 
@@ -99,7 +95,7 @@ class CoreExport UserManager : public Extensible
 	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
 	 */
@@ -160,16 +156,6 @@ class CoreExport UserManager : public Extensible
 	 * @param ... The format arguments
 	 */
 	void ServerPrivmsgAll(const char* text, ...) CUSTOM_PRINTF(2, 3);
-
-	/** Send text to all users with a specific set of modes
-	 * @param modes The modes to check against, without a +, e.g. 'og'
-	 * @param flags one of WM_OR or WM_AND. If you specify WM_OR, any one of the
-	 * mode characters in the first parameter causes receipt of the message, and
-	 * if you specify WM_OR, all the modes must be present.
-	 * @param text The text format string to send
-	 * @param ... The format arguments
-	 */
-	void WriteMode(const char* modes, int flags, const char* text, ...) CUSTOM_PRINTF(4, 5);
 };
 
 #endif