summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-10-24 18:01:08 +0000
committerBadlop <badlop@process-one.net>2008-10-24 18:01:08 +0000
commit426e75a29822d64292f7b94b9a4d6be98b8b813e (patch)
treeea28e601531ac3536054b1c47294b1a9b1717679 /src
parent* src/ejabberd_lstener.erl: Fix listeners (diff)
* 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
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_c2s.erl2
-rw-r--r--src/mod_roster.erl2
-rw-r--r--src/mod_roster_odbc.erl2
-rw-r--r--src/mod_shared_roster.erl4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 54f4b640..50699e4a 100644
--- 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 387bd7ba..79cfb519 100644
--- 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 20655700..ca1b2e18 100644
--- 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 90614a35..cbce3102 100644
--- 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)]}]}),