Add DYING link state, push error messages on link, and only limit recvq on unauthenti...

[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 175257b0a804e64b02865ef8432a606a539d06db..9770ec84ead0276bcbebb5a5a205b5fbc2453e32 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.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
@@ -18,21 +18,13 @@
 #include "treeserver.h"
 #include "utils.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-
-
 /** ENCAP */
-bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
+void TreeSocket::Encap(User* who, parameterlist &params)
 {
        if (params.size() > 1)
        {
                if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
                {
-                       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
@@ -42,11 +34,10 @@ bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
 
                if (params[0].find('*') != std::string::npos)
                {
-                       Utils->DoOneToAllButSender(prefix, "ENCAP", params, prefix);
+                       Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
                }
                else
-                       Utils->DoOneToOne(prefix, "ENCAP", params, params[0]);
+                       Utils->DoOneToOne(who->uuid, "ENCAP", params, params[0]);
        }
-       return true;
 }