Changeset 70f6aab8

Timestamp:

2006-09-20T20:09:19Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0b4a0db

Parents:

21167d2

Message:

It now requests a roster when logged in, no parsing for it yet.

Location:

protocols/jabber

Files:

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

protocols/jabber/iq.c

@@ -24 +24 @@
 #include "jabber.h"
 
-/*
-<iq xmlns="jabber:client" id="BeeX00000001" type="result"><query
-xmlns="jabber:iq:auth"><username>wilmer</username><resource/><password/><digest/>
-<sequence>499</sequence><token>450D1FFD</token></query></iq>
-*/
-
 xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
 {
@@ -35 +29 @@
         struct jabber_data *jd = gc->proto_data;
         struct xt_node *query, *reply = NULL;
-        char *s;
+        char *s, *type, *xmlns;
         int st;
         
         query = xt_find_node( node->children, "query" );
+        type = xt_find_attr( node, "type" );
         
-        if( !query )
+        if( !type )
                 return XT_HANDLED;      /* Ignore it for now, don't know what's best... */
         
-        if( ( s = xt_find_attr( query, "xmlns" ) ) && strcmp( s, "jabber:iq:auth" ) == 0 )
+        xmlns = xt_find_attr( query, "xmlns" );
+        
+        if( strcmp( type, "result" ) == 0 && xmlns && strcmp( xmlns, "jabber:iq:auth" ) == 0 )
         {
                 /* Time to authenticate ourselves! */
@@ -79 +76 @@
                         xt_free_node( reply );
                         
-                        hide_login_progress_error( gc, "Can't find suitable authentication method" );
+                        hide_login_progress( gc, "Can't find suitable authentication method" );
                         signoff( gc );
                         return XT_ABORT;
@@ -89 +86 @@
                 
                 return st ? XT_HANDLED : XT_ABORT;
+        }
+        else if( strcmp( type, "result" ) == 0 )
+        {
+                /* If we weren't authenticated yet, let's assume we are now.
+                   There are cleaner ways to do this, probably, but well.. */
+                if( !( jd->flags & JFLAG_AUTHENTICATED ) )
+                {
+                        jd->flags |= JFLAG_AUTHENTICATED;
+                        if( !jabber_get_roster( gc ) )
+                                return XT_ABORT;
+                }
+        }
+        else if( strcmp( type, "error" ) == 0 )
+        {
+                if( !( jd->flags & JFLAG_AUTHENTICATED ) )
+                {
+                        hide_login_progress( gc, "Authentication failure" );
+                        signoff( gc );
+                        return XT_ABORT;
+                }
         }
         
@@ -109 +126 @@
         return st;
 }
+
+int jabber_get_roster( struct gaim_connection *gc )
+{
+        struct xt_node *node;
+        int st;
+        
+        set_login_progress( gc, 1, "Authenticated, requesting buddy list" );
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", "jabber:iq:roster" );
+        node = jabber_make_packet( "iq", "get", NULL, node );
+        
+        st = jabber_write_packet( gc, node );
+        
+        xt_free_node( node );
+        return st;
+}

protocols/jabber/jabber.c

@@ -101 +101 @@
                 closesocket( jd->fd );
         
+        xt_free( jd->xt );
+        
         g_free( jd->username );
         g_free( jd );

protocols/jabber/jabber.h

@@ -39 +39 @@
 xt_status jabber_pkt_iq( struct xt_node *node, gpointer data );
 int jabber_start_auth( struct gaim_connection *gc );
+int jabber_get_roster( struct gaim_connection *gc );
 
 xt_status jabber_pkt_message( struct xt_node *node, gpointer data );