Changes in protocols/jabber/jabber_util.c [89d736a:9143aeb]

File:

• protocols/jabber/jabber_util.c (modified) (11 diffs)

protocols/jabber/jabber_util.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "md5.h"
-#include "base64.h"
 
 static unsigned int next_id = 1;
@@ -136 +134 @@
         struct jabber_data *jd = ic->proto_data;
         struct jabber_cache_entry *entry = g_new0( struct jabber_cache_entry, 1 );
-        md5_state_t id_hash;
-        md5_byte_t id_sum[16];
-        char *id, *asc_hash;
-        
-        next_id ++;
-        
-        id_hash = jd->cached_id_prefix;
-        md5_append( &id_hash, (md5_byte_t*) &next_id, sizeof( next_id ) );
-        md5_finish( &id_hash, id_sum );
-        asc_hash = base64_encode( id_sum, 12 );
-        
-        id = g_strdup_printf( "%s%s", JABBER_CACHED_ID, asc_hash );
+        char *id;
+        
+        id = g_strdup_printf( "%s%05x", jd->cached_id_prefix, ( next_id++ ) & 0xfffff );
         xt_add_attr( node, "id", id );
         g_free( id );
-        g_free( asc_hash );
         
         entry->node = node;
@@ -196 +184 @@
         
         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
@@ -208 +196 @@
         if( entry == NULL )
         {
-                /*
-                There's no longer an easy way to see if we generated this
-                one or someone else, and there's a ten-minute timeout anyway,
-                so meh.
-                
                 imcb_log( ic, "Warning: Received %s-%s packet with unknown/expired ID %s!",
                               node->name, xt_find_attr( node, "type" ) ? : "(no type)", s );
-                */
         }
         else if( entry->func )
@@ -308 +290 @@
         len = strlen( orig );
         new = g_new( char, len + 1 );
-        
-        /* So it turns out the /resource part is case sensitive. Yeah, and
-           it's Unicode but feck Unicode. :-P So stop once we see a slash. */
-        for( i = 0; i < len && orig[i] != '/' ; i ++ )
+        for( i = 0; i < len; i ++ )
                 new[i] = tolower( orig[i] );
-        for( ; orig[i]; i ++ )
-                new[i] = orig[i];
         
         new[i] = 0;
@@ -357 +334 @@
                 {
                         /* Check for dupes. */
-                        if( strcmp( bi->resource, s + 1 ) == 0 )
+                        if( g_strcasecmp( bi->resource, s + 1 ) == 0 )
                         {
                                 *s = '/';
@@ -410 +387 @@
         if( ( s = strchr( jid, '/' ) ) )
         {
-                int bare_exists = 0;
+                int none_found = 0;
                 
                 *s = 0;
@@ -433 +410 @@
                         /* See if there's an exact match. */
                         for( ; bud; bud = bud->next )
-                                if( strcmp( bud->resource, s + 1 ) == 0 )
+                                if( g_strcasecmp( bud->resource, s + 1 ) == 0 )
                                         break;
                 }
                 else
                 {
-                        /* This variable tells the if down here that the bare
-                           JID already exists and we should feel free to add
-                           more resources, if the caller asked for that. */
-                        bare_exists = 1;
-                }
-                
-                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
-                    ( !bare_exists || imcb_find_buddy( ic, jid ) ) )
+                        /* This hack is there to make sure that O_CREAT will
+                           work if there's already another resouce present
+                           for this JID, even if it's an unknown buddy. This
+                           is done to handle conferences properly. */
+                        none_found = 1;
+                        /* TODO(wilmer): Find out what I was thinking when I
+                           wrote this??? And then fix it. This makes me sad... */
+                }
+                
+                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && ( imcb_find_buddy( ic, jid ) || !none_found ) )
                 {
                         *s = '/';
@@ -470 +449 @@
                         /* We want an exact match, so in thise case there shouldn't be a /resource. */
                         return NULL;
-                else if( bud->resource == NULL || bud->next == NULL )
+                else if( ( bud->resource == NULL || bud->next == NULL ) )
                         /* No need for selection if there's only one option. */
                         return bud;
@@ -546 +525 @@
                    matches), removing it is simple. (And the hash reference
                    should be removed too!) */
-                if( bud->next == NULL &&
-                    ( ( s == NULL && bud->resource == NULL ) ||
-                      ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) )
+                if( bud->next == NULL && ( ( s == NULL || bud->resource == NULL ) || g_strcasecmp( bud->resource, s + 1 ) == 0 ) )
                 {
                         g_hash_table_remove( jd->buddies, bud->bare_jid );
@@ -571 +548 @@
                 {
                         for( bi = bud, prev = NULL; bi; bi = (prev=bi)->next )
-                                if( strcmp( bi->resource, s + 1 ) == 0 )
+                                if( g_strcasecmp( bi->resource, s + 1 ) == 0 )
                                         break;