X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusermanager.h;h=3d7fe88fbb2127240377482d2c9641d3e21e465e;hb=74b05d550081fb7a7b41a145cfbc333f8774d438;hp=6016a24622fecb0ae681fd79e9a6b3a4652a0ce4;hpb=43d1577839df81d3746092f11ebd1280ca2f85c1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/usermanager.h b/include/usermanager.h index 6016a2462..3d7fe88fb 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -1,39 +1,48 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/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 + +#ifndef USERMANAGER_H +#define USERMANAGER_H #include /** A list of ip addresses cross referenced against clone counts */ -typedef std::map clonemap; +typedef std::map clonemap; -class CoreExport UserManager : public classbase +class CoreExport UserManager { private: - InspIRCd *ServerInstance; - /** Map of local ip addresses for clone counting */ clonemap local_clones; public: - UserManager(InspIRCd *Instance) + ~UserManager() { - ServerInstance = Instance; + for (user_hash::iterator i = clientlist->begin();i != clientlist->end();i++) + { + delete i->second; + } + clientlist->clear(); + delete clientlist; + delete uuidlist; } - /** Client list, a hash_map containing all clients, local and remote */ user_hash* clientlist; @@ -43,9 +52,9 @@ class CoreExport UserManager : public classbase */ 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 */ @@ -64,14 +73,21 @@ class CoreExport UserManager : public classbase /** 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 AddClient(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 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 = ""); /** Add a user to the local clone map * @param user The user to add @@ -84,7 +100,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 */ @@ -138,23 +154,13 @@ class CoreExport UserManager : public classbase * @param text The text format string to send * @param ... The format arguments */ - void ServerNoticeAll(const char* text, ...); + 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, ...); - - /** 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, ...); + void ServerPrivmsgAll(const char* text, ...) CUSTOM_PRINTF(2, 3); }; #endif