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 e71e55ae842281860f89ee04f2dc33851ffda099..8da34af53f3e5e364d1fad425df29feb3a93d2b6 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -46,10 +46,10 @@ ModuleSpanningTree::ModuleSpanningTree()
        {
                I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostTopicChange,
                I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
-               I_OnChangeLocalUserHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule,
+               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));
 
@@ -317,7 +317,8 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
                }
                else
                {
-                       ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+                       ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",
+                               x->Name.c_str(), newsocket->getError().c_str());
                        ServerInstance->GlobalCulls.AddItem(newsocket);
                }
        }
@@ -489,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);
@@ -542,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);
@@ -591,7 +592,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
        DoConnectTimeout(curtime);
 }
 
-void ModuleSpanningTree::OnUserConnect(User* user)
+void ModuleSpanningTree::OnUserConnect(LocalUser* user)
 {
        if (user->quitting)
                return;
@@ -629,21 +630,19 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, C
        }
 }
 
-ModResult ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost)
+void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
 {
-       if (user->registered != REG_ALL)
-               return MOD_RES_PASSTHRU;
+       if (user->registered != REG_ALL || !IS_LOCAL(user))
+               return;
 
        parameterlist params;
        params.push_back(newhost);
        Utils->DoOneToMany(user->uuid,"FHOST",params);
-       return MOD_RES_PASSTHRU;
 }
 
 void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
 {
-       // only occurs for local clients
-       if (user->registered != REG_ALL)
+       if (user->registered != REG_ALL || !IS_LOCAL(user))
                return;
 
        parameterlist params;
@@ -732,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);
        }
@@ -743,7 +742,7 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin
        if (!IS_LOCAL(source))
                return; // Only start routing if we're origin.
 
-       User::OperQuit.set(dest, operreason);
+       ServerInstance->OperQuit.set(dest, operreason);
        parameterlist params;
        params.push_back(":"+operreason);
        Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
@@ -769,20 +768,20 @@ 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, const std::string &name)
+void ModuleSpanningTree::OnLoadModule(Module* mod)
 {
-       this->RedoConfig(mod, name);
+       this->RedoConfig(mod);
 }
 
-void ModuleSpanningTree::OnUnloadModule(Module* mod, const std::string &name)
+void ModuleSpanningTree::OnUnloadModule(Module* mod)
 {
-       this->RedoConfig(mod, name);
+       this->RedoConfig(mod);
 }
 
-void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name)
+void ModuleSpanningTree::RedoConfig(Module* mod)
 {
        /* If m_sha256.so is loaded (we use this for HMAC) or any module implementing a BufferedSocket interface is loaded,
         * then we need to re-read our config again taking this into account.
@@ -794,9 +793,9 @@ void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name)
        if (ml && std::find(ml->begin(), ml->end(), mod) != ml->end())
                IsBufferSocketModule = true;
 
-       if (name == "m_sha256.so" || IsBufferSocketModule)
+       if (mod->ModuleSourceFile == "m_sha256.so" || IsBufferSocketModule)
        {
-               Utils->ReadConfiguration(true);
+               Utils->ReadConfiguration();
        }
 }
 
@@ -944,7 +943,7 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con
                s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
 }
 
-bool ModuleSpanningTree::cull()
+CullResult ModuleSpanningTree::cull()
 {
        Utils->cull();
        ServerInstance->Timers->DelTimer(RefreshTimer);