* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)

* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1666

diff --git a/ChangeLog b/ChangeLog
index 2a4946ba15dedcab905e84264ab5fb36346f5329..4e5eaa2d6846457991f118ed48f49f16409369e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-10-24  Badlop  <badlop@process-one.net>
 
+       * src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
+       * src/mod_roster.erl: Likewise
+       * src/mod_roster_odbc.erl: Likewise
+       * src/mod_shared_roster.erl: Likewise
+
        * src/ejabberd_lstener.erl: Fix listeners
        * src/ejabberd_sup.erl: Likewise
        * src/gen_mod.erl: Likewise

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 54f4b640ad83f22281f1be9d22714e1794876d5c..50699e4a6d2d901f7a0a49ee4ee44cbaf196f167 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1192,7 +1192,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
                            NewPL ->
                                PrivPushIQ =
                                    #iq{type = set, xmlns = ?NS_PRIVACY,
-                                       id = "push",
+                                       id = "push" ++ randoms:get_string(),
                                        sub_el = [{xmlelement, "query",
                                                   [{"xmlns", ?NS_PRIVACY}],
                                                   [{xmlelement, "list",

diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 387bd7ba3c256a310b6fb494f465eca3ad65073b..79cfb51993250f28be4afe939086d815c3189218 100644 (file)
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -336,7 +336,7 @@ push_item(User, Server, From, Item) ->
 % TODO: don't push to those who didn't load roster
 push_item(User, Server, Resource, From, Item) ->
     ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
-               id = "push",
+               id = "push" ++ randoms:get_string(),
                sub_el = [{xmlelement, "query",
                           [{"xmlns", ?NS_ROSTER}],
                           [item_to_xml(Item)]}]},

diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 20655700cf92b225dbdeac25c98d01fca41a1562..ca1b2e1881ab3154973a2151b0e7424c9cb82074 100644 (file)
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -371,7 +371,7 @@ push_item(User, Server, From, Item) ->
 % TODO: don't push to those who not load roster
 push_item(User, Server, Resource, From, Item) ->
     ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
-               id = "push",
+               id = "push" ++ randoms:get_string(),
                sub_el = [{xmlelement, "query",
                           [{"xmlns", ?NS_ROSTER}],
                           [item_to_xml(Item)]}]},

diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
index 90614a35b04fa54a1f0d0829a8144309b5b9e293..cbce3102ae98fde45c86a651df0b86da8917f98d 100644 (file)
--- a/src/mod_shared_roster.erl
+++ b/src/mod_shared_roster.erl
@@ -242,7 +242,7 @@ set_new_rosteritems(UserFrom, ServerFrom,
 
 set_item(User, Server, Resource, Item) ->
     ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
-               id = "push",
+               id = "push" ++ randoms:get_string(),
                sub_el = [{xmlelement, "query",
                           [{"xmlns", ?NS_ROSTER}],
                           [mod_roster:item_to_xml(Item)]}]},
@@ -548,7 +548,7 @@ push_item(User, Server, From, Item) ->
                         Item#roster.subscription}]}),
     Stanza = jlib:iq_to_xml(
               #iq{type = set, xmlns = ?NS_ROSTER,
-                  id = "push",
+                  id = "push" ++ randoms:get_string(),
                   sub_el = [{xmlelement, "query",
                              [{"xmlns", ?NS_ROSTER}],
                              [item_to_xml(Item)]}]}),