diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2003-12-24 21:05:45 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2003-12-24 21:05:45 +0000 |
| commit | 8076bc899943bc803bbd7b55a23934a02b81c65d (patch) | |
| tree | 660794d3ad611fa9b8974adcb0a55752046d5959 | |
| parent | * src/ejabberd_c2s.erl: Bugfix (diff) | |
* src/ejabberd_c2s.erl: Presence probe now sended from full JID
* src/mod_roster.erl: Bugfix
SVN Revision: 189
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 2 | ||||
| -rw-r--r-- | src/mod_roster.erl | 6 |
4 files changed, 12 insertions, 3 deletions
@@ -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> * src/ejabberd_c2s.erl: Bugfix @@ -10,6 +10,7 @@ S2S: rewrite S2S key validation check "id" attributes in db:verify packets +last presence more correctly work with SRV DNS records (priority, weight, etc...) TLS make roster set to work in one transaction diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 448ed770..d7554ba6 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1114,7 +1114,7 @@ presence_broadcast_to_trusted(StateData, From, T, A, Packet) -> presence_broadcast_first(From, StateData, Packet) -> ?SETS:fold(fun(JID, X) -> ejabberd_router:route( - jlib:jid_replace_resource(From, ""), + From, jlib:make_jid(JID), {xmlelement, "presence", [{"type", "probe"}], diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 6f3234e6..cbb6085a 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -193,7 +193,8 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) -> end, if IsTo -> ejabberd_router:route( - From, jlib:make_jid(OldItem#roster.jid), + jlib:jid_remove_resource(From), + jlib:make_jid(OldItem#roster.jid), {xmlelement, "presence", [{"type", "unsubscribe"}], []}); @@ -201,7 +202,8 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) -> end, if IsFrom -> ejabberd_router:route( - From, jlib:make_jid(OldItem#roster.jid), + jlib:jid_remove_resource(From), + jlib:make_jid(OldItem#roster.jid), {xmlelement, "presence", [{"type", "unsubscribed"}], []}); |