prosody
76ac96c53ee5
core/sessionmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/sessionmanager.lua @ 118:76ac96c53ee5

Merge roster & presence from waqas
author Matthew Wild <mwild1@gmail.com>
date Wed, 22 Oct 2008 23:12:26 +0100
parent 99:ba08b8a4eeef
parent 112:df54cab4ff9c
child 123:ebd65feb188c
line wrap: on
line diff
--- a/core/sessionmanager.lua	Wed Oct 22 17:36:21 2008 +0100
+++ b/core/sessionmanager.lua	Wed Oct 22 23:12:26 2008 +0100
@@ -12,7 +12,7 @@
 local log = require "util.logger".init("sessionmanager");
 local error = error;
 local uuid_generate = require "util.uuid".uuid_generate;
-local rm_getroster = require "core.rostermanager".getroster
+local rm_load_roster = require "core.rostermanager".load_roster;
 
 local newproxy = newproxy;
 local getmetatable = getmetatable;
@@ -84,7 +84,7 @@
 	else
 		if hosts[session.host].sessions[session.username].sessions[resource] then
 			-- Resource conflict
-			return false, "conflict";
+			return false, "conflict"; -- TODO kick old resource
 		end
 	end
 	
@@ -92,7 +92,7 @@
 	session.full_jid = session.username .. '@' .. session.host .. '/' .. resource;
 	hosts[session.host].sessions[session.username].sessions[resource] = session;
 	
-	session.roster = rm_getroster(session.username, session.host);
+	session.roster = rm_load_roster(session.username, session.host);
 	
 	return true;
 end