Allow SASL messages to be targeted at the services server

[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 723ff9352f18ff0d05f8530a0284e6f0d84bd5dc..2271bf374d00fe33aace7def98cf34f497cde470 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -29,34 +29,19 @@ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from
        if (from->bind_tag->getString("type") != "servers")
                return MOD_RES_PASSTHRU;
 
-       bool found = false;
-       int port;
-       std::string incomingip;
-       irc::sockets::satoap(*client, incomingip, port);
+       std::string incomingip = client->addr();
 
-       found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), incomingip) != Utils->ValidIPs.end());
-       if (!found)
+       for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
        {
-               for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
+               if (*i == "*" || *i == incomingip || irc::sockets::cidr_mask(*i).match(*client))
                {
-                       if (*i == "*" || irc::sockets::MatchCIDR(incomingip, *i))
-                       {
-                               found = true;
-                               break;
-                       }
-               }
-
-               if (!found)
-               {
-                       ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str());
-                       return MOD_RES_DENY;
+                       /* we don't need to do anything with the pointer, creating it stores it in the necessary places */
+                       new TreeSocket(Utils, newsock, from, client, server);
+                       return MOD_RES_ALLOW;
                }
        }
-
-       /* we don't need to do anything with the pointer, creating it stores it in the necessary places */
-
-       new TreeSocket(Utils, newsock, from, client, server);
-       return MOD_RES_ALLOW;
+       ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str());
+       return MOD_RES_DENY;
 }
 
 /** Yay for fast searches!
@@ -159,14 +144,13 @@ CullResult SpanningTreeUtilities::cull()
                {
                        TreeSocket* sock = child_server->GetSocket();
                        sock->Close();
-                       ServerInstance->GlobalCulls.AddItem(sock);
                }
        }
 
        for(std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i)
        {
                TreeSocket* s = i->first;
-               ServerInstance->GlobalCulls.AddItem(s);
+               s->Close();
        }
        TreeRoot->cull();
 
@@ -187,6 +171,14 @@ void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &li
 /* returns a list of DIRECT servernames for a specific channel */
 void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list)
 {
+       unsigned int minrank = 0;
+       if (status)
+       {
+               ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+               if (mh)
+                       minrank = mh->GetPrefixRank();
+       }
+
        const UserMembList *ulist = c->GetUsers();
 
        for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
@@ -194,7 +186,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis
                if (IS_LOCAL(i->first))
                        continue;
 
-               if (status && !strchr(c->GetAllPrefixChars(i->first), status))
+               if (minrank && i->second->getRank() < minrank)
                        continue;
 
                if (exempt_list.find(i->first) == exempt_list.end())
@@ -207,7 +199,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis
        return;
 }
 
-bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, parameterlist &params)
+bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, const parameterlist &params)
 {
        TreeServer* omitroute = this->BestRouteTo(omit);
        unsigned int items =this->TreeRoot->ChildCount();
@@ -224,7 +216,7 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons
        return true;
 }
 
-bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const std::string &command, parameterlist &params, std::string omit)
+bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist &params, std::string omit)
 {
        TreeServer* omitroute = this->BestRouteTo(omit);
        std::string FullLine = ":" + prefix + " " + command;
@@ -251,7 +243,7 @@ bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const
        return true;
 }
 
-bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::string &command, parameterlist &params)
+bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist &params)
 {
        std::string FullLine = ":" + prefix + " " + command;
        unsigned int words = params.size();
@@ -273,21 +265,21 @@ bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::st
        return true;
 }
 
-bool SpanningTreeUtilities::DoOneToMany(const char* prefix, const char* command, parameterlist &params)
+bool SpanningTreeUtilities::DoOneToMany(const char* prefix, const char* command, const parameterlist &params)
 {
        std::string spfx = prefix;
        std::string scmd = command;
        return this->DoOneToMany(spfx, scmd, params);
 }
 
-bool SpanningTreeUtilities::DoOneToAllButSender(const char* prefix, const char* command, parameterlist &params, std::string omit)
+bool SpanningTreeUtilities::DoOneToAllButSender(const char* prefix, const char* command, const parameterlist &params, std::string omit)
 {
        std::string spfx = prefix;
        std::string scmd = command;
        return this->DoOneToAllButSender(spfx, scmd, params, omit);
 }
 
-bool SpanningTreeUtilities::DoOneToOne(const std::string &prefix, const std::string &command, parameterlist &params, std::string target)
+bool SpanningTreeUtilities::DoOneToOne(const std::string &prefix, const std::string &command, const parameterlist &params, std::string target)
 {
        TreeServer* Route = this->BestRouteTo(target);
        if (Route)
@@ -386,8 +378,8 @@ void SpanningTreeUtilities::ReadConfiguration()
                L->AllowMask = tag->getString("allowmask");
                L->IPAddr = tag->getString("ipaddr");
                L->Port = tag->getInt("port");
-               L->SendPass = tag->getString("sendpass");
-               L->RecvPass = tag->getString("recvpass");
+               L->SendPass = tag->getString("sendpass", tag->getString("password"));
+               L->RecvPass = tag->getString("recvpass", tag->getString("password"));
                L->Fingerprint = tag->getString("fingerprint");
                L->HiddenFromStats = tag->getBool("statshidden");
                L->Timeout = tag->getInt("timeout");
@@ -401,6 +393,15 @@ void SpanningTreeUtilities::ReadConfiguration()
                if (L->Name.length() > 64)
                        throw CoreException("The link name '"+assign(L->Name)+"' is longer than 64 characters!");
 
+               if (L->Fingerprint.find(':') != std::string::npos)
+               {
+                       std::string tmp = L->Fingerprint;
+                       L->Fingerprint.clear();
+                       for(unsigned int j=0; j < tmp.length(); j++)
+                               if (tmp[j] != ':')
+                                       L->Fingerprint.push_back(tmp[j]);
+               }
+
                if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
                {
                        ValidIPs.push_back(L->IPAddr);