24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-18 22:15:20 +02:00

* src/ejabberd_c2s.erl: Presence probe now sended from full JID

* src/mod_roster.erl: Bugfix

SVN Revision: 189
This commit is contained in:
Alexey Shchepin 2003-12-24 21:05:45 +00:00
parent 1b76800448
commit 8076bc8999
4 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2003-12-24 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Presence probe now sended from full JID
* src/mod_roster.erl: Bugfix
2003-12-23 Alexey Shchepin <alexey@sevcom.net> 2003-12-23 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Bugfix * src/ejabberd_c2s.erl: Bugfix

1
TODO
View File

@ -10,6 +10,7 @@ S2S:
rewrite S2S key validation rewrite S2S key validation
check "id" attributes in db:verify packets check "id" attributes in db:verify packets
last presence
more correctly work with SRV DNS records (priority, weight, etc...) more correctly work with SRV DNS records (priority, weight, etc...)
TLS TLS
make roster set to work in one transaction make roster set to work in one transaction

View File

@ -1114,7 +1114,7 @@ presence_broadcast_to_trusted(StateData, From, T, A, Packet) ->
presence_broadcast_first(From, StateData, Packet) -> presence_broadcast_first(From, StateData, Packet) ->
?SETS:fold(fun(JID, X) -> ?SETS:fold(fun(JID, X) ->
ejabberd_router:route( ejabberd_router:route(
jlib:jid_replace_resource(From, ""), From,
jlib:make_jid(JID), jlib:make_jid(JID),
{xmlelement, "presence", {xmlelement, "presence",
[{"type", "probe"}], [{"type", "probe"}],

View File

@ -193,7 +193,8 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) ->
end, end,
if IsTo -> if IsTo ->
ejabberd_router:route( ejabberd_router:route(
From, jlib:make_jid(OldItem#roster.jid), jlib:jid_remove_resource(From),
jlib:make_jid(OldItem#roster.jid),
{xmlelement, "presence", {xmlelement, "presence",
[{"type", "unsubscribe"}], [{"type", "unsubscribe"}],
[]}); []});
@ -201,7 +202,8 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) ->
end, end,
if IsFrom -> if IsFrom ->
ejabberd_router:route( ejabberd_router:route(
From, jlib:make_jid(OldItem#roster.jid), jlib:jid_remove_resource(From),
jlib:make_jid(OldItem#roster.jid),
{xmlelement, "presence", {xmlelement, "presence",
[{"type", "unsubscribed"}], [{"type", "unsubscribed"}],
[]}); []});