Changeset bb2d198

Timestamp:

2012-02-10T15:14:38Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fc0640e

Parents:

e0a0a42

Message:

Probing for Google Talk servers, based on iq-discovery responses. I'll need
this for automatically generating a sane name for groupchats.

Location:

protocols/jabber

Files:

• iq.c (modified) (4 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/iq.c

@@ -27 +27 @@
 static xt_status jabber_parse_roster( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
 static xt_status jabber_iq_display_vcard( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
+static int jabber_iq_disco_server( struct im_connection *ic );
 
 xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
@@ -330 +331 @@
                 if( !jabber_get_roster( ic ) )
                         return XT_ABORT;
+                if( !jabber_iq_disco_server( ic ) )
+                        return XT_ABORT;
         }
         
@@ -390 +393 @@
         {
                 if( !jabber_get_roster( ic ) )
+                        return XT_ABORT;
+                if( !jabber_iq_disco_server( ic ) )
                         return XT_ABORT;
         }
@@ -887 +892 @@
         return XT_HANDLED;
 }
+
+static xt_status jabber_iq_disco_server_response( struct im_connection *ic,
+        struct xt_node *node, struct xt_node *orig );
+
+static int jabber_iq_disco_server( struct im_connection *ic )
+{
+        struct xt_node *node, *iq;
+        struct jabber_data *jd = ic->proto_data;
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", XMLNS_DISCO_INFO );
+        iq = jabber_make_packet( "iq", "get", jd->server, node );
+        
+        jabber_cache_add( ic, iq, jabber_iq_disco_server_response );
+        return jabber_write_packet( ic, iq );
+}
+
+static xt_status jabber_iq_disco_server_response( struct im_connection *ic,
+        struct xt_node *node, struct xt_node *orig )
+{
+        struct jabber_data *jd = ic->proto_data;
+        struct xt_node *id;
+        
+        if( ( id = xt_find_path( node, "query/identity" ) ) )
+        {
+                char *cat, *type, *name;
+                
+                if( !( cat = xt_find_attr( id, "category" ) ) ||
+                    !( type = xt_find_attr( id, "type" ) ) ||
+                    !( name = xt_find_attr( id, "name" ) ) )
+                        return XT_HANDLED;
+                
+                if( strcmp( cat, "server" ) == 0 && strcmp( type, "im" ) == 0 &&
+                    strstr( name, "Google" ) != NULL )
+                        jd->flags |= JFLAG_GTALK;
+        }
+        
+        return XT_HANDLED;
+}

protocols/jabber/jabber.h

@@ -47 +47 @@
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
         JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
-        
+
+        JFLAG_GTALK =  0x100000,        /* Is Google Talk, as confirmed by iq discovery */
+
         JFLAG_SASL_FB = 0x10000,        /* Trying Facebook authentication. */
 } jabber_flags_t;