X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=2a9d6b47b2b9ca54c893ba75a07bbe296a74f9e9;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=a6b5f74e4fbde68a165825a77725131be4036f7c;hpb=7a672d42e4173e274ac0ee31331d41e45801facc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/usermanager.h b/include/usermanager.h
index a6b5f74e4..2a9d6b47b 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -1,36 +1,38 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __USERMANAGER_H
-#define __USERMANAGER_H
+
+#ifndef USERMANAGER_H
+#define USERMANAGER_H
 
 #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();
 
 	~UserManager()
 	{
@@ -39,6 +41,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
@@ -50,9 +54,9 @@ class CoreExport UserManager : public Extensible
 	 */
 	user_hash* uuidlist;
 
-	/** Local client list, a vector containing only local clients
+	/** Local client list, a list containing only local clients
 	 */
-	std::vector<User*> local_users;
+	LocalUserList local_users;
 
 	/** Oper list, a vector containing all local and remote opered users
 	 */
@@ -61,7 +65,11 @@ class CoreExport UserManager : public Extensible
 	/** Number of unregistered users online right now.
 	 * (Unregistered means before USER/NICK/dns)
 	 */
-	int unregistered_count;
+	unsigned int unregistered_count;
+
+	/** Number of elements in local_users
+	 */
+	unsigned int local_count;
 
 	/** Map of global ip addresses for clone counting
 	 * XXX - this should be private, but m_clones depends on it currently.
@@ -71,20 +79,19 @@ class CoreExport UserManager : public Extensible
 	/** Add a client to the system.
 	 * This will create a new User, insert it into the user_hash,
 	 * 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 iscached This variable is reserved for future use
+	 * @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, bool iscached, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);
+	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 quitreason The quit reason to show to normal users
+	 * @param operreason 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 = "");
 
@@ -105,6 +112,10 @@ class CoreExport UserManager : public Extensible
 	 */
 	void RemoveCloneCounts(User *user);
 
+	/** Rebuild clone counts
+	 */
+	void RehashCloneCounts();
+
 	/** Return the number of global clones of this user
 	 * @param user The user to get a count for
 	 * @return The global clone count of this user
@@ -160,16 +171,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