NEVER use the two-param assign unless you want your string padding to len bytes with \0!

[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 bc295766fca3b72a3525dff83dff42a1d6b79c15..cfbb9add0b8e308a1d404f3964ee2f4b459c0f5d 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -82,7 +82,7 @@ TreeServer* SpanningTreeUtilities::FindServerMask(const std::string &ServerName)
 {
        for (server_hash::iterator i = serverlist.begin(); i != serverlist.end(); i++)
        {
-               if (match(i->first.c_str(),ServerName.c_str()))
+               if (match(i->first,ServerName))
                        return i->second;
        }
        return NULL;
@@ -348,42 +348,55 @@ void SpanningTreeUtilities::RefreshIPCache()
        ValidIPs.clear();
        for (std::vector<Link>::iterator L = LinkBlocks.begin(); L != LinkBlocks.end(); L++)
        {
-               if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
+               if (L->IPAddr.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || L->Port)
                {
-                       ValidIPs.push_back(L->IPAddr);
-
-                       if (L->AllowMask.length())
-                               ValidIPs.push_back(L->AllowMask);
-
-                       /* Needs resolving */
-                       bool ipvalid = true;
-                       QueryType start_type = DNS_QUERY_A;
-#ifdef IPV6
-                       start_type = DNS_QUERY_AAAA;
-                       if (strchr(L->IPAddr.c_str(),':'))
+                       if (L->Name.empty())
                        {
-                               in6_addr n;
-                               if (inet_pton(AF_INET6, L->IPAddr.c_str(), &n) < 1)
-                                       ipvalid = false;
+                               ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a malformed link block (all link blocks require a name!)");
                        }
                        else
+                       {
+                               ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a link block missing recvpass, sendpass, port or ipaddr.");
+                       }
+
+                       /* Invalid link block */
+                       continue;
+               }
+
+               ValidIPs.push_back(L->IPAddr);
+
+               if (L->AllowMask.length())
+                       ValidIPs.push_back(L->AllowMask);
+
+               /* Needs resolving */
+               bool ipvalid = true;
+               QueryType start_type = DNS_QUERY_A;
+#ifdef IPV6
+               start_type = DNS_QUERY_AAAA;
+               if (strchr(L->IPAddr.c_str(),':'))
+               {
+                       in6_addr n;
+                       if (inet_pton(AF_INET6, L->IPAddr.c_str(), &n) < 1)
+                               ipvalid = false;
+               }
+               else
 #endif
+               {
+                       in_addr n;
+                       if (inet_aton(L->IPAddr.c_str(),&n) < 1)
+                               ipvalid = false;
+               }
+
+               if (!ipvalid)
+               {
+                       try
                        {
-                               in_addr n;
-                               if (inet_aton(L->IPAddr.c_str(),&n) < 1)
-                                       ipvalid = false;
+                               bool cached;
+                               SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type);
+                               ServerInstance->AddResolver(sr, cached);
                        }
-                       if (!ipvalid)
+                       catch (...)
                        {
-                               try
-                               {
-                                       bool cached;
-                                       SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type);
-                                       ServerInstance->AddResolver(sr, cached);
-                               }
-                               catch (...)
-                               {
-                               }
                        }
                }
        }
@@ -439,11 +452,11 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                        }
                }
        }
-       FlatLinks = Conf->ReadFlag("options","flatlinks",0);
-       HideULines = Conf->ReadFlag("options","hideulines",0);
+       FlatLinks = Conf->ReadFlag("security","flatlinks",0);
+       HideULines = Conf->ReadFlag("security","hideulines",0);
        AnnounceTSChange = Conf->ReadFlag("options","announcets",0);
-       ChallengeResponse = !Conf->ReadFlag("options", "disablehmac", 0);
-       quiet_bursts = Conf->ReadFlag("options", "quietbursts", 0);
+       ChallengeResponse = !Conf->ReadFlag("security", "disablehmac", 0);
+       quiet_bursts = Conf->ReadFlag("performance", "quietbursts", 0);
        PingWarnTime = Conf->ReadInteger("options", "pingwarning", 0, true);
        PingFreq = Conf->ReadInteger("options", "serverpingfreq", 0, true);
 
@@ -484,19 +497,19 @@ 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.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port))
-                       {
-                               if (L.Name.find('.') == std::string::npos)
-                                       throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character");
+                       if (L.Name.find('.') == std::string::npos)
+                               throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character");
 
-                               if (L.Name.length() > 64)
-                                       throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!");
-
-                               ValidIPs.push_back(L.IPAddr);
+                       if (L.Name.length() > 64)
+                               throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!");
 
+                       if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port))
+                       {
                                if (Allow.length())
                                        ValidIPs.push_back(Allow);
 
+                               ValidIPs.push_back(L.IPAddr);
+
                                /* Needs resolving */
                                bool ipvalid = true;
                                QueryType start_type = DNS_QUERY_A;
@@ -532,32 +545,39 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                                        {
                                        }
                                }
-
-                               LinkBlocks.push_back(L);
                        }
                        else
                        {
                                if (L.IPAddr.empty())
                                {
-                                       throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', IP address not defined!");
+                                       L.IPAddr = "*";
+                                       ValidIPs.push_back("*");
+                                       ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L.Name) + " has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
                                }
-                               else if (L.RecvPass.empty())
+
+                               if (L.RecvPass.empty())
                                {
                                        throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', recvpass not defined!");
                                }
-                               else if (L.SendPass.empty())
+
+                               if (L.SendPass.empty())
                                {
                                        throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', sendpass not defined!");
                                }
-                               else if (L.Name.empty())
+
+                               if (L.Name.empty())
                                {
                                        throw CoreException("Invalid configuration, link tag without a name! IP address: "+L.IPAddr);
                                }
-                               else if (!L.Port)
+
+                               if (!L.Port)
                                {
-                                       throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', no port specified!");
+                                       ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L.Name) + " has no port defined, you will not be able to /connect it.");
                                }
                        }
+
+
+                       LinkBlocks.push_back(L);
                }
                else
                {