Fixes found by removing User inheritance from StreamSocket

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

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index a0acd9b08b9aba2d8cd2907efdb52c12f11d7394..8da34af53f3e5e364d1fad425df29feb3a93d2b6 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -49,7 +49,7 @@ ModuleSpanningTree::ModuleSpanningTree()
                I_OnChangeHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule,
                I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, I_OnPreRehash,
                I_OnOper, I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats,
-               I_OnSetAway, I_OnPostCommand, I_OnUserConnect
+               I_OnSetAway, I_OnPostCommand, I_OnUserConnect, I_OnAcceptConnection
        };
        ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
@@ -490,7 +490,7 @@ void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, c
        if (target_type == TYPE_USER)
        {
                User* d = (User*)dest;
-               if ((d->GetFd() < 0) && (IS_LOCAL(user)))
+               if (!IS_LOCAL(d) && IS_LOCAL(user))
                {
                        parameterlist params;
                        params.push_back(d->uuid);
@@ -543,7 +543,7 @@ void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type,
                // route private messages which are targetted at clients only to the server
                // which needs to receive them
                User* d = (User*)dest;
-               if ((d->GetFd() < 0) && (IS_LOCAL(user)))
+               if (!IS_LOCAL(d) && (IS_LOCAL(user)))
                {
                        parameterlist params;
                        params.push_back(d->uuid);
@@ -731,7 +731,7 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
        {
                Utils->DoOneToMany(source->uuid,"KICK",params);
        }
-       else if (IS_SERVER(source) && source != Utils->ServerUser)
+       else if (source == ServerInstance->FakeClient)
        {
                Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params);
        }
@@ -768,7 +768,7 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 void ModuleSpanningTree::OnRehash(User* user)
 {
        // Re-read config stuff
-       Utils->ReadConfiguration(true);
+       Utils->ReadConfiguration();
 }
 
 void ModuleSpanningTree::OnLoadModule(Module* mod)
@@ -795,7 +795,7 @@ void ModuleSpanningTree::RedoConfig(Module* mod)
 
        if (mod->ModuleSourceFile == "m_sha256.so" || IsBufferSocketModule)
        {
-               Utils->ReadConfiguration(true);
+               Utils->ReadConfiguration();
        }
 }