diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-06-06 01:07:22 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-06-06 01:07:22 +0200 |
| commit | d9d99cd02dadf34bfcc220734ba0c422f0acb3e6 (patch) | |
| tree | 72a11fab75875b7e4f739ddd203da60e5dcbc851 /include | |
| parent | 8a06d54076551387f83a29360478ee6605e241b6 (diff) | |
| parent | e0ff94b310e9b73ac0131e9df14fb7ca2bf3a878 (diff) | |
Merge insp20
Diffstat (limited to 'include')
| -rw-r--r-- | include/command_parse.h | 10 | ||||
| -rw-r--r-- | include/usermanager.h | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/include/command_parse.h b/include/command_parse.h index a49fc0b6e..4a88a8ec8 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -22,10 +22,6 @@ #pragma once -/** A list of dll/so files containing the command handlers for the core - */ -typedef std::map<std::string, void*> SharedObjectList; - /** This class handles command management and parsing. * It allows you to add and remove commands from the map, * call command handlers by name, and chop up comma seperated @@ -34,10 +30,6 @@ typedef std::map<std::string, void*> SharedObjectList; class CoreExport CommandParser { private: - /** Parameter buffer - */ - std::vector<std::string> para; - /** Process a parameter string into a list of items * @param command_p The output list of items * @param parameters The input string @@ -51,8 +43,6 @@ class CoreExport CommandParser */ void ProcessCommand(LocalUser* user, std::string& cmd); - - public: /** Command list, a hash_map of command names to Command* */ diff --git a/include/usermanager.h b/include/usermanager.h index 1ab48925d..f5df25f00 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -31,6 +31,8 @@ class CoreExport UserManager */ clonemap local_clones; public: + UserManager(); + ~UserManager() { for (user_hash::iterator i = clientlist->begin();i != clientlist->end();i++) @@ -62,7 +64,11 @@ class CoreExport UserManager /** 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. |