From 95b463a3ee6dc6d93e1c7b39d043357a4c72f6b1 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 --- core/sessionmanager.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'core/sessionmanager.lua') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 5e7fe06d..9aafe0bf 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -10,7 +10,6 @@ local tonumber, tostring = tonumber, tostring; local ipairs, pairs, print, next= ipairs, pairs, print, next; -local collectgarbage = collectgarbage; local format = import("string", "format"); local hosts = hosts; -- cgit v1.2.3 From 909e439525e41721abd91b227c7f9078aeda504b Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 11 Jan 2010 18:59:06 +0500 Subject: sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function. --- core/sessionmanager.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/sessionmanager.lua') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 9aafe0bf..df144f07 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -24,6 +24,7 @@ local uuid_generate = require "util.uuid".generate; local rm_load_roster = require "core.rostermanager".load_roster; local config_get = require "core.configmanager".get; local nameprep = require "util.encodings".stringprep.nameprep; +local resourceprep = require "util.encodings".stringprep.resourceprep; local fire_event = require "core.eventmanager".fire_event; local add_task = require "util.timer".add_task; @@ -105,7 +106,8 @@ function bind_resource(session, resource) if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end -- We don't support binding multiple resources - resource = resource or uuid_generate(); + resource = resourceprep(resource); + resource = resource ~= "" and resource or uuid_generate(); --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing if not hosts[session.host].sessions[session.username] then -- cgit v1.2.3 From 2739ed3948b9df3a596d6aef6d6790f1c2e1c59f Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 12 Feb 2010 17:14:54 +0000 Subject: sessionmanager, s2smanager: Give sessions dummy data handlers that log when data is received by a destroyed session --- core/sessionmanager.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core/sessionmanager.lua') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index df144f07..9df7823c 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -66,6 +66,8 @@ function new_session(conn) return session; end +local function null_data_handler(data) log("debug", "Discarding data from destroyed c2s session: %s", data); end + function destroy_session(session, err) (session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)"); @@ -88,6 +90,7 @@ function destroy_session(session, err) session[k] = nil; end end + session.data = null_data_handler; end function make_authenticated(session, username) -- cgit v1.2.3 From 4a592b5069548aa13a6aad96a1fcb54222345290 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 12 Feb 2010 17:27:53 +0000 Subject: sessionmanager, s2smanager: Fix for syntax of null_data_handler() (thanks Nolan) --- core/sessionmanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/sessionmanager.lua') diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 9df7823c..2dd0070b 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -66,7 +66,7 @@ function new_session(conn) return session; end -local function null_data_handler(data) log("debug", "Discarding data from destroyed c2s session: %s", data); end +local function null_data_handler(conn, data) log("debug", "Discarding data from destroyed c2s session: %s", data); end function destroy_session(session, err) (session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)"); -- cgit v1.2.3