2 files changed, 12 insertions, 1 deletions
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 538898f8..f30c8373 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -116,6 +116,8 @@ _presence_subscription(const char * const jid, const jabber_subscr_t action)
     }
 
     xmpp_stanza_t *presence = xmpp_stanza_new(ctx);
+    char *id = generate_unique_id("sub");
+    xmpp_stanza_set_id(presence, id);
     xmpp_stanza_set_name(presence, STANZA_NAME_PRESENCE);
     xmpp_stanza_set_type(presence, type);
     xmpp_stanza_set_attribute(presence, STANZA_ATTR_TO, jidp->barejid);
@@ -211,6 +213,8 @@ _presence_update(const resource_presence_t presence_type, const char * const msg
     connection_set_priority(pri);
 
     xmpp_stanza_t *presence = stanza_create_presence(ctx);
+    char *id = generate_unique_id("presence");
+    xmpp_stanza_set_id(presence, id);
     stanza_attach_show(ctx, presence, show);
     stanza_attach_status(ctx, presence, msg);
     stanza_attach_priority(ctx, presence, pri);
@@ -602,7 +606,7 @@ _get_caps_key(xmpp_stanza_t * const stanza)
     if ((hash_type != NULL) && (strcmp(hash_type, "sha-1") == 0)) {
         log_debug("Hash type %s supported.", hash_type);
         caps_key = strdup(node);
-        id = "capsreq";
+        char *id = generate_unique_id("caps");
 
         _send_caps_request(node, caps_key, id, from);
 
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index 756d3d44..bb2388ad 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -27,6 +27,7 @@
 #include <strophe.h>
 
 #include "common.h"
+#include "log.h"
 #include "xmpp/connection.h"
 #include "xmpp/stanza.h"
 #include "xmpp/capabilities.h"
@@ -253,6 +254,8 @@ stanza_create_room_join_presence(xmpp_ctx_t * const ctx,
     xmpp_stanza_t *presence = xmpp_stanza_new(ctx);
     xmpp_stanza_set_name(presence, STANZA_NAME_PRESENCE);
     xmpp_stanza_set_attribute(presence, STANZA_ATTR_TO, full_room_jid);
+    char *id = generate_unique_id("join");
+    xmpp_stanza_set_id(presence, id);
 
     xmpp_stanza_t *x = xmpp_stanza_new(ctx);
     xmpp_stanza_set_name(x, STANZA_NAME_X);
@@ -268,6 +271,8 @@ stanza_create_room_newnick_presence(xmpp_ctx_t *ctx,
     const char * const full_room_jid)
 {
     xmpp_stanza_t *presence = xmpp_stanza_new(ctx);
+    char *id = generate_unique_id("sub");
+    xmpp_stanza_set_id(presence, id);
     xmpp_stanza_set_name(presence, STANZA_NAME_PRESENCE);
     xmpp_stanza_set_attribute(presence, STANZA_ATTR_TO, full_room_jid);
 
@@ -286,6 +291,8 @@ stanza_create_room_leave_presence(xmpp_ctx_t *ctx, const char * const room,
     xmpp_stanza_set_name(presence, STANZA_NAME_PRESENCE);
     xmpp_stanza_set_type(presence, STANZA_TYPE_UNAVAILABLE);
     xmpp_stanza_set_attribute(presence, STANZA_ATTR_TO, full_jid->str);
+    char *id = generate_unique_id("leave");
+    xmpp_stanza_set_id(presence, id);
 
     g_string_free(full_jid, TRUE);