aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-19 22:50:37 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-19 22:50:37 +0000
commit5a46bff5b212336561c58ec6b374299abf54a069 (patch)
tree454759943563b0bac06e5d3641ddf5cbea631073 /core/s2smanager.lua
parent093c9c9fa0e01bee0db0f5866ae19b0278057ea5 (diff)
downloadprosody-5a46bff5b212336561c58ec6b374299abf54a069.tar.gz
prosody-5a46bff5b212336561c58ec6b374299abf54a069.zip
Comments and logging fixes
Diffstat (limited to 'core/s2smanager.lua')
-rw-r--r--core/s2smanager.lua14
1 files changed, 0 insertions, 14 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 4188e26b..a8fe4d0f 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -105,7 +105,6 @@ function new_outgoing(from_host, to_host)
local srv_choice = srv_hosts[1];
if srv_choice then
- log("debug", "Best record found");
connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port);
end
@@ -145,7 +144,6 @@ function streamopened(session, attr)
session.version = 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));
- --error(session.to_host.." failed to specify 'to' or 'from' hostname as per RFC");
log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC");
end
@@ -170,18 +168,6 @@ function streamopened(session, attr)
send(st.stanza("stream:features")
:tag("dialback", { xmlns='urn:xmpp:features:dialback' }):tag("optional"):up():up());
end
- --[[
- local features = {};
- modulemanager.fire_event("stream-features-s2s", session, features);
-
- send("<stream:features>");
-
- for _, feature in ipairs(features) do
- send(tostring(feature));
- end
-
- send("</stream:features>");
- ]]
elseif session.direction == "outgoing" then
-- If we are just using the connection for verifying dialback keys, we won't try and auth it
if not attr.id then error("stream response did not give us a streamid!!!"); end