X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=1ab48925d865b3b3ea42fab3d2094a281ffc0ac8;hb=01ac5148e948de53cd708bb28d0fd237263a0fbf;hp=c2f89729a0a61d1c61fae777916db43c530a6e82;hpb=5f4095e595fe36c6f83df96b7c59cb459b966ed3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/usermanager.h b/include/usermanager.h index c2f89729a..1ab48925d 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -1,37 +1,36 @@ -/* +------------------------------------+ - * | 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 * - * 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 . */ -#ifndef __USERMANAGER_H -#define __USERMANAGER_H + +#pragma once #include /** A list of ip addresses cross referenced against clone counts */ -typedef std::map clonemap; +typedef std::map 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 +38,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 +51,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 local_users; + LocalUserList local_users; /** Oper list, a vector containing all local and remote opered users */ @@ -68,23 +69,28 @@ class CoreExport UserManager : public Extensible */ clonemap global_clones; + /** + * Reset the already_sent IDs so we don't wrap it around and drop a message + * Also removes all expired invites + */ + void GarbageCollect(); + /** 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 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, irc::sockets::sockaddrs* 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 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 = ""); @@ -142,9 +148,6 @@ class CoreExport UserManager : public Extensible */ unsigned int LocalUserCount(); - - - /** Number of users with a certain mode set on them */ int ModeCount(const char mode); @@ -154,22 +157,4 @@ class CoreExport UserManager : public Extensible * @param ... The format arguments */ void ServerNoticeAll(const char* text, ...) CUSTOM_PRINTF(2, 3); - - /** Send a server message (PRIVMSG) to all local users - * @param text The text format string to send - * @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