Rewrote sepstream and tokenstream to be less ugly

[user/henk/code/inspircd.git] / include / usermanager.h

diff --git a/include/usermanager.h b/include/usermanager.h
index b549edb1039d9769aaa811303f346db0fd320c9e..1ab48925d865b3b3ea42fab3d2094a281ffc0ac8 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -17,8 +17,7 @@
  */
 
 
-#ifndef USERMANAGER_H
-#define USERMANAGER_H
+#pragma once
 
 #include <list>
 
@@ -52,9 +51,9 @@ class CoreExport UserManager
         */
        user_hash* uuidlist;
 
-       /** Local client list, a vector containing only local clients
+       /** Local client list, a list containing only local clients
         */
-       std::vector<LocalUser*> local_users;
+       LocalUserList local_users;
 
        /** Oper list, a vector containing all local and remote opered users
         */
@@ -70,10 +69,15 @@ class CoreExport UserManager
         */
        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 via The socket that this user connected using
         * @param client The IP address and client port of the user
@@ -84,8 +88,8 @@ class CoreExport UserManager
 
        /** 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
+        * @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 = "");
@@ -144,9 +148,6 @@ class CoreExport UserManager
         */
        unsigned int LocalUserCount();
 
-
-
-
        /** Number of users with a certain mode set on them
         */
        int ModeCount(const char mode);
@@ -156,12 +157,4 @@ class CoreExport UserManager
         * @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);
 };
-
-#endif