Changeset 8d74291 for protocols/jabber/sasl.c

Timestamp:

2006-09-22T16:56:58Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fe7a554

Parents:

5997488

Message:

Fixed return value on incomplete write()s in write handler, protection
against write()ing to sockets that are closed already, hopefully sane
detection for SASL support, and only sending type=unavailable presence
tag to logged in sessions.

File:

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

protocols/jabber/sasl.c

@@ -34 +34 @@
         char *s;
         int sup_plain = 0, sup_digest = 0;
+        
+        if( !sasl_supported( gc ) )
+        {
+                /* 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!" );
+                return XT_HANDLED;
+        }
         
         s = xt_find_attr( node, "xmlns" );
@@ -94 +103 @@
 xt_status sasl_pkt_challenge( struct xt_node *node, gpointer data )
 {
+        return XT_HANDLED;
 }
 
@@ -123 +133 @@
         return XT_HANDLED;
 }
+
+/* This one is needed to judge if we'll do authentication using IQ or SASL.
+   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;
+        
+        return ( jd->xt && jd->xt->root && xt_find_attr( jd->xt->root, "version" ) ) != NULL;
+}