Changeset 6baca2a for protocols

Timestamp:

2006-10-01T09:31:41Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0e2d97f

Parents:

022df46

Message:

Some initial hooks/stuff for privacy lists, and fixed a crash bug on
connecting to Google Talk.

Location:

protocols/jabber

Files:

• io.c (modified) (1 diff)
• iq.c (modified) (5 diffs)
• jabber.c (modified) (3 diffs)
• jabber.h (modified) (3 diffs)

protocols/jabber/io.c

@@ -335 +335 @@
         if( jd->flags & JFLAG_AUTHENTICATED && ( jd->flags & ( JFLAG_WAIT_BIND | JFLAG_WAIT_SESSION ) ) == 0 )
         {
-                if( !jabber_get_roster( gc ) )
+                if( !jabber_get_roster( gc ) || !jabber_get_privacy( gc ) )
                         return XT_ABORT;
         }

protocols/jabber/iq.c

@@ -28 +28 @@
         struct gaim_connection *gc = data;
         struct jabber_data *jd = gc->proto_data;
-        struct xt_node *query, *reply = NULL, *orig = NULL;
+        struct xt_node *query, *reply = NULL, *orig = NULL, *c;
         char *s, *type, *xmlns;
         int st;
@@ -109 +109 @@
                 account_online( gc );
         }
+        if( strcmp( type, "result" ) == 0 && xmlns && strcmp( xmlns, "jabber:iq:privacy" ) == 0 )
+        {
+                struct xt_node *node;
+                
+                /* When receiving a list of lists: */
+                if( ( node = xt_find_node( query->children, "active" ) ) )
+                {
+                        if( ( s = xt_find_attr( node, "name" ) ) )
+                        {
+                                set_t *set;
+                                
+                                g_free( jd->privacy_active );
+                                jd->privacy_active = g_strdup( s );
+                                
+                                /* Save it so the user can see it. */
+                                if( ( set = set_find( &gc->acc->set, "privacy_list" ) ) )
+                                {
+                                        g_free( set->value );
+                                        set->value = g_strdup( s );
+                                }
+                                
+                                if( !jabber_get_privacy( gc ) )
+                                        return XT_ABORT;
+                        }
+                }
+                /* When receiving an actual list: */
+                else if( ( node = xt_find_node( query->children, "list" ) ) )
+                {
+                        xt_free_node( jd->privacy_list );
+                        jd->privacy_list = xt_dup( node );
+                }
+                else if( query->children == NULL )
+                {
+                        /* What to do here if there is no privacy list defined yet... */
+                }
+        }
         else if( strcmp( type, "result" ) == 0 && orig )
         {
                 struct xt_node *c;
-                
                 if( !( jd->flags & JFLAG_AUTHENTICATED ) &&
                     ( c = xt_find_node( orig->children, "query" ) ) &&
@@ -121 +156 @@
                            the old (non-SASL) way. */
                         jd->flags |= JFLAG_AUTHENTICATED;
-                        if( !jabber_get_roster( gc ) )
+                        if( !jabber_get_roster( gc ) || !jabber_get_privacy( gc ) )
                                 return XT_ABORT;
                 }
@@ -145 +180 @@
                         if( ( jd->flags & ( JFLAG_WAIT_BIND | JFLAG_WAIT_SESSION ) ) == 0 )
                         {
-                                if( !jabber_get_roster( gc ) )
+                                if( !jabber_get_roster( gc ) || !jabber_get_privacy( gc ) )
                                         return XT_ABORT;
                         }
                 }
+                else if( ( c = xt_find_node( orig->children, "query" ) ) &&
+                         ( c = xt_find_node( c->children, "active" ) ) )
+                {
+                        /* We just successfully activated a (different)
+                           privacy list. Fetch it now. */
+                        g_free( jd->privacy_active );
+                        jd->privacy_active = g_strdup( xt_find_attr( c, "name" ) );
+                        
+                        if( !jabber_get_privacy( gc ) )
+                                return XT_ABORT;
+                }
         }
         else if( strcmp( type, "error" ) == 0 )
         {
-                if( !( jd->flags & JFLAG_AUTHENTICATED ) )
+                if( !( jd->flags & JFLAG_AUTHENTICATED ) &&
+                    ( c = xt_find_node( orig->children, "query" ) ) &&
+                    ( c = xt_find_node( c->children, "username" ) ) &&
+                    c->text_len )
                 {
                         hide_login_progress( gc, "Authentication failure" );
                         signoff( gc );
                         return XT_ABORT;
+                }
+                else if( orig &&
+                         ( c = xt_find_node( orig->children, "query" ) ) &&
+                         ( c = xt_find_node( c->children, "active" ) ) )
+                {
+                        serv_got_crap( gc, "Error while activating privacy list, maybe it doesn't exist" );
                 }
         }
