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

* src/mod_roster.erl: Bugfix

SVN Revision: 189

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

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

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"}],

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"}],
 				       []});