mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

session:disconnect() -> session:close() for consistency with other Lua APIs

Browse source
This commit is contained in:
Matthew Wild 2008-11-18 19:44:54 +00:00
parent 64e57b5001
commit 99b617b8b6
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/s2smanager.lua
View file

@ -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;

2
core/sessionmanager.lua
View file

@ -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

4
net/xmppclient_listener.lua
View file

@ -38,7 +38,7 @@ end
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
local function session_disconnect(session, reason)
local function session_close(session, reason)
local log = session.log or log;
if session.conn then
if reason then
@ -90,7 +90,7 @@ function xmppclient.listener(conn, data)
print("Client connected");
session.reset_stream = session_reset_stream;
session.disconnect = session_disconnect;
session.close = session_close;
session_reset_stream(session); -- Initialise, ready for use

4
net/xmppserver_listener.lua
View file

@ -40,7 +40,7 @@ end
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
local function session_disconnect(session, reason)
local function session_close(session, reason)
local log = session.log or log;
if session.conn then
if reason then
@ -92,7 +92,7 @@ function xmppserver.listener(conn, data)
print("Incoming s2s connection");
session.reset_stream = session_reset_stream;
session.disconnect = session_disconnect;
session.close = session_close;
session_reset_stream(session); -- Initialise, ready for use