Changeset 7a9d968 for protocols/jabber

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

Location:

protocols/jabber

Files:

• Makefile (modified) (1 diff)
• conference.c (modified) (5 diffs)
• jabber.h (modified) (1 diff)
• s5bytestream.c (modified) (4 diffs)

protocols/jabber/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 jabber_mod.o: $(objects)
         @echo '*' Linking jabber_mod.o
-        @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
 
 -include .depend/*.d

protocols/jabber/conference.c

@@ -167 +167 @@
         jabber_buddy_remove_bare(c->ic, jc->name);
 
+        g_free(jc->last_sent_message);
         g_free(jc->my_full_jid);
         g_free(jc->name);
@@ -187 +188 @@
 
         jabber_cache_add(ic, node, jabber_chat_self_message);
+
+        g_free(jc->last_sent_message);
+        jc->last_sent_message = g_strdup(message);
 
         return !jabber_write_packet(ic, node);
@@ -325 +329 @@
                         }
                         bud->flags |= JBFLAG_IS_ANONYMOUS;
+                } else if (bud == jc->me) {
+                        g_free(bud->ext_jid);
+                        bud->ext_jid = g_strdup(jd->me);
                 }
 
@@ -347 +354 @@
                 }
 
+                imcb_chat_add_buddy(chat, bud->ext_jid);
+
                 if (bud != jc->me && (jc->flags & JCFLAG_ALWAYS_USE_NICKS) && !(bud->flags & JBFLAG_IS_ANONYMOUS)) {
                         imcb_buddy_nick_change(ic, bud->ext_jid, bud->resource);
                 }
 
-                imcb_chat_add_buddy(chat, bud->ext_jid);
                 if (s) {
                         *s = '/';
@@ -494 +502 @@
                 imcb_chat_log(chat, "From conference server: %s", body->text);
                 return;
-        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me &&
-                   (jabber_cache_handle_packet(ic, node) == XT_ABORT)) {
-                /* Self message marked by this bitlbee, don't show it */
-                return;
+        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me) {
+                if (jabber_cache_handle_packet(ic, node) == XT_ABORT) {
+                        /* Self message marked by this bitlbee, don't show it */
+                        return;
+                } else if (xt_find_attr(node, "id") == NULL &&
+                           g_strcmp0(body->text, jc->last_sent_message) == 0) {
+                        /* Some misbehaving servers (like slack) eat the ids and echo anyway.
+                         * Try to detect those cases by comparing against the last sent message. */
+                        return;
+                }
         }
 

protocols/jabber/jabber.h

@@ -161 +161 @@
         struct jabber_buddy *me;
         char *invite;
+        char *last_sent_message;
 };
 

protocols/jabber/s5bytestream.c

@@ -500 +500 @@
         case BS_PHASE_REPLY:
         {
-                struct socks5_message socks5_reply;
+                struct socks5_message socks5_reply = {0};
                 int ret;
 
@@ -888 +888 @@
         char *proxy, *next, *errmsg = NULL;
         char port[6];
-        char host[HOST_NAME_MAX + 1];
+        char host[NI_MAXHOST + 1];
         jabber_streamhost_t *sh, *sh2;
         GSList *streamhosts = jd->streamhosts;
@@ -1046 +1046 @@
                         unsigned char nmethods;
                         unsigned char method;
-                } socks5_hello;
+                } socks5_hello = {0};
 
                 if (!(ret = jabber_bs_peek(bt, &socks5_hello, sizeof(socks5_hello)))) {
@@ -1091 +1091 @@
         case BS_PHASE_REQUEST:
         {
-                struct socks5_message socks5_connect;
+                struct socks5_message socks5_connect = {0};
                 int msgsize = sizeof(struct socks5_message);
                 int ret;