* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#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> ¶ms)
+/** ENCAP */
+bool TreeSocket::Encap(const std::string &prefix, parameterlist ¶ms)
{
if (params.size() > 1)
{
- if (Instance->MatchText(Instance->Config->GetSID(), params[0]))
+ if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
{
- Event event((char*) ¶ms, (Module*)this->Utils->Creator, "encap_received");
- event.Send(Instance);
+ 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];
if (params[0].find('*') != std::string::npos)
{