Update m_cloaking to use free-form keys instead of weakening the hash IV

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

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 6902c63e0bd82fd26fc287e232b614711c6563df..175257b0a804e64b02865ef8432a606a539d06db 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -14,23 +14,28 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 
 
-/** remote MOTD. leet, huh? */
-bool TreeSocket::Encap(const std::string &prefix, std::deque<std::string> &params)
+/** ENCAP */
+bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
 {
        if (params.size() > 1)
        {
                if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
                {
-                       Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-                       event.Send(ServerInstance);
+                       User* who = ServerInstance->FindUUID(prefix);
+                       if (!who)
+                               who = Utils->ServerUser;
+
+                       parameterlist plist(params.begin() + 2, params.end());
+                       ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
+                       // discard return value, ENCAP shall succeed even if the command does not exist
                }
                
                params[params.size() - 1] = ":" + params[params.size() - 1];