aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/jabber/jabber.c14
-rw-r--r--protocols/jabber/jabber.h11
-rw-r--r--protocols/jabber/jabber_util.c75
-rw-r--r--protocols/jabber/message.c2
-rw-r--r--protocols/jabber/presence.c3
-rw-r--r--protocols/oscar/oscar.c17
6 files changed, 71 insertions, 51 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 4a3d0525..956769b7 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -57,6 +57,8 @@ static void jabber_init( account_t *acc )
set_t *s;
char str[16];
+ s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );
+
g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
s = set_add( &acc->set, "port", str, set_eval_int, acc );
s->flags |= ACC_SET_OFFLINE_ONLY;
@@ -320,7 +322,7 @@ static int jabber_buddy_msg( struct im_connection *ic, char *who, char *message,
if( ( s = strchr( who, '=' ) ) && jabber_chat_by_jid( ic, s + 1 ) )
bud = jabber_buddy_by_ext_jid( ic, who, 0 );
else
- bud = jabber_buddy_by_jid( ic, who, 0 );
+ bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_BARE_OK );
node = xt_new_node( "body", message, NULL );
node = jabber_make_packet( "message", "chat", bud ? bud->full_jid : who, node );
@@ -365,17 +367,9 @@ static GList *jabber_away_states( struct im_connection *ic )
static void jabber_get_info( struct im_connection *ic, char *who )
{
- struct jabber_data *jd = ic->proto_data;
struct jabber_buddy *bud;
- if( strchr( who, '/' ) )
- bud = jabber_buddy_by_jid( ic, who, 0 );
- else
- {
- char *s = jabber_normalize( who );
- bud = g_hash_table_lookup( jd->buddies, s );
- g_free( s );
- }
+ bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_FIRST );
while( bud )
{
diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h
index 3e520a08..5be7978b 100644
--- a/protocols/jabber/jabber.h
+++ b/protocols/jabber/jabber.h
@@ -119,6 +119,13 @@ struct jabber_cache_entry
jabber_cache_event func;
};
+/* Somewhat messy data structure: We have a hash table with the bare JID as
+ the key and the head of a struct jabber_buddy list as the value. The head
+ is always a bare JID. If the JID has other resources (often the case,
+ except for some transports that don't support multiple resources), those
+ follow. In that case, the bare JID at the beginning doesn't actually
+ refer to a real session and should only be used for operations that
+ support incomplete JIDs. */
struct jabber_buddy
{
char *bare_jid;
@@ -133,7 +140,7 @@ struct jabber_buddy
char *away_message;
GSList *features;
- time_t last_act;
+ time_t last_msg;
jabber_buddy_flags_t flags;
struct jabber_buddy *next;
@@ -270,6 +277,8 @@ typedef enum
GET_BUDDY_CREAT = 1, /* Try to create it, if necessary. */
GET_BUDDY_EXACT = 2, /* Get an exact match (only makes sense with bare JIDs). */
GET_BUDDY_FIRST = 4, /* No selection, simply get the first resource for this JID. */
+ GET_BUDDY_BARE = 8, /* Get the bare version of the JID (possibly inexistent). */
+ GET_BUDDY_BARE_OK = 16, /* Allow returning a bare JID if that seems better. */
} get_buddy_flags_t;
struct jabber_error
diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c
index 7a802ba1..bd2fbe8c 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 <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 *
* it under the terms of the GNU General Public License as published by *
@@ -348,6 +348,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 )
@@ -382,10 +387,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 )
@@ -411,7 +421,7 @@ 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_ );
@@ -423,6 +433,11 @@ struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid_,
*s = 0;
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 )
{
@@ -444,16 +459,9 @@ 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 ) ) )
+ ( bare_exists || imcb_find_buddy( ic, jid ) ) )
{
*s = '/';
bud = jabber_buddy_add( ic, jid );
@@ -467,7 +475,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 && head->next ) ? head->next : head;
g_free( jid );
@@ -484,22 +493,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;
}
}
@@ -541,7 +559,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_ );
@@ -551,6 +569,9 @@ 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 = (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
should be removed too!) */
@@ -558,16 +579,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 )
{
@@ -578,7 +590,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;
@@ -589,8 +601,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 );
diff --git a/protocols/jabber/message.c b/protocols/jabber/message.c
index 6cb67d42..a226a225 100644
--- a/protocols/jabber/message.c
+++ b/protocols/jabber/message.c
@@ -70,7 +70,7 @@ xt_status jabber_pkt_message( struct xt_node *node, gpointer data )
{
if( bud )
{
- bud->last_act = time( NULL );
+ bud->last_msg = time( NULL );
from = bud->ext_jid ? : bud->bare_jid;
}
else
diff --git a/protocols/jabber/presence.c b/protocols/jabber/presence.c
index 28aaea1b..006eeead 100644
--- a/protocols/jabber/presence.c
+++ b/protocols/jabber/presence.c
@@ -67,9 +67,6 @@ xt_status jabber_pkt_presence( struct xt_node *node, gpointer data )
else
{
bud->away_state = NULL;
- /* Let's only set last_act if there's *no* away state,
- since it could be some auto-away thingy. */
- bud->last_act = time( NULL );
}
if( ( c = xt_find_node( node->children, "priority" ) ) && c->text_len > 0 )
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index f0e65f9a..e0c32257 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -372,11 +372,15 @@ static void oscar_init(account_t *acc)
{
set_t *s;
- s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc );
+ if (isdigit(acc->user[0])) {
+ set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc);
+ }
+
+ s = set_add(&acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc);
s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
- if (isdigit(acc->user[0])) {
- s = set_add( &acc->set, "web_aware", "false", set_eval_bool, acc );
+ if(isdigit(acc->user[0])) {
+ s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc);
s->flags |= ACC_SET_OFFLINE_ONLY;
}
@@ -1211,10 +1215,15 @@ static void gaim_icq_authdeny(void *data_) {
* For when other people ask you for authorization
*/
static void gaim_icq_authask(struct im_connection *ic, guint32 uin, char *msg) {
- struct icq_auth *data = g_new(struct icq_auth, 1);
+ struct icq_auth *data;
char *reason = NULL;
char *dialog_msg;
+
+ if (set_getbool(&ic->acc->set, "ignore_auth_requests"))
+ return;
+ data = g_new(struct icq_auth, 1);
+
if (strlen(msg) > 6)
reason = msg + 6;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 08:42:05 +0000