Fix m_chanlog crashing.

[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 afd029c1646d5c42e9de44cef6db9d520930592c..2143ef11c6f2d362259d3df54124d1ad0be73539 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -29,16 +29,6 @@
 
 /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 
-bool SpanningTreeUtilities::IsSID(const std::string &str)
-{
-       /* Returns true if the string given is exactly 3 characters long,
-        * starts with a digit, and the other two characters are A-Z or digits
-        */
-       return ((str.length() == 3) && isdigit(str[0]) &&
-                       ((str[1] >= 'A' && str[1] <= 'Z') || isdigit(str[1])) &&
-                        ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
-}
-
 /** Yay for fast searches!
  * This is hundreds of times faster than recursion
  * or even scanning a linked list, especially when
@@ -47,7 +37,7 @@ bool SpanningTreeUtilities::IsSID(const std::string &str)
  */
 TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 {
-       if (IsSID(ServerName))
+       if (this->ServerInstance->IsSID(ServerName))
                return this->FindServerID(ServerName);
 
        server_hash::iterator iter = serverlist.find(ServerName.c_str());
@@ -61,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.
@@ -470,6 +400,14 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
        ConfigReader* Conf = new ConfigReader(ServerInstance);
        if (rebind)
        {
+               for (unsigned int i = 0; i < Bindings.size(); i++)
+               {
+                       ServerInstance->SE->DelFd(Bindings[i]);
+                       Bindings[i]->Close();
+               }
+               ServerInstance->BufferedSocketCull();
+               Bindings.clear();
+
                for (int j = 0; j < Conf->Enumerate("bind"); j++)
                {
                        std::string Type = Conf->ReadValue("bind","type",j);