Stability fixes, some DELETEs here that dont belong any more.

[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 680fe5eb188dea250ceede7a02c586ab78df65fa..9d4fbf41a3c19c4d2c7555d2fbccc30e4abf9e3a 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "channels.h"
@@ -18,7 +19,6 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "inspircd.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
@@ -41,8 +41,7 @@
  */
 TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 {
-       server_hash::iterator iter;
-       iter = serverlist.find(ServerName.c_str());
+       server_hash::iterator iter = serverlist.find(ServerName.c_str());
        if (iter != serverlist.end())
        {
                return iter->second;
@@ -55,8 +54,7 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 
 TreeServer* SpanningTreeUtilities::FindRemoteBurstServer(TreeServer* Server)
 {
-       server_hash::iterator iter;
-       iter = RemoteServersBursting.find(Server->GetName().c_str());
+       server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str());
        if (iter != RemoteServersBursting.end())
                return iter->second;
        else
@@ -79,25 +77,25 @@ TreeSocket* SpanningTreeUtilities::FindBurstingServer(const std::string &ServerN
 
 void SpanningTreeUtilities::SetRemoteBursting(TreeServer* Server, bool bursting)
 {
-       ServerInstance->Log(DEBUG,"Server %s is %sbursting nicknames", Server->GetName().c_str(), bursting ? "" : "no longer ");
-       server_hash::iterator iter;
-       iter = RemoteServersBursting.find(Server->GetName().c_str());
+       server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str());
        if (bursting)
        {
                if (iter == RemoteServersBursting.end())
-                       RemoteServersBursting.erase(iter);
+                       RemoteServersBursting.insert(make_pair(Server->GetName(), Server));
+               else return;
        }
        else
        {
                if (iter != RemoteServersBursting.end())
-                       RemoteServersBursting.insert(make_pair(Server->GetName(), Server));
+                       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;
-       iter = burstingserverlist.find(ServerName.c_str());
+       std::map<irc::string,TreeSocket*>::iterator iter = burstingserverlist.find(ServerName.c_str());
        if (iter == burstingserverlist.end())
                burstingserverlist[ServerName.c_str()] = s;
 }
@@ -192,7 +190,6 @@ SpanningTreeUtilities::~SpanningTreeUtilities()
        {
                ServerInstance->SE->DelFd(Bindings[i]);
                Bindings[i]->Close();
-               DELETE(Bindings[i]);
        }
        while (TreeRoot->ChildCount())
        {
@@ -202,7 +199,6 @@ SpanningTreeUtilities::~SpanningTreeUtilities()
                        TreeSocket* sock = child_server->GetSocket();
                        ServerInstance->SE->DelFd(sock);
                        sock->Close();
-                       DELETE(sock);
                }
        }
        delete TreeRoot;
@@ -411,7 +407,7 @@ void SpanningTreeUtilities::RefreshIPCache()
        ValidIPs.clear();
        for (std::vector<Link>::iterator L = LinkBlocks.begin(); L != LinkBlocks.end(); L++)
        {
-               if ((L->IPAddr != "") && (L->RecvPass != "") && (L->SendPass != "") && (L->Name != "") && (L->Port))
+               if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
                {
                        ValidIPs.push_back(L->IPAddr);
 
@@ -430,16 +426,12 @@ void SpanningTreeUtilities::RefreshIPCache()
                                        ipvalid = false;
                        }
                        else
+#endif
                        {
                                in_addr n;
                                if (inet_aton(L->IPAddr.c_str(),&n) < 1)
                                        ipvalid = false;
                        }
-#else
-                       in_addr n;
-                       if (inet_aton(L->IPAddr.c_str(),&n) < 1)
-                               ipvalid = false;
-#endif
                        if (!ipvalid)
                        {
                                try
@@ -448,7 +440,7 @@ void SpanningTreeUtilities::RefreshIPCache()
                                        SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type);
                                        ServerInstance->AddResolver(sr, cached);
                                }
-                               catch (ModuleException& e)
+                               catch (...)
                                {
                                }
                        }
@@ -461,7 +453,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
        ConfigReader* Conf = new ConfigReader(ServerInstance);
        if (rebind)
        {
-               for (int j =0; j < Conf->Enumerate("bind"); j++)
+               for (int j = 0; j < Conf->Enumerate("bind"); j++)
                {
                        std::string Type = Conf->ReadValue("bind","type",j);
                        std::string IP = Conf->ReadValue("bind","address",j);
@@ -474,7 +466,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                                while ((portno = portrange.GetToken()))
                                {
                                        if (IP == "*")
-                                               IP = "";
+                                               IP.clear();
 
                                        if ((!transport.empty()) && (hooks.find(transport.c_str()) ==  hooks.end()))
                                        {
@@ -492,7 +484,6 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                                        {
                                                ServerInstance->Log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno));
                                                listener->Close();
-                                               DELETE(listener);
                                        }
                                }
                        }
@@ -512,7 +503,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
 
        LinkBlocks.clear();
        ValidIPs.clear();
-       for (int j =0; j < Conf->Enumerate("link"); j++)
+       for (int j = 0; j < Conf->Enumerate("link"); j++)
        {
                Link L;
                std::string Allow = Conf->ReadValue("link", "allowmask", j);
@@ -524,7 +515,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                L.SendPass = Conf->ReadValue("link", "sendpass", j);
                L.RecvPass = Conf->ReadValue("link", "recvpass", j);
                L.AutoConnect = Conf->ReadInteger("link", "autoconnect", j, true);
-               L.HiddenFromStats = Conf->ReadFlag("link", "hidden", j);
+               L.HiddenFromStats = Conf->ReadFlag("link", "statshidden", j);
                L.Timeout = Conf->ReadInteger("link", "timeout", j, true);
                L.Hook = Conf->ReadValue("link", "transport", j);
                L.Bind = Conf->ReadValue("link", "bind", j);
@@ -542,7 +533,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                /* Bugfix by brain, do not allow people to enter bad configurations */
                if (L.Name != ServerInstance->Config->ServerName)
                {
-                       if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
+                       if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port))
                        {
                                ValidIPs.push_back(L.IPAddr);
 
@@ -580,7 +571,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                                                SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L.IPAddr, L, cached, start_type);
                                                ServerInstance->AddResolver(sr, cached);
                                        }
-                                       catch (ModuleException& e)
+                                       catch (...)
                                        {
                                        }
                                }
@@ -589,19 +580,19 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                        }
                        else
                        {
-                               if (L.IPAddr == "")
+                               if (L.IPAddr.empty())
                                {
                                        ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str());
                                }
-                               else if (L.RecvPass == "")
+                               else if (L.RecvPass.empty())
                                {
                                        ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str());
                                }
-                               else if (L.SendPass == "")
+                               else if (L.SendPass.empty())
                                {
                                        ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str());
                                }
-                               else if (L.Name == "")
+                               else if (L.Name.empty())
                                {
                                        ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!");
                                }