Changeset 256899f for protocols/jabber/io.c

Timestamp:

2007-11-19T23:16:18Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7df5a08

Parents:

cd428e4 (diff), ef5c185 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging Jabber groupchat support.

File:

• protocols/jabber/io.c (modified) (5 diffs)

protocols/jabber/io.c

@@ -44 +44 @@
         struct jabber_data *jd = ic->proto_data;
         gboolean ret;
+        
+        if( jd->flags & JFLAG_XMLCONSOLE )
+        {
+                char *msg;
+                
+                msg = g_strdup_printf( "TX: %s", buf );
+                imcb_buddy_msg( ic, JABBER_XMLCONSOLE_HANDLE, msg, 0, 0 );
+                g_free( msg );
+        }
         
         if( jd->tx_len == 0 )
@@ -427 +436 @@
 {
         struct im_connection *ic = data;
-        struct xt_node *c;
-        char *s, *type = NULL, *text = NULL;
         int allow_reconnect = TRUE;
-        
-        for( c = node->children; c; c = c->next )
-        {
-                if( !( s = xt_find_attr( c, "xmlns" ) ) ||
-                    strcmp( s, XMLNS_STREAM_ERROR ) != 0 )
-                        continue;
-                
-                if( strcmp( c->name, "text" ) != 0 )
-                {
-                        type = c->name;
-                }
-                /* Only use the text if it doesn't have an xml:lang attribute,
-                   if it's empty or if it's set to something English. */
-                else if( !( s = xt_find_attr( c, "xml:lang" ) ) ||
-                         !*s || strncmp( s, "en", 2 ) == 0 )
-                {
-                        text = c->text;
-                }
-        }
+        struct jabber_error *err;
+        
+        err = jabber_error_parse( node, XMLNS_STREAM_ERROR );
         
         /* Tssk... */
-        if( type == NULL )
+        if( err->code == NULL )
         {
                 imcb_error( ic, "Unknown stream error reported by server" );
                 imc_logout( ic, allow_reconnect );
+                jabber_error_free( err );
                 return XT_ABORT;
         }
@@ -461 +453 @@
            should turn off auto-reconnect to make sure we won't get some nasty
            infinite loop! */
-        if( strcmp( type, "conflict" ) == 0 )
+        if( strcmp( err->code, "conflict" ) == 0 )
         {
                 imcb_error( ic, "Account and resource used from a different location" );
@@ -468 +460 @@
         else
         {
-                imcb_error( ic, "Stream error: %s%s%s", type, text ? ": " : "", text ? text : "" );
-        }
-        
+                imcb_error( ic, "Stream error: %s%s%s", err->code, err->text ? ": " : "",
+                            err->text ? err->text : "" );
+        }
+        
+        jabber_error_free( err );
         imc_logout( ic, allow_reconnect );
         
@@ -476 +470 @@
 }
 
+static xt_status jabber_xmlconsole( struct xt_node *node, gpointer data )
+{
+        struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
+        
+        if( jd->flags & JFLAG_XMLCONSOLE )
+        {
+                char *msg, *pkt;
+                
+                pkt = xt_to_string( node );
+                msg = g_strdup_printf( "RX: %s", pkt );
+                imcb_buddy_msg( ic, JABBER_XMLCONSOLE_HANDLE, msg, 0, 0 );
+                g_free( msg );
+                g_free( pkt );
+        }
+        
+        return XT_NEXT;
+}
+
 static const struct xt_handler_entry jabber_handlers[] = {
+        { NULL,                 "stream:stream",        jabber_xmlconsole },
         { "stream:stream",      "<root>",               jabber_end_of_stream },
         { "message",            "stream:stream",        jabber_pkt_message },