Changeset 5997488 for protocols/jabber

Timestamp:

2006-09-22T12:04:35Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8d74291

Parents:

deff040

Message:

Basic SASL (PLAIN only ATM) authentication code. Doesn't log in completely
yet.

Location:

protocols/jabber

Files:

• Makefile (modified) (1 diff)
• io.c (modified) (3 diffs)
• jabber.h (modified) (2 diffs)
• sasl.c (added)

protocols/jabber/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = io.o iq.o jabber.o jabber_util.o message.o presence.o xmltree.o
+objects = io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o
 
 CFLAGS += -Wall

protocols/jabber/io.c

@@ -134 +134 @@
                            aborted the connection already... Or not? FIXME */
                         return FALSE;
+                }
+                
+                if( jd->flags & JFLAG_STREAM_RESTART )
+                {
+                        jd->flags &= ~JFLAG_STREAM_RESTART;
+                        xt_reset( jd->xt );
+                        jabber_start_stream( gc );
                 }
                 
@@ -204 +211 @@
         { "message",            "stream:stream",        jabber_pkt_message },
         { "presence",           "stream:stream",        jabber_pkt_presence },
+        { "mechanisms",         "stream:features",      sasl_pkt_mechanisms },
+        { "challenge",          "stream:stream",        sasl_pkt_challenge },
+        { "success",            "stream:stream",        sasl_pkt_result },
+        { "failure",            "stream:stream",        sasl_pkt_result },
         { NULL,                 "stream:stream",        jabber_pkt_misc },
         { NULL,                 NULL,                   NULL }
@@ -224 +235 @@
         greet = g_strdup_printf( "<?xml version='1.0' ?>"
                                  "<stream:stream to=\"%s\" xmlns=\"jabber:client\" "
-                                  "xmlns:stream=\"http://etherx.jabber.org/streams\">", jd->server );
-        /* Add this when TLS and SASL are supported? */
-        // version=\"1.0\">"
+                                  "xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", jd->server );
         
         st = jabber_write( gc, greet, strlen( greet ) );

protocols/jabber/jabber.h

@@ -32 +32 @@
 typedef enum
 {
-        JFLAG_STREAM_STARTED = 1,
-        JFLAG_AUTHENTICATED = 2,
+        JFLAG_STREAM_STARTED = 1,       /* Set when we detected the beginning of the stream and want to do auth. */
+        JFLAG_AUTHENTICATED = 2,        /* Set when we're successfully authenticatd. */
+        JFLAG_STREAM_RESTART = 4,       /* Set when we want to restart the stream (after SASL or TLS). */
+        JFLAG_SUPPORTS_TLS = 8,         /* Set when there's <starttls/> in <stream:features>. */
 } jabber_flags_t;
 
@@ -60 +62 @@
 void jabber_end_stream( struct gaim_connection *gc );
 
+/* sasl.c */
+xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data );
+xt_status sasl_pkt_challenge( struct xt_node *node, gpointer data );
+xt_status sasl_pkt_result( struct xt_node *node, gpointer data );
+
 struct jabber_data
 {