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

diff --git a/include/usermanager.h b/include/usermanager.h
index 8b6d3e9bd..6ec80c9db 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -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,18 @@ 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++)
+		{
+			delete i->second;
+		}
+		clientlist->clear();
+	}
 
 	/** Client list, a hash_map containing all clients, local and remote
 	 */
@@ -71,7 +78,7 @@ class CoreExport UserManager : public classbase
 	 * @param ip The IP address of the user
 	 * @return This function has no return value, but a call to AddClient may remove the user.
 	 */
-	void AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
+	void AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
 
 	/** Disconnect a user gracefully
  	 * @param user The user to remove