m_spanningtree Keep track of whether servers are behind a bursting server, use it...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 16459eeb4ecb3f9860ff23405f97845f3fe6125f..42a9e80102b620507a52a6c738879d0e1ae91de5 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -26,10 +26,6 @@
 
 #include <iostream>
 #include "inspircd.h"
-#include "xline.h"
-#include "socket.h"
-#include "socketengine.h"
-#include "command_parse.h"
 #include "exitcodes.h"
 
 #ifndef _WIN32
@@ -37,11 +33,9 @@
 #endif
 
 static intrusive_list<dynamic_reference_base>* dynrefs = NULL;
-static bool dynref_init_complete = false;
 
 void dynamic_reference_base::reset_all()
 {
-       dynref_init_complete = true;
        if (!dynrefs)
                return;
        for (intrusive_list<dynamic_reference_base>::iterator i = dynrefs->begin(); i != dynrefs->end(); ++i)
@@ -99,7 +93,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); }
@@ -397,8 +391,8 @@ void ModuleManager::DoSafeUnload(Module* mod)
                ++c;
                mod->OnCleanup(TYPE_CHANNEL, chan);
                chan->doUnhookExtensions(items);
-               const UserMembList* users = chan->GetUsers();
-               for(UserMembCIter mi = users->begin(); mi != users->end(); mi++)
+               const Channel::MemberMap& users = chan->GetUsers();
+               for (Channel::MemberMap::const_iterator mi = users.begin(); mi != users.end(); ++mi)
                        mi->second->doUnhookExtensions(items);
        }
 
@@ -521,7 +515,7 @@ void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
 {
        if (CanUnload(mod))
                ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-       else
+       else if (callback)
                callback->Call(false);
 }
 
@@ -678,7 +672,9 @@ dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::strin
        if (!dynrefs)
                dynrefs = new intrusive_list<dynamic_reference_base>;
        dynrefs->push_front(this);
-       if (dynref_init_complete)
+
+       // Resolve unless there is no ModuleManager (part of class InspIRCd)
+       if (ServerInstance)
                resolve();
 }