Changeset 608f8cf

Timestamp:

2007-11-24T18:02:39Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

221a273

Parents:

3a80471

Message:

Added some random hash to the id= for cached XMPP packets so that packets
from other BitlBees won't be picked up accidentally. Might also want to
randomize the per-packet IDs because they're still predictable.

Location:

protocols/jabber

Files:

• iq.c (modified) (1 diff)
• jabber.c (modified) (3 diffs)
• jabber.h (modified) (2 diffs)
• jabber_util.c (modified) (1 diff)

protocols/jabber/iq.c

@@ -50 +50 @@
                 
                 if( ( s = xt_find_attr( node, "id" ) ) == NULL ||
-                    strncmp( s, JABBER_CACHED_ID, strlen( JABBER_CACHED_ID ) ) != 0 )
+                    strncmp( s, jd->cached_id_prefix, strlen( jd->cached_id_prefix ) ) != 0 )
                 {
                         /* Silently ignore it, without an ID (or a non-cache

protocols/jabber/jabber.c

@@ -32 +32 @@
 #include "bitlbee.h"
 #include "jabber.h"
+#include "md5.h"
+#include "base64.h"
 
 static void jabber_init( account_t *acc )
@@ -59 +61 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 }
+
+static void jabber_generate_id_hash( struct jabber_data *jd );
 
 static void jabber_login( account_t *acc )
@@ -200 +204 @@
                 imcb_add_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
         }
+        
+        jabber_generate_id_hash( jd );
+}
+
+static void jabber_generate_id_hash( struct jabber_data *jd )
+{
+        md5_state_t id_hash;
+        md5_byte_t binbuf[16];
+        char *s;
+        
+        md5_init( &id_hash );
+        md5_append( &id_hash, (unsigned char *) jd->username, strlen( jd->username ) );
+        md5_append( &id_hash, (unsigned char *) jd->server, strlen( jd->server ) );
+        s = set_getstr( &jd->ic->acc->set, "resource" );
+        md5_append( &id_hash, (unsigned char *) s, strlen( s ) );
+        random_bytes( binbuf, 16 );
+        md5_append( &id_hash, binbuf, 16 );
+        md5_finish( &id_hash, binbuf );
+        
+        s = base64_encode( binbuf, 9 );
+        jd->cached_id_prefix = g_strdup_printf( "%s%s", JABBER_CACHED_ID, s );
+        g_free( s );
+        
+        printf( "%s\n", jd->cached_id_prefix );
 }
 

protocols/jabber/jabber.h

@@ -78 +78 @@
         char *away_message;
         
+        char *cached_id_prefix;
         GHashTable *node_cache;
         GHashTable *buddies;
@@ -132 +133 @@
    first one should be used, but when storing a packet in the cache, a
    "special" kind of ID is assigned to make it easier later to figure out
-   if we have to do call an event handler for the response packet. */
+   if we have to do call an event handler for the response packet. Also
+   we'll append a hash to make sure we won't trigger on cached packets from
+   other BitlBee users. :-) */
 #define JABBER_PACKET_ID "BeeP"
 #define JABBER_CACHED_ID "BeeC"

protocols/jabber/jabber_util.c

@@ -133 +133 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        char *id = g_strdup_printf( "%s%05x", JABBER_CACHED_ID, ( next_id++ ) & 0xfffff );
         struct jabber_cache_entry *entry = g_new0( struct jabber_cache_entry, 1 );
-        
+        char *id;
+        
+        id = g_strdup_printf( "%s%05x", jd->cached_id_prefix, ( next_id++ ) & 0xfffff );
         xt_add_attr( node, "id", id );
         g_free( id );