aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua4
-rw-r--r--core/sessionmanager.lua2
2 files changed, 2 insertions, 4 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index afc4f145..1fc2715d 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -139,7 +139,7 @@ function streamopened(session, attr)
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:disconnect("host-unknown");
+ session:close("host-unknown");
return;
end
elseif session.direction == "outgoing" then
@@ -230,8 +230,6 @@ function destroy_session(session)
hosts[session.from_host].s2sout[session.to_host] = nil;
end
- session.conn = nil;
- session.disconnect = nil;
for k in pairs(session) do
if k ~= "trace" then
session[k] = nil;
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 76461b8a..74edb86c 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -113,7 +113,7 @@ function streamopened(session, attr)
if not hosts[session.host] then
-- We don't serve this host...
- session:disconnect{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
+ session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
return;
end