Its ok to allow remote map to non-opers now, found the real culprit

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 152f9dec3126e31cd54b3f6a19d5d8a7cd72b8b9..67e235e0af80207b44af568540fa317351515ae9 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -30,8 +30,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 */
 
-static std::map<std::string, std::string> warned;       /* Server names that have had protocol violation warnings displayed for them */
-
 void TreeSocket::WriteLine(std::string line)
 {
        Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
@@ -296,6 +294,9 @@ bool TreeSocket::ProcessLine(std::string &line)
                         * First up, check for any malformed commands (e.g. MODE without a timestamp)
                         * and rewrite commands where necessary (SVSMODE -> MODE for services). -- w
                         */
+                       if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
+                               command = "MODE";
+
                        if (command == "MODE")
                        {
                                if (params.size() >= 2)
@@ -303,23 +304,11 @@ bool TreeSocket::ProcessLine(std::string &line)
                                        Channel* channel = Instance->FindChan(params[0]);
                                        if (channel)
                                        {
-                                               User* x = Instance->FindNick(prefix);
-                                               if (x)
-                                               {
-                                                       if (warned.find(x->server) == warned.end())
-                                                       {
-                                                               Instance->Logs->Log("m_spanningtree",DEFAULT,"WARNING: I revceived modes '%s' from another server '%s'. This is not compliant with InspIRCd. Please check that server for bugs.", params[1].c_str(), x->server);
-                                                               Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending nonstandard modes: '%s MODE %s' where FMODE should be used, and may cause desyncs.", x->server, x->nick, params[1].c_str());
-                                                               warned[x->server] = x->nick;
-                                                       }
-                                               }
+                                               this->SendError("MODE may no longer be used on channels. Please use FMODE, with correct timestamp rules.");
+                                               return false;
                                        }
                                }
                        }
-                       else if (command == "SVSMODE")
-                       {
-                               command = "MODE";
-                       }
 
 
                        /*
@@ -347,6 +336,10 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                return this->ForceJoin(prefix,params);
                        }
+                       else if ((command == "NOTICE" || command == "PRIVMSG") && (Utils->IsServer(prefix)))
+                       {
+                               return this->ServerMessage(assign(command), prefix, params, sourceserv);
+                       }
                        else if (command == "STATS")
                        {
                                return this->Stats(prefix, params);
@@ -368,6 +361,17 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                return this->Admin(prefix, params);
                        }
+                       else if (command == "MAP")
+                       {
+                               User* user = Instance->FindNick(prefix);
+                               if (user)
+                               {
+                                       const char* ptrs[127];
+                                       for (size_t n = 0; (n < params.size()) && (n < 127); ++n)
+                                               ptrs[n] = params[n].c_str();
+                                       return Utils->Creator->HandleMap(ptrs, params.size(), user);
+                               }
+                       }
                        else if (command == "SERVER")
                        {
                                return this->RemoteServer(prefix,params);
@@ -479,14 +483,15 @@ bool TreeSocket::ProcessLine(std::string &line)
                        else if (command == "OPERNOTICE")
                        {
                                if (params.size() >= 1)
-                                       Instance->SNO->WriteToSnoMask('A', "From " + prefix + ": " + params[0]);
+                                       Instance->SNO->WriteToSnoMask('A', "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": " + params[0]);
                                return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
                        }
                        else if (command == "MODENOTICE")
                        {
                                if (params.size() >= 2)
                                {
-                                       Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", prefix.c_str(), params[1].c_str());
+                                       if (ServerSource)
+                                               Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()), params[1].c_str());
                                }
                                return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
                        }
@@ -494,7 +499,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                if (params.size() >= 2)
                                {
-                                       Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + prefix + ": "+ params[1]);
+                                       Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
                                }
                                return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
                        }
@@ -503,7 +508,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                                // Set prefix server as bursting
                                if (!ServerSource)
                                {
-                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", prefix.c_str());
+                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
                                        return false;
                                }
                                
@@ -514,7 +519,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                if (!ServerSource)
                                {
-                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", prefix.c_str());
+                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
                                        return false;
                                }
                                
@@ -523,7 +528,6 @@ bool TreeSocket::ProcessLine(std::string &line)
                        }
                        else if (command == "ENCAP")
                        {
-                               ServerSource->FinishBurst();
                                return this->Encap(prefix, params);
                        }
                        else if (command == "MODE")
@@ -536,9 +540,9 @@ bool TreeSocket::ProcessLine(std::string &line)
                                /* We don't support this for channel mode changes any more! */
                                if (params.size() >= 1)
                                {
-                                       if (Instance->FindChan(params[1]))
+                                       if (Instance->FindChan(params[0]))
                                        {
-                                               this->SendError("Protocol violation by '"+prefix+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps.");
+                                               this->SendError("Protocol violation by '"+(ServerSource ? ServerSource->GetName().c_str() : prefix)+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps.");
                                                return false;
                                        }
                                }