Changeset 0da65d5 for protocols/jabber/sasl.c

Timestamp:

2007-03-31T05:40:45Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

aef4828

Parents:

fa29d093

Message:

s/gaim_connection/im_connection/ and some other minor API changes. The rest
will come tomorrow. It compiles, I'll leave the real testing up to someone
else. ;-)

File:

• protocols/jabber/sasl.c (modified) (13 diffs)

protocols/jabber/sasl.c

@@ -27 +27 @@
 xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
 {
-        struct gaim_connection *gc = data;
-        struct jabber_data *jd = gc->proto_data;
+        struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *c, *reply;
         char *s;
         int sup_plain = 0, sup_digest = 0;
         
-        if( !sasl_supported( gc ) )
+        if( !sasl_supported( ic ) )
         {
                 /* Should abort this now, since we should already be doing
                    IQ authentication. Strange things happen when you try
                    to do both... */
-                serv_got_crap( gc, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
+                serv_got_crap( ic, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
                 return XT_HANDLED;
         }
@@ -45 +45 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                signoff( gc );
+                signoff( ic );
                 return XT_ABORT;
         }
@@ -62 +62 @@
         if( !sup_plain && !sup_digest )
         {
-                hide_login_progress( gc, "No known SASL authentication schemes supported" );
-                signoff( gc );
+                hide_login_progress( ic, "No known SASL authentication schemes supported" );
+                signoff( ic );
                 return XT_ABORT;
         }
@@ -83 +83 @@
                 
                 /* With SASL PLAIN in XMPP, the text should be b64(\0user\0pass) */
-                len = strlen( jd->username ) + strlen( gc->acc->pass ) + 2;
+                len = strlen( jd->username ) + strlen( ic->acc->pass ) + 2;
                 s = g_malloc( len + 1 );
                 s[0] = 0;
                 strcpy( s + 1, jd->username );
-                strcpy( s + 2 + strlen( jd->username ), gc->acc->pass );
+                strcpy( s + 2 + strlen( jd->username ), ic->acc->pass );
                 reply->text = base64_encode( s, len );
                 reply->text_len = strlen( reply->text );
@@ -93 +93 @@
         }
         
-        if( !jabber_write_packet( gc, reply ) )
+        if( !jabber_write_packet( ic, reply ) )
         {
                 xt_free_node( reply );
@@ -181 +181 @@
 xt_status sasl_pkt_challenge( struct xt_node *node, gpointer data )
 {
-        struct gaim_connection *gc = data;
-        struct jabber_data *jd = gc->proto_data;
+        struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *reply = NULL;
         char *nonce = NULL, *realm = NULL, *cnonce = NULL, cnonce_bin[30];
@@ -222 +222 @@
                    I decided to call it H. */
                 md5_init( &H );
-                s = g_strdup_printf( "%s:%s:%s", jd->username, realm, gc->acc->pass );
+                s = g_strdup_printf( "%s:%s:%s", jd->username, realm, ic->acc->pass );
                 md5_append( &H, (unsigned char *) s, strlen( s ) );
                 g_free( s );
@@ -272 +272 @@
         xt_add_attr( reply, "xmlns", XMLNS_SASL );
         
-        if( !jabber_write_packet( gc, reply ) )
+        if( !jabber_write_packet( ic, reply ) )
                 goto silent_error;
         
@@ -279 +279 @@
 
 error:
-        hide_login_progress( gc, "Incorrect SASL challenge received" );
-        signoff( gc );
+        hide_login_progress( ic, "Incorrect SASL challenge received" );
+        signoff( ic );
 
 silent_error:
@@ -296 +296 @@
 xt_status sasl_pkt_result( struct xt_node *node, gpointer data )
 {
-        struct gaim_connection *gc = data;
-        struct jabber_data *jd = gc->proto_data;
+        struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         char *s;
         
@@ -303 +303 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                signoff( gc );
+                signoff( ic );
                 return XT_ABORT;
         }
@@ -309 +309 @@
         if( strcmp( node->name, "success" ) == 0 )
         {
-                set_login_progress( gc, 1, "Authentication finished" );
+                set_login_progress( ic, 1, "Authentication finished" );
                 jd->flags |= JFLAG_AUTHENTICATED | JFLAG_STREAM_RESTART;
         }
         else if( strcmp( node->name, "failure" ) == 0 )
         {
-                hide_login_progress( gc, "Authentication failure" );
-                signoff( gc );
+                hide_login_progress( ic, "Authentication failure" );
+                signoff( ic );
                 return XT_ABORT;
         }
@@ -325 +325 @@
    It's done by checking if the <stream:stream> from the server has a
    version attribute. I don't know if this is the right way though... */
-gboolean sasl_supported( struct gaim_connection *gc )
-{
-        struct jabber_data *jd = gc->proto_data;
+gboolean sasl_supported( struct im_connection *ic )
+{
+        struct jabber_data *jd = ic->proto_data;
         
         return ( (void*) ( jd->xt && jd->xt->root && xt_find_attr( jd->xt->root, "version" ) ) ) != NULL;