@@ -238 +293 @@
         return st;
 }
+
+/* Request the privacy list from the server. We need this, because every
+   time we remove/add something we have to send the whole new list to the
+   server again... If no privacy list is specified yet, this function will
+   first ask for the list of lists (XMPP supports multiple "privacy lists",
+   don't ask me why), later we can then fetch the list we want to use. */
+int jabber_get_privacy( struct gaim_connection *gc )
+{
+        struct jabber_data *jd = gc->proto_data;
+        struct xt_node *node = NULL;
+        char *name;
+        int st;
+        
+        if( jd->privacy_active )
+        {
+                /* If we know what is the active list right now, fetch it. */
+                node = xt_new_node( "list", NULL, NULL );
+                xt_add_attr( node, "name", jd->privacy_active );
+        }
+        /* Okay, we don't know yet. If the user set a specific list, we'll
+           activate that one. Otherwise, we should figure out which list is
+           currently active. */
+        else if( ( name = set_getstr( &gc->acc->set, "privacy_list" ) ) )
+        {
+                return jabber_set_privacy( gc, name );
+        }
+        /* else: sending this packet without a <list/> element will give
+           a list of available lists and information about the currently
+           active list. */
+        
+        node = xt_new_node( "query", NULL, node );
+        xt_add_attr( node, "xmlns", "jabber:iq:privacy" );
+        node = jabber_make_packet( "iq", "get", NULL, node );
+        
+        st = jabber_write_packet( gc, node );
+        
+        xt_free_node( node );
+        return st;
+}
+
+int jabber_set_privacy( struct gaim_connection *gc, char *name )
+{
+        struct xt_node *node;
+        
+        node = xt_new_node( "active", NULL, NULL );
+        xt_add_attr( node, "name", name );
+        node = xt_new_node( "query", NULL, node );
+        xt_add_attr( node, "xmlns", "jabber:iq:privacy" );
+        
+        node = jabber_make_packet( "iq", "set", NULL, node );
+        jabber_cache_packet( gc, node );
+        
+        return jabber_write_packet( gc, node );
+}

protocols/jabber/jabber.c

@@ -42 +42 @@
         s = set_add( &acc->set, "priority", "0", set_eval_priority, acc );
         
+        s = set_add( &acc->set, "privacy_list", NULL, NULL, acc );
+        /* TODO: Add evaluator. */
+        
         s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
@@ -81 +84 @@
         if( set_getbool( &acc->set, "ssl" ) )
         {
-                jd->ssl = ssl_connect( jd->server, set_getint( &acc->set, "port" ), jabber_connected_ssl, gc );
+                jd->ssl = ssl_connect( acc->server ? acc->server : jd->server, set_getint( &acc->set, "port" ), jabber_connected_ssl, gc );
                 jd->fd = ssl_getfd( jd->ssl );
         }
         else
         {
-                jd->fd = proxy_connect( jd->server, set_getint( &acc->set, "port" ), jabber_connected_plain, gc );
+                jd->fd = proxy_connect( acc->server ? acc->server : jd->server, set_getint( &acc->set, "port" ), jabber_connected_plain, gc );
         }
 }
@@ -108 +111 @@
         if( jd->tx_len )
                 g_free( jd->txq );
+        
+        xt_free_node( jd->privacy_list );
+        g_free( jd->privacy_active );
         
         xt_free_node( jd->node_cache );

protocols/jabber/jabber.h

@@ -60 +60 @@
         char *away_message;
         
+        /* Updates to this one should be synchronized using jabber_privacy_update(). */
+        struct xt_node *privacy_list;
+        char *privacy_active;
+        
         struct xt_node *node_cache;
 };
@@ -69 +73 @@
 };
 
+#define DEFAULT_PRIVACY_LIST "simple_blocklist"
+
 /* iq.c */
 xt_status jabber_pkt_iq( struct xt_node *node, gpointer data );
@@ -75 +81 @@
 int jabber_add_to_roster( struct gaim_connection *gc, char *handle, char *name );
 int jabber_remove_from_roster( struct gaim_connection *gc, char *handle );
+int jabber_get_privacy( struct gaim_connection *gc );
+int jabber_set_privacy( struct gaim_connection *gc, char *name );
 
 /* message.c */