core.s2smanager: Remove some old commented code, break a long line in 2
authorMatthew Wild <mwild1@gmail.com>
Mon, 2 Mar 2009 13:52:08 +0000 (13:52 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 2 Mar 2009 13:52:08 +0000 (13:52 +0000)
core/s2smanager.lua

index 4f2054189fd35d0cf018955c8accad38b4a6941e..db6d2fe523e61290f2e730a706ec120c857ffec6 100644 (file)
@@ -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 });