mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Presence fixes (again)

Browse source 
- Presence to other resources sent correctly
 - Resource of the recipient ignored for all presence except available and unavailable
 - Set things up for presence subscriptions
This commit is contained in:
Waqas Hussain 2008-10-24 00:26:01 +05:00
parent 1d1e9fba57
commit d915fa0a60
1 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

60
core/stanza_router.lua
View file

@ -64,13 +64,20 @@ function core_handle_stanza(origin, stanza)
core_route_stanza(origin, stanza); core_route_stanza(origin, stanza);
end end
end end
--[[local node, host = jid_split(stanza.attr.from); local node, host = jid_split(stanza.attr.from);
for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources and from resources
if res.full_jid then if res ~= origin then
res = user.sessions[k]; if res.full_jid then -- to resource. FIXME is this check correct? Maybe it should be res.presence
break; stanza.attr.to = res.full_jid;
core_route_stanza(origin, stanza);
end
if res.presence then -- from all resources for which we have presence
res.presence.attr.to = origin.full_jid;
core_route_stanza(res, res.presence);
res.presence.attr.to = nil;
end
end end
end]] end
if not origin.presence then -- presence probes on initial presence if not origin.presence then -- presence probes on initial presence
local probe = st.presence({from = origin.full_jid, type = "probe"}); local probe = st.presence({from = origin.full_jid, type = "probe"});
for jid in pairs(origin.roster) do for jid in pairs(origin.roster) do
@ -80,6 +87,7 @@ function core_handle_stanza(origin, stanza)
core_route_stanza(origin, probe); core_route_stanza(origin, probe);
end end
end end
-- TODO resend subscription requests
end end
origin.presence = stanza; origin.presence = stanza;
stanza.attr.to = nil; -- reset it stanza.attr.to = nil; -- reset it
@ -107,7 +115,7 @@ function core_route_stanza(origin, stanza)
local to = stanza.attr.to; local to = stanza.attr.to;
local node, host, resource = jid_split(to); local node, host, resource = jid_split(to);
if stanza.name == "presence" and stanza.attr.type == "probe" then resource = nil; end if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
local host_session = hosts[host] local host_session = hosts[host]
if host_session and host_session.type == "local" then if host_session and host_session.type == "local" then
@ -118,22 +126,32 @@ function core_route_stanza(origin, stanza)
if not res then if not res then
-- if we get here, resource was not specified or was unavailable -- if we get here, resource was not specified or was unavailable
if stanza.name == "presence" then if stanza.name == "presence" then
if stanza.attr.type == "probe" then if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
if is_authorized_to_see_presence(origin, node, host) then if stanza.attr.type == "probe" then
for k in pairs(user.sessions) do -- return presence for all resources if is_authorized_to_see_presence(origin, node, host) then
if user.sessions[k].presence then for k in pairs(user.sessions) do -- return presence for all resources
local pres = user.sessions[k].presence; if user.sessions[k].presence then
pres.attr.to = origin.full_jid; local pres = user.sessions[k].presence;
pres.attr.from = user.sessions[k].full_jid; pres.attr.to = origin.full_jid;
send(origin, pres); pres.attr.from = user.sessions[k].full_jid;
pres.attr.to = nil; send(origin, pres);
pres.attr.from = nil; pres.attr.to = nil;
pres.attr.from = nil;
end
end end
else
send(origin, st.presence({from=user.."@"..host, to=origin.username.."@"..origin.host, type="unsubscribed"}));
end end
else elseif stanza.attr.type == "subscribe" then
send(origin, st.presence({from = user.."@"..host, to = origin.username.."@"..origin.host, type = "unsubscribed"})); -- TODO
end elseif stanza.attr.type == "unsubscribe" then
else -- TODO
elseif stanza.attr.type == "subscribed" then
-- TODO
elseif stanza.attr.type == "unsubscribed" then
-- TODO
end -- discard any other type
else -- sender is available or unavailable
for k in pairs(user.sessions) do -- presence broadcast to all user resources for k in pairs(user.sessions) do -- presence broadcast to all user resources
if user.sessions[k].full_jid then if user.sessions[k].full_jid then
stanza.attr.to = user.sessions[k].full_jid; stanza.attr.to = user.sessions[k].full_jid;