core_userhost Append data to the output in a saner way

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index a4b5ae4bc37653dbfdd04a869187adc08550c817..9ca33e2ddb6e3cd5310066cadfb3b1a24345159e 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -26,17 +26,13 @@
 
 #include <iostream>
 #include "inspircd.h"
-#include "xline.h"
-#include "socket.h"
-#include "socketengine.h"
-#include "command_parse.h"
 #include "exitcodes.h"
 
 #ifndef _WIN32
        #include <dirent.h>
 #endif
 
-static std::vector<dynamic_reference_base*>* dynrefs = NULL;
+static intrusive_list<dynamic_reference_base>* dynrefs = NULL;
 static bool dynref_init_complete = false;
 
 void dynamic_reference_base::reset_all()
@@ -44,8 +40,8 @@ void dynamic_reference_base::reset_all()
        dynref_init_complete = true;
        if (!dynrefs)
                return;
-       for(unsigned int i = 0; i < dynrefs->size(); i++)
-               (*dynrefs)[i]->resolve();
+       for (intrusive_list<dynamic_reference_base>::iterator i = dynrefs->begin(); i != dynrefs->end(); ++i)
+               (*i)->resolve();
 }
 
 // Version is a simple class for holding a modules version number
@@ -99,7 +95,7 @@ void          Module::OnInfo(User*) { DetachEvent(I_OnInfo); }
 void           Module::OnWhois(User*, User*) { DetachEvent(I_OnWhois); }
 ModResult      Module::OnUserPreInvite(User*, User*, Channel*, time_t) { DetachEvent(I_OnUserPreInvite); return MOD_RES_PASSTHRU; }
 ModResult      Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&, MessageType) { DetachEvent(I_OnUserPreMessage); return MOD_RES_PASSTHRU; }
-ModResult      Module::OnUserPreNick(User*, const std::string&) { DetachEvent(I_OnUserPreNick); return MOD_RES_PASSTHRU; }
+ModResult      Module::OnUserPreNick(LocalUser*, const std::string&) { DetachEvent(I_OnUserPreNick); return MOD_RES_PASSTHRU; }
 void           Module::OnUserPostNick(User*, const std::string&) { DetachEvent(I_OnUserPostNick); }
 ModResult      Module::OnPreMode(User*, User*, Channel*, const std::vector<std::string>&) { DetachEvent(I_OnPreMode); return MOD_RES_PASSTHRU; }
 void           Module::On005Numeric(std::map<std::string, std::string>&) { DetachEvent(I_On005Numeric); }
@@ -151,7 +147,7 @@ void                Module::OnBuildNeighborList(User*, IncludeChanList&, std::map<User*,bool>&
 void           Module::OnGarbageCollect() { DetachEvent(I_OnGarbageCollect); }
 ModResult      Module::OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { DetachEvent(I_OnSetConnectClass); return MOD_RES_PASSTHRU; }
 void           Module::OnText(User*, void*, int, const std::string&, char, CUList&) { DetachEvent(I_OnText); }
-void           Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { DetachEvent(I_OnNamesListItem); }
+ModResult      Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { DetachEvent(I_OnNamesListItem); return MOD_RES_PASSTHRU; }
 ModResult      Module::OnNumeric(User*, unsigned int, const std::string&) { DetachEvent(I_OnNumeric); return MOD_RES_PASSTHRU; }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { DetachEvent(I_OnAcceptConnection); return MOD_RES_PASSTHRU; }
 void           Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Membership*, std::string&) { DetachEvent(I_OnSendWhoLine); }
@@ -593,7 +589,7 @@ void ModuleManager::AddService(ServiceProvider& item)
        switch (item.service)
        {
                case SERVICE_COMMAND:
-                       if (!ServerInstance->Parser->AddCommand(static_cast<Command*>(&item)))
+                       if (!ServerInstance->Parser.AddCommand(static_cast<Command*>(&item)))
                                throw ModuleException("Command "+std::string(item.name)+" already exists.");
                        return;
                case SERVICE_MODE:
@@ -611,7 +607,7 @@ void ModuleManager::AddService(ServiceProvider& item)
                case SERVICE_DATA:
                case SERVICE_IOHOOK:
                {
-                       if ((item.name.substr(0, 5) == "mode/") || (item.name.substr(0, 6) == "umode/"))
+                       if ((!item.name.compare(0, 5, "mode/", 5)) || (!item.name.compare(0, 6, "umode/", 6)))
                                throw ModuleException("The \"mode/\" and the \"umode\" service name prefixes are reserved.");
 
                        DataProviders.insert(std::make_pair(item.name, &item));
@@ -676,29 +672,19 @@ dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::strin
        : name(Name), value(NULL), creator(Creator)
 {
        if (!dynrefs)
-               dynrefs = new std::vector<dynamic_reference_base*>;
-       dynrefs->push_back(this);
+               dynrefs = new intrusive_list<dynamic_reference_base>;
+       dynrefs->push_front(this);
        if (dynref_init_complete)
                resolve();
 }
 
 dynamic_reference_base::~dynamic_reference_base()
 {
-       for(unsigned int i = 0; i < dynrefs->size(); i++)
+       dynrefs->erase(this);
+       if (dynrefs->empty())
        {
-               if (dynrefs->at(i) == this)
-               {
-                       unsigned int last = dynrefs->size() - 1;
-                       if (i != last)
-                               dynrefs->at(i) = dynrefs->at(last);
-                       dynrefs->erase(dynrefs->begin() + last);
-                       if (dynrefs->empty())
-                       {
-                               delete dynrefs;
-                               dynrefs = NULL;
-                       }
-                       return;
-               }
+               delete dynrefs;
+               dynrefs = NULL;
        }
 }