projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net.server_select: Bring up to date to new common connection API
[prosody.git]
/
net
/
xmppclient_listener.lua
diff --git
a/net/xmppclient_listener.lua
b/net/xmppclient_listener.lua
index dbb87b912e934ff22631250f164bb7da78c1494a..fc0dce2c387694b4080cef1d15b931b21f97f09a 100644
(file)
--- a/
net/xmppclient_listener.lua
+++ b/
net/xmppclient_listener.lua
@@
-1,4
+1,4
@@
--- Prosody IM
v0.4
+-- Prosody IM
-- Copyright (C) 2008-2009 Matthew Wild
-- Copyright (C) 2008-2009 Waqas Hussain
--
-- Copyright (C) 2008-2009 Matthew Wild
-- Copyright (C) 2008-2009 Waqas Hussain
--
@@
-27,7
+27,7
@@
local sm_streamopened = sessionmanager.streamopened;
local sm_streamclosed = sessionmanager.streamclosed;
local st = require "util.stanza";
local sm_streamclosed = sessionmanager.streamclosed;
local st = require "util.stanza";
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams
|
stream",
+local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams
\1
stream",
default_ns = "jabber:client",
streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
default_ns = "jabber:client",
streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
@@
-53,7
+53,7
@@
local xmppclient = { default_port = 5222, default_mode = "*a" };
local function session_reset_stream(session)
-- Reset stream
local function session_reset_stream(session)
-- Reset stream
- local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "
|
");
+ local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "
\1
");
session.parser = parser;
session.notopen = true;
session.parser = parser;
session.notopen = true;
@@
-61,6
+61,7
@@
local function session_reset_stream(session)
function session.data(conn, data)
local ok, err = parser:parse(data);
if ok then return; end
function session.data(conn, data)
local ok, err = parser:parse(data);
if ok then return; end
+ log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
session:close("xml-not-well-formed");
end
session:close("xml-not-well-formed");
end
@@
-69,9
+70,14
@@
end
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
+local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
local function session_close(session, reason)
local log = session.log or log;
if session.conn then
local function session_close(session, reason)
local log = session.log or log;
if session.conn then
+ if session.notopen then
+ session.send("<?xml version='1.0'?>");
+ session.send(st.stanza("stream:stream", default_stream_attr):top_tag());
+ end
if reason then
if type(reason) == "string" then -- assume stream error
log("info", "Disconnecting client, <stream:error> is: %s", reason);
if reason then
if type(reason) == "string" then -- assume stream error
log("info", "Disconnecting client, <stream:error> is: %s", reason);
@@
-94,27
+100,27
@@
local function session_close(session, reason)
end
end
session.send("</stream:stream>");
end
end
session.send("</stream:stream>");
- session.conn
.
close();
- xmppclient.
disconnect(session.conn, "stream error
");
+ session.conn
:
close();
+ xmppclient.
ondisconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed
");
end
end
-- End of session methods --
end
end
-- End of session methods --
-function xmppclient.
listener
(conn, data)
+function xmppclient.
onincoming
(conn, data)
local session = sessions[conn];
if not session then
session = sm_new_session(conn);
sessions[conn] = session;
local session = sessions[conn];
if not session then
session = sm_new_session(conn);
sessions[conn] = session;
- -- Logging functions --
-
- local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
- session.log = logger.init(conn_name);
-
session.log("info", "Client connected");
session.log("info", "Client connected");
+ -- Client is using legacy SSL (otherwise mod_tls sets this flag)
+ if conn:ssl() then
+ session.secure = true;
+ end
+
session.reset_stream = session_reset_stream;
session.close = session_close;
session.reset_stream = session_reset_stream;
session.close = session_close;
@@
-127,11
+133,11
@@
function xmppclient.listener(conn, data)
end
end
end
end
-function xmppclient.disconnect(conn, err)
+function xmppclient.
on
disconnect(conn, err)
local session = sessions[conn];
if session then
(session.log or log)("info", "Client disconnected: %s", err);
local session = sessions[conn];
if session then
(session.log or log)("info", "Client disconnected: %s", err);
- sm_destroy_session(session);
+ sm_destroy_session(session
, err
);
sessions[conn] = nil;
session = nil;
collectgarbage("collect");
sessions[conn] = nil;
session = nil;
collectgarbage("collect");