Changeset 4a0614e

Timestamp:

2006-09-21T09:37:03Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5bcf70a

Parents:

dd788bb

Message:

Added simple parsing of incoming <presence> tags, a nice </stream:stream>
at the end of sessions, support for sending messages, and restored the old
(and leaking) xt_print(), which I'll only use for debugging.

Location:

protocols/jabber

Files:

• io.c (modified) (3 diffs)
• jabber.c (modified) (2 diffs)
• jabber.h (modified) (1 diff)
• presence.c (modified) (1 diff)
• xmltree.c (modified) (1 diff)

protocols/jabber/io.c

@@ -170 +170 @@
 }
 
-static gboolean jabber_start_stream( struct gaim_connection *gc );
-
 gboolean jabber_connected_plain( gpointer data, gint source, b_input_condition cond )
 {
@@ -210 +208 @@
 };
 
-static gboolean jabber_start_stream( struct gaim_connection *gc )
+gboolean jabber_start_stream( struct gaim_connection *gc )
 {
         struct jabber_data *jd = gc->proto_data;
@@ -236 +234 @@
         return st;
 }
+
+gboolean jabber_end_stream( struct gaim_connection *gc )
+{
+        struct jabber_data *jd = gc->proto_data;
+        char eos[] = "</stream:stream>";
+        
+        /* Let's only do this if the queue is currently empty, otherwise it'd
+           take too long anyway. */
+        if( jd->tx_len > 0 )
+                return TRUE;
+        else
+                return jabber_write( gc, eos, strlen( eos ) );
+}

protocols/jabber/jabber.c

@@ -91 +91 @@
         struct jabber_data *jd = gc->proto_data;
         
+        jabber_end_stream( gc );
+        
         if( jd->r_inpa >= 0 )
                 b_event_remove( jd->r_inpa );
@@ -109 +111 @@
 static int jabber_send_im( struct gaim_connection *gc, char *who, char *message, int len, int away )
 {
-        return 0;
+        struct xt_node *node;
+        int st;
+        
+        node = xt_new_node( "body", message, NULL );
+        node = jabber_make_packet( "message", "chat", who, node );
+        st = jabber_write_packet( gc, node );
+        xt_free_node( node );
+        
+        return st;
 }
 

protocols/jabber/jabber.h

@@ -56 +56 @@
 int jabber_write( struct gaim_connection *gc, char *buf, int len );
 gboolean jabber_connected_plain( gpointer data, gint source, b_input_condition cond );
+gboolean jabber_start_stream( struct gaim_connection *gc );
+gboolean jabber_end_stream( struct gaim_connection *gc );
 
 struct jabber_data

protocols/jabber/presence.c

@@ -26 +26 @@
 xt_status jabber_pkt_presence( struct xt_node *node, gpointer data )
 {
+        struct gaim_connection *gc = data;
         char *from = xt_find_attr( node, "from" );
+        char *type = xt_find_attr( node, "type" );      /* NULL should mean the person is online. */
+        char *s;
         
-        printf( "Received PRES from %s:\n", from );
-        xt_print( node );
+        if( !from )
+                return XT_HANDLED;
+        
+        s = strchr( from, '/' );
+        if( s )
+                *s = 0;
+        
+        if( type == NULL )
+                serv_got_update( gc, from, 1, 0, 0, 0, 0, 0 );
+        else if( strcmp( type, "unavailable" ) == 0 )
+                serv_got_update( gc, from, 0, 0, 0, 0, 0, 0 );
+        else
+        {
+                printf( "Received PRES from %s:\n", from );
+                xt_print( node );
+        }
+        
+        if( s )
+                *s = '/';
         
         return XT_HANDLED;

protocols/jabber/xmltree.c

@@ -305 +305 @@
         struct xt_node *c;
         
-        printf( "%s\n", xt_to_string( node ) );
-        return;
-        
         /* Indentation */
         for( c = node; c->parent; c = c->parent )