From 76c85b4c79d533ca7a780df381ccda5b9ab2934c Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 19 Nov 2009 13:11:38 +0000 Subject: resource_select now defaults to activity instead of priority. Also, adding a activity_timeout setting. Now, messages to someone who hasn't spoken for a while will be sent to his/her bare JID, usually resulting in a broadcast. This should fix issues with messages sometimes arriving on someone's Crackberry/Android/etc instead of some place s/he's paying attention to. Last, the activity timer is only reset on incoming messages. --- protocols/jabber/jabber_util.c | 70 +++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 32 deletions(-) (limited to 'protocols/jabber/jabber_util.c') diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index 19a73b6a..6c37c2ef 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -339,6 +339,11 @@ struct jabber_buddy *jabber_buddy_add( struct im_connection *ic, char *full_jid_ 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: */ if( s == NULL || bud->resource == NULL ) @@ -373,10 +378,15 @@ struct jabber_buddy *jabber_buddy_add( struct im_connection *ic, char *full_jid_ } 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; + } } if( s ) @@ -402,18 +412,19 @@ struct jabber_buddy *jabber_buddy_add( struct im_connection *ic, char *full_jid_ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, get_buddy_flags_t flags ) { struct jabber_data *jd = ic->proto_data; - struct jabber_buddy *bud; + struct jabber_buddy *bud, *head; char *s, *jid; jid = jabber_normalize( jid_ ); if( ( s = strchr( jid, '/' ) ) ) { - int bare_exists = 0; - *s = 0; if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) ) { + if( bud->next ) + bud = bud->next; + /* Just return the first one for this bare JID. */ if( flags & GET_BUDDY_FIRST ) { @@ -435,16 +446,8 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, if( strcmp( 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 ) ) ) + if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid ) ) { *s = '/'; bud = jabber_buddy_add( ic, jid ); @@ -458,7 +461,8 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, struct jabber_buddy *best_prio, *best_time; char *set; - bud = g_hash_table_lookup( jd->buddies, jid ); + head = g_hash_table_lookup( jd->buddies, jid ); + bud = head->next ? head->next : head; g_free( jid ); @@ -475,22 +479,31 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, else if( flags & GET_BUDDY_FIRST ) /* Looks like the caller doesn't care about details. */ return bud; + else if( flags & GET_BUDDY_BARE ) + return head; best_prio = best_time = bud; for( ; bud; bud = bud->next ) { 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; } if( ( set = set_getstr( &ic->acc->set, "resource_select" ) ) == NULL ) return NULL; - else if( strcmp( set, "activity" ) == 0 ) - return best_time; - else /* if( strcmp( set, "priority" ) == 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; } } @@ -532,7 +545,7 @@ struct jabber_buddy *jabber_buddy_by_ext_jid( struct im_connection *ic, char *ji int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) { struct jabber_data *jd = ic->proto_data; - struct jabber_buddy *bud, *prev, *bi; + struct jabber_buddy *head, *bud, *prev, *bi; char *s, *full_jid; full_jid = jabber_normalize( full_jid_ ); @@ -540,8 +553,10 @@ int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) if( ( s = strchr( full_jid, '/' ) ) ) *s = 0; - if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) ) + if( ( head = g_hash_table_lookup( jd->buddies, full_jid ) ) ) { + bud = head->next ? head->next : head; + /* If there's only one item in the list (and if the resource matches), removing it is simple. (And the hash reference should be removed too!) */ @@ -549,16 +564,7 @@ int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) ( ( s == NULL && bud->resource == NULL ) || ( 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 ) { -- cgit v1.2.3 From 20e830b641638bc580e1a58b68fc3c5837e76807 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 19 Nov 2009 14:58:30 +0000 Subject: Fixed a facepalm kind of NULL pointer dereference bug. --- protocols/jabber/jabber_util.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'protocols/jabber/jabber_util.c') diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index 6c37c2ef..ec23919e 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -462,7 +462,7 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, char *set; head = g_hash_table_lookup( jd->buddies, jid ); - bud = head->next ? head->next : head; + bud = ( head && head->next ) ? head->next : head; g_free( jid ); @@ -545,7 +545,7 @@ struct jabber_buddy *jabber_buddy_by_ext_jid( struct im_connection *ic, char *ji int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) { struct jabber_data *jd = ic->proto_data; - struct jabber_buddy *head, *bud, *prev, *bi; + struct jabber_buddy *bud, *prev, *bi; char *s, *full_jid; full_jid = jabber_normalize( full_jid_ ); @@ -553,9 +553,10 @@ int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) if( ( s = strchr( full_jid, '/' ) ) ) *s = 0; - if( ( head = g_hash_table_lookup( jd->buddies, full_jid ) ) ) + if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) ) { - bud = head->next ? head->next : head; + if( bud->next ) + bud = bud->next; /* If there's only one item in the list (and if the resource matches), removing it is simple. (And the hash reference -- cgit v1.2.3 From 08e5bb2bb2fcc7125f837be4f225d3a9ebf320ed Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 19 Nov 2009 18:50:53 +0000 Subject: Restoring some logic that seemed broken but was important with handling of chatrooms (and likely more things). The restored version is somewhat less confusing. --- protocols/jabber/jabber_util.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'protocols/jabber/jabber_util.c') diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index ec23919e..120a56b6 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -419,9 +419,13 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, if( ( s = strchr( jid, '/' ) ) ) { + int bare_exists = 0; + *s = 0; if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) ) { + bare_exists = 1; + if( bud->next ) bud = bud->next; @@ -447,7 +451,8 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, break; } - if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid ) ) + if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && + ( imcb_find_buddy( ic, jid ) || bare_exists ) ) { *s = '/'; bud = jabber_buddy_add( ic, jid ); -- cgit v1.2.3 From dde9d5710cd6392592c1417032933f0ba4299d9c Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 12 Mar 2010 19:35:51 +0000 Subject: Fixed jabber_util unittest. It passes, yet something still seems to be broken. :-( --- protocols/jabber/jabber_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'protocols/jabber/jabber_util.c') diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index 6e103609..a0266d3e 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -457,7 +457,7 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_, } if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && - ( imcb_find_buddy( ic, jid ) || bare_exists ) ) + ( bare_exists || imcb_find_buddy( ic, jid ) ) ) { *s = '/'; bud = jabber_buddy_add( ic, jid ); -- cgit v1.2.3 From 842cd8dbfb98b61af33b5fe481364c3cfbeaca04 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 18 Mar 2010 11:22:17 +0000 Subject: Fixed a bug that caused full JIDs to get lost sometimes with the new way of storing full JIDs belongong to a contact. --- protocols/jabber/jabber_util.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'protocols/jabber/jabber_util.c') diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index a0266d3e..db5944bc 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -3,7 +3,7 @@ * BitlBee - An IRC to IM gateway * * Jabber module - Misc. stuff * * * -* Copyright 2006 Wilmer van der Gaast * +* Copyright 2006-2010 Wilmer van der Gaast * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -555,7 +555,7 @@ struct jabber_buddy *jabber_buddy_by_ext_jid( struct im_connection *ic, char *ji int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) { struct jabber_data *jd = ic->proto_data; - struct jabber_buddy *bud, *prev, *bi; + struct jabber_buddy *bud, *prev = NULL, *bi; char *s, *full_jid; full_jid = jabber_normalize( full_jid_ ); @@ -566,7 +566,7 @@ int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) if( ( bud = g_hash_table_lookup( jd->buddies, full_jid ) ) ) { if( bud->next ) - bud = 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 @@ -586,7 +586,7 @@ int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) } 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; @@ -597,8 +597,7 @@ int jabber_buddy_remove( struct im_connection *ic, char *full_jid_ ) if( prev ) 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 ); g_free( bi->ext_jid ); -- cgit v1.2.3 From 2e3a8576d6ca511df347426b4319bccde1871d06 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 8 Apr 2010 01:27:42 +0100 Subject: Added a mktime_utc() to misc.c using code that used to be in jabber_util.c. I want to use this in the Twitter module. --- protocols/jabber/jabber_util.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'protocols/jabber/jabber_util.c') diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index db5944bc..b8b625f7 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -666,10 +666,9 @@ int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid ) time_t jabber_get_timestamp( struct xt_node *xt ) { - struct tm tp, utc; struct xt_node *c; - time_t res, tres; char *s = NULL; + struct tm tp; for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next ) { @@ -687,30 +686,8 @@ time_t jabber_get_timestamp( struct xt_node *xt ) tp.tm_year -= 1900; tp.tm_mon --; - tp.tm_isdst = -1; /* GRRRRRRRRRRR */ - - res = mktime( &tp ); - /* Problem is, mktime() just gave us the GMT timestamp for the - given local time... While the given time WAS NOT local. So - we should fix this now. - - Now I could choose between messing with environment variables - (kludgy) or using timegm() (not portable)... Or doing the - following, which I actually prefer... */ - gmtime_r( &res, &utc ); - utc.tm_isdst = -1; /* Once more: GRRRRRRRRRRRRRRRRRR!!! */ - if( utc.tm_hour == tp.tm_hour && utc.tm_min == tp.tm_min ) - /* Sweet! We're in UTC right now... */ - return res; - - tres = mktime( &utc ); - res += res - tres; - - /* Yes, this is a hack. And it will go wrong around DST changes. - BUT this is more likely to be threadsafe than messing with - environment variables, and possibly more portable... */ - - return res; + + return mktime_utc( &tp ); } struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns ) -- cgit v1.2.3