Software / code / prosody
Changeset
852:3c2d99ba1dc2
core.s2smanager: Remove some old commented code, break a long line in 2
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 02 Mar 2009 13:52:08 +0000 |
| parents | 851:b48c7ed3f7f8 |
| children | 853:c0a40522041e |
| files | core/s2smanager.lua |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/core/s2smanager.lua Sun Mar 01 23:34:25 2009 +0000 +++ b/core/s2smanager.lua Mon Mar 02 13:52:08 2009 +0000 @@ -206,22 +206,19 @@ 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 });
