Server origin PRIVMSG and NOTICE now supported by protocol. Will add interface after...

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

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 4e0193727a66617feee4102386aca49ab63073a4..8181969aceeae049236337c15b8a14d6494b9eb6 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -51,66 +51,6 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
        }
 }
 
-TreeServer* SpanningTreeUtilities::FindRemoteBurstServer(TreeServer* Server)
-{
-       server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str());
-       if (iter != RemoteServersBursting.end())
-               return iter->second;
-       else
-               return NULL;
-}
-
-TreeSocket* SpanningTreeUtilities::FindBurstingServer(const std::string &ServerName)
-{
-       std::map<irc::string,TreeSocket*>::iterator iter;
-       iter = burstingserverlist.find(ServerName.c_str());
-       if (iter != burstingserverlist.end())
-       {
-               return iter->second;
-       }
-       else
-       {
-               return NULL;
-       }
-}
-
-void SpanningTreeUtilities::SetRemoteBursting(TreeServer* Server, bool bursting)
-{
-       server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str());
-       if (bursting)
-       {
-               if (iter == RemoteServersBursting.end())
-                       RemoteServersBursting.insert(make_pair(Server->GetName(), Server));
-               else return;
-       }
-       else
-       {
-               if (iter != RemoteServersBursting.end())
-                       RemoteServersBursting.erase(iter);
-               else return;
-       }
-       ServerInstance->Log(DEBUG,"Server %s is %sbursting nicknames", Server->GetName().c_str(), bursting ? "" : "no longer ");
-}
-
-void SpanningTreeUtilities::AddBurstingServer(const std::string &ServerName, TreeSocket* s)
-{
-       std::map<irc::string,TreeSocket*>::iterator iter = burstingserverlist.find(ServerName.c_str());
-       if (iter == burstingserverlist.end())
-               burstingserverlist[ServerName.c_str()] = s;
-}
-
-void SpanningTreeUtilities::DelBurstingServer(TreeSocket* s)
-{
-        for (std::map<irc::string,TreeSocket*>::iterator iter = burstingserverlist.begin(); iter != burstingserverlist.end(); iter++)
-        {
-                if (iter->second == s)
-                {
-                        burstingserverlist.erase(iter);
-                        return;
-                }
-        }
-}
-
 /** Returns the locally connected server we must route a
  * message through to reach server 'ServerName'. This
  * only applies to one-to-one and not one-to-many routing.
@@ -167,6 +107,8 @@ SpanningTreeUtilities::SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningT
 {
        Bindings.clear();
 
+       ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
+
        this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
 
        modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook");
@@ -287,7 +229,7 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons
                        {
                                Channel* c = ServerInstance->FindChan(params[0]);
                                User* u = ServerInstance->FindNick(prefix);
-                               if (c && u)
+                               if (c)
                                {
                                        CUList elist;
                                        TreeServerList list;
@@ -478,11 +420,12 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                        {
                                irc::portparser portrange(Port, false);
                                int portno = -1;
+
+                               if (IP == "*")
+                                       IP.clear();
+
                                while ((portno = portrange.GetToken()))
                                {
-                                       if (IP == "*")
-                                               IP.clear();
-
                                        if ((!transport.empty()) && (hooks.find(transport.c_str()) ==  hooks.end()))
                                        {
                                                throw CoreException("Can't find transport type '"+transport+"' for port "+IP+":"+Port+" - maybe you forgot to load it BEFORE m_spanningtree in your config file?");
@@ -492,12 +435,12 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                                        TreeSocket* listener = new TreeSocket(this, ServerInstance, IP.c_str(), portno, true, 10, transport.empty() ? NULL : hooks[transport.c_str()]);
                                        if (listener->GetState() == I_LISTENING)
                                        {
-                                               ServerInstance->Log(DEFAULT,"m_spanningtree: Binding server port %s:%d successful!", IP.c_str(), portno);
+                                               ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Binding server port %s:%d successful!", IP.c_str(), portno);
                                                Bindings.push_back(listener);
                                        }
                                        else
                                        {
-                                               ServerInstance->Log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno));
+                                               ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno));
                                                listener->Close();
                                        }
                                }
@@ -507,8 +450,6 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
        FlatLinks = Conf->ReadFlag("options","flatlinks",0);
        HideULines = Conf->ReadFlag("options","hideulines",0);
        AnnounceTSChange = Conf->ReadFlag("options","announcets",0);
-       EnableTimeSync = Conf->ReadFlag("timesync","enable",0);
-       MasterTime = Conf->ReadFlag("timesync", "master", 0);
        ChallengeResponse = !Conf->ReadFlag("options", "disablehmac", 0);
        quiet_bursts = Conf->ReadFlag("options", "quietbursts", 0);
        PingWarnTime = Conf->ReadInteger("options", "pingwarning", 0, true);
@@ -649,7 +590,7 @@ void SpanningTreeUtilities::DoFailOver(Link* x)
                        TreeServer* CheckDupe = this->FindServer(x->FailOver.c_str());
                        if (CheckDupe)
                        {
-                               ServerInstance->Log(DEBUG,"Skipping existing failover: %s", x->FailOver.c_str());
+                               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Skipping existing failover: %s", x->FailOver.c_str());
                        }
                        else
                        {