projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with waqas
[prosody.git]
/
net
/
xmppclient_listener.lua
diff --git
a/net/xmppclient_listener.lua
b/net/xmppclient_listener.lua
index 617f04674293c31d60afeb61b26a50d8a3e25610..dcc561f373dd844af220b04382a3d472b7dc06b6 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
--
@@
-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:gsub("%|[^|]+$", ""), 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);
@@
-95,7
+101,7
@@
local function session_close(session, reason)
end
session.send("</stream:stream>");
session.conn.close();
end
session.send("</stream:stream>");
session.conn.close();
- xmppclient.disconnect(session.conn,
"stream error
");
+ xmppclient.disconnect(session.conn,
(reason and (reason.text or reason.condition)) or reason or "session closed
");
end
end
end
end
@@
-136,7
+142,7
@@
function xmppclient.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");