From 6c6f24c491d6c3df9899d7a9c2734d72bec6e67c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 21 Nov 2009 17:14:59 +0000 Subject: xmppclient_listener: Switch to .onincoming listener method, to be compatible with new server_event.lua --- net/xmppclient_listener.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/xmppclient_listener.lua') diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 417dfd4a..fd4e7097 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -108,7 +108,7 @@ 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); -- cgit v1.2.3 From 2aa2de8a5bb0a37e167c4aab7cfa3a84c1444e95 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 21 Nov 2009 17:15:59 +0000 Subject: xmppclient_listener: Use : syntax for connection methods, to be compatible with new server.lua --- net/xmppclient_listener.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/xmppclient_listener.lua') diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index fd4e7097..34438f3d 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -100,7 +100,7 @@ local function session_close(session, reason) end end session.send(""); - session.conn.close(); + session.conn:close(); xmppclient.disconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed"); end end @@ -117,7 +117,7 @@ function xmppclient.onincoming(conn, data) session.log("info", "Client connected"); -- Client is using legacy SSL (otherwise mod_tls sets this flag) - if conn.ssl() then + if conn:ssl() then session.secure = true; end -- cgit v1.2.3 From 31dd61128403f0af9e2482856ec95d18c85f79d5 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 22 Nov 2009 04:43:46 +0000 Subject: *_listener: Update for new net.server API, specifically .listener -> .onincoming, .disconnect -> .ondisconnect --- net/xmppclient_listener.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/xmppclient_listener.lua') diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 34438f3d..fc0dce2c 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -101,7 +101,7 @@ local function session_close(session, reason) end session.send(""); session.conn:close(); - xmppclient.disconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed"); + xmppclient.ondisconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed"); end end @@ -133,7 +133,7 @@ function xmppclient.onincoming(conn, data) end end -function xmppclient.disconnect(conn, err) +function xmppclient.ondisconnect(conn, err) local session = sessions[conn]; if session then (session.log or log)("info", "Client disconnected: %s", err); -- cgit v1.2.3 From 4e56a3c519bc0d46a3491ca18cb58c3e8dbb5ae9 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 24 Nov 2009 22:42:08 +0500 Subject: xmppclient_listener: Escape control characters when logging invalid XML. --- net/xmppclient_listener.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/xmppclient_listener.lua') diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 417dfd4a..01d73a36 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -61,7 +61,7 @@ local function session_reset_stream(session) 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]+", " ")); + log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")); session:close("xml-not-well-formed"); end -- cgit v1.2.3 From f5afdcb5642fb5260717613cc7909e20805a957c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 24 Nov 2009 20:34:22 +0000 Subject: core.sessionmanager, net.*_listener: Remove the evil collectgarbage() calls --- net/xmppclient_listener.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'net/xmppclient_listener.lua') diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index fc0dce2c..4fd51db6 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -140,7 +140,6 @@ function xmppclient.ondisconnect(conn, err) sm_destroy_session(session, err); sessions[conn] = nil; session = nil; - collectgarbage("collect"); end end -- cgit v1.2.3