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

* src/mod_roster.erl: Bugfix

SVN Revision: 189

diff --git a/ChangeLog b/ChangeLog
index b2ce58e82fc56b4cca3706703c209873a13c3a68..363e7abb5ba28c1db2b42392d9dc4db2f787a385 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/TODO b/TODO
index a66b50af21313b4e5c6022cdd2ae1d79f99e03b2..5702938dfcbbbcc9d113dc08d939bafaf6d0cf5e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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 448ed7705b681b9f0d4b4e642d07e7ccb868ec24..d7554ba6545cce51f551e396ac479dda07109769 100644 (file)
--- 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 6f3234e629017d7c03680cb800d961539bb986be..cbb6085abb328c8867d41e486137673720bfb330 100644 (file)
--- 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"}],
                                       []});