aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-03-02 13:52:08 +0000
committerMatthew Wild <mwild1@gmail.com>2009-03-02 13:52:08 +0000
commit1a7a72a9f664b78bbb093a5c59620cfdadb18c93 (patch)
tree235937ed1315c1eb52a517eae5beebd438a22886 /core/s2smanager.lua
parentfbb86043bd4380e25d81a3e15774a1f8d50a94e6 (diff)
downloadprosody-1a7a72a9f664b78bbb093a5c59620cfdadb18c93.tar.gz
prosody-1a7a72a9f664b78bbb093a5c59620cfdadb18c93.zip
core.s2smanager: Remove some old commented code, break a long line in 2
Diffstat (limited to 'core/s2smanager.lua')
-rw-r--r--core/s2smanager.lua7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 4f205418..db6d2fe5 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -206,22 +206,19 @@ function streamopened(session, attr)
session.version = 0; --tonumber(attr.version) or 0;
if session.version >= 1.0 and not (attr.to and attr.from) then
- --print("to: "..tostring(attr.to).." from: "..tostring(attr.from));
log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC");
end
if session.direction == "incoming" then
-- Send a reply stream header
-
- --for k,v in pairs(attr) do print("", tostring(k), ":::", tostring(v)); end
-
session.to_host = attr.to;
session.from_host = attr.from;
session.streamid = uuid_gen();
(session.log or log)("debug", "incoming s2s received <stream:stream>");
send("<?xml version='1.0'?>");
- send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host }):top_tag());
+ send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback',
+ ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host }):top_tag());
if session.to_host and not hosts[session.to_host] then
-- Attempting to connect to a host we don't serve
session:close({ condition = "host-unknown"; text = "This host does not serve "..session.to_host });