Merge pull request #495 from SaberUK/master+fix-libcpp

[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 cd9afac419fafa1775fc369eb2c23137e7273202..1504a88075d4e6b326a57b859a53faa5a53d66b9 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -241,7 +241,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
                         * crossing the users QUIT further upstream from the server. Thanks jilles!
                         */
 
-                       if ((prefix.length() == UUID_LENGTH-1) && (isdigit(prefix[0])) &&
+                       if ((prefix.length() == UIDGenerator::UUID_LENGTH) && (isdigit(prefix[0])) &&
                                ((command == "FMODE") || (command == "MODE") || (command == "KICK") || (command == "TOPIC") || (command == "KILL") || (command == "ADDLINE") || (command == "DELLINE")))
                        {
                                /* Special case, we cannot drop these commands as they've been committed already on a
@@ -298,6 +298,12 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
        if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
                command = "MODE";
 
+       if (proto_version < ProtocolVersion)
+       {
+               if (!PreProcessOldProtocolMessage(who, command, params))
+                       return;
+       }
+
        // TODO move all this into Commands
        if (command == "MAP")
        {