From c016526d9d5b57c8b6157cba7eee4bb268e1e9b4 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 5 Dec 2008 19:49:16 +0000 Subject: Backed out changeset 099d8a102deb (committed too much) --- core/presencemanager.lua | 9 --------- core/sessionmanager.lua | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'core') diff --git a/core/presencemanager.lua b/core/presencemanager.lua index dbcb83d6..6e27752b 100644 --- a/core/presencemanager.lua +++ b/core/presencemanager.lua @@ -21,7 +21,6 @@ local log = require "util.logger".init("presencemanager") -local tostring = tostring; local require = require; local pairs, ipairs = pairs, ipairs; local t_concat = table.concat; @@ -122,14 +121,6 @@ function handle_normal_presence(origin, stanza, core_route_stanza) else log("error", "presence recieved from client with no roster"); end - - if origin.conntimetotal then - local session = origin; - origin.log("BLAH", "***********\n\n\n\n\n\n****************"); - origin.send(st.stanza("message", { from = session.host, to=session.full_jid, type = "normal" }):body("Your login took "..tostring(session.conntimetotal).." seconds")); - origin.conntimetotal = nil; - end - end function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza) diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index bc48d228..36111633 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -35,8 +35,6 @@ local uuid_generate = require "util.uuid".generate; local rm_load_roster = require "core.rostermanager".load_roster; local config_get = require "core.configmanager".get; -local gettime = require "socket".gettime; - local st = require "util.stanza"; local newproxy = newproxy; @@ -47,7 +45,7 @@ module "sessionmanager" local open_sessions = 0; function new_session(conn) - local session = { conn = conn, priority = 0, type = "c2s_unauthed", conntime = gettime() }; + local session = { conn = conn, priority = 0, type = "c2s_unauthed" }; if true then session.trace = newproxy(true); getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end; @@ -111,8 +109,6 @@ 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 - session.conntimetotal = gettime()-session.conntime; - resource = resource or uuid_generate(); --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing -- cgit v1.2.3