Changeset 638feab for protocols/jabber/jabber_util.c

Timestamp:

2010-03-18T14:38:06Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5605be9

Parents:

6ce01be (diff), 842cd8d (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:

Merging in Jabber resource selection fix. This adds the activity_timeout
setting, which makes BitlBee send a message to bare JIDs if there was no
recent seen activity from any of the person's resources. This should fix
most issues with messages going to the wrong resource (i.e. someone's
mobile phone instead of something more sensible).

File:

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

protocols/jabber/jabber_util.c

@@ -4 +4 @@
 *  Jabber module - Misc. stuff                                              *
 *                                                                           *
-*  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
+*  Copyright 2006-2010 Wilmer van der Gaast <wilmer@gaast.net>              
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
@@ -345 +345 @@
         if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) )
         {
+                /* The first entry is always a bare JID. If there are more, we
+                   should ignore the first one here. */
+                if( bud->next )
+                        bud = bud->next;
+                
                 /* If this is a transport buddy or whatever, it can't have more
                    than one instance, so this is always wrong: */
@@ -379 +384 @@
         else
         {
-                /* Keep in mind that full_jid currently isn't really
-                   a full JID... */
-                new->bare_jid = g_strdup( full_jid );
+                new->full_jid = new->bare_jid = g_strdup( full_jid );
                 g_hash_table_insert( jd->buddies, new->bare_jid, new );
+                
+                if( s )
+                {
+                        new->next = g_new0( struct jabber_buddy, 1 );
+                        new->next->bare_jid = new->bare_jid;
+                        new = new->next;
+                }
         }
         
@@ -408 +418 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *bud;
+        struct jabber_buddy *bud, *head;
         char *s, *jid;
         
@@ -420 +430 @@
                 if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) )
                 {
+                        bare_exists = 1;
+                        
+                        if( bud->next )
+                                bud = bud->next;
+                        
                         /* Just return the first one for this bare JID. */
                         if( flags & GET_BUDDY_FIRST )
@@ -441 +456 @@
                                         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 ) ) )
+                    ( bare_exists || imcb_find_buddy( ic, jid ) ) )
                 {
                         *s = '/';
@@ -464 +472 @@
                 char *set;
                 
-                bud = g_hash_table_lookup( jd->buddies, jid );
+                head = g_hash_table_lookup( jd->buddies, jid );
+                bud = ( head && head->next ) ? head->next : head;
                 
                 g_free( jid );
@@ -481 +490 @@
                         /* Looks like the caller doesn't care about details. */
                         return bud;
+                else if( flags & GET_BUDDY_BARE )
+                        return head;
                 
                 best_prio = best_time = bud;
@@ -487 +498 @@
                         if( bud->priority > best_prio->priority )
                                 best_prio = bud;
-                        if( bud->last_act > best_time->last_act )
+                        if( bud->last_msg > best_time->last_msg )
                                 best_time = bud;
                 }
@@ -493 +504 @@
                 if( ( set = set_getstr( &ic->acc->set, "resource_select" ) ) == NULL )
                         return NULL;
-                else if( strcmp( set, "activity" ) == 0 )
+                else if( strcmp( set, "priority" ) == 0 )
+                        return best_prio;
+                else if( flags & GET_BUDDY_BARE_OK ) /* && strcmp( set, "activity" ) == 0 */
+                {
+                        if( best_time->last_msg + set_getint( &ic->acc->set, "activity_timeout" ) >= time( NULL ) )
+                                return best_time;
+                        else
+                                return head;
+                }
+                else
                         return best_time;
-                else /* if( strcmp( set, "priority" ) == 0 ) */
-                        return best_prio;
         }
 }
@@ -538 +556 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *bud, *prev, *bi;
+        struct jabber_buddy *bud, *prev = NULL, *bi;
         char *s, *full_jid;
         
@@ -548 +566 @@
         if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) )
         {
+                if( bud->next )
+                        bud = (prev=bud)->next;
+                
                 /* If there's only one item in the list (and if the resource
                    matches), removing it is simple. (And the hash reference
@@ -555 +576 @@
                       ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) )
                 {
-                        g_hash_table_remove( jd->buddies, bud->bare_jid );
-                        g_free( bud->bare_jid );
-                        g_free( bud->ext_jid );
-                        g_free( bud->full_jid );
-                        g_free( bud->away_message );
-                        g_free( bud );
-                        
-                        g_free( full_jid );
-                        
-                        return 1;
+                        return jabber_buddy_remove_bare( ic, full_jid );
                 }
                 else if( s == NULL || bud->resource == NULL )
@@ -575 +587 @@
                 else
                 {
-                        for( bi = bud, prev = NULL; bi; bi = (prev=bi)->next )
+                        for( bi = bud; bi; bi = (prev=bi)->next )
                                 if( strcmp( bi->resource, s + 1 ) == 0 )
                                         break;
@@ -586 +598 @@
                                         prev->next = bi->next;
                                 else
-                                        /* The hash table should point at the second
-                                           item, because we're removing the first. */
+                                        /* Don't think this should ever happen anymore. */
                                         g_hash_table_replace( jd->buddies, bi->bare_jid, bi->next );