Changes in protocols/jabber/iq.c [4306d8b:2ff2076]

File:

• protocols/jabber/iq.c (modified) (6 diffs)

protocols/jabber/iq.c

@@ -31 +31 @@
 {
         struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *c, *reply = NULL;
         char *type, *s;
@@ -46 +47 @@
         if( strcmp( type, "result" ) == 0 || strcmp( type, "error" ) == 0 )
         {
-                return jabber_cache_handle_packet( ic, node );
+                struct jabber_cache_entry *entry;
+                
+                if( ( s = xt_find_attr( node, "id" ) ) == NULL ||
+                    strncmp( s, jd->cached_id_prefix, strlen( jd->cached_id_prefix ) ) != 0 )
+                {
+                        /* Silently ignore it, without an ID (or a non-cache
+                           ID) we don't know how to handle the packet and we
+                           probably don't have to. */
+                        return XT_HANDLED;
+                }
+                
+                entry = g_hash_table_lookup( jd->node_cache, s );
+                
+                if( entry == NULL )
+                        imcb_log( ic, "WARNING: Received IQ-%s packet with unknown/expired ID %s!", type, s );
+                else if( entry->func )
+                        return entry->func( ic, node, entry->node );
         }
         else if( strcmp( type, "get" ) == 0 )
@@ -87 +104 @@
                                                    XMLNS_CHATSTATES,
                                                    XMLNS_MUC,
+                                                   XMLNS_SI,
+                                                   XMLNS_BYTESTREAMS,
+                                                   XMLNS_FILETRANSFER,
                                                    NULL };
                         const char **f;
@@ -106 +126 @@
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
                         pack = 0;
                 }
@@ -112 +132 @@
         else if( strcmp( type, "set" ) == 0 )
         {
-                if( !( c = xt_find_node( node->children, "query" ) ) ||
+                if(  ( c = xt_find_node( node->children, "si" ) ) &&
+                     ( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_SI ) == 0 ) )
+                {
+                        return jabber_si_handle_request( ic, node, c );
+                } else if( !( c = xt_find_node( node->children, "query" ) ) ||
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
                         imcb_log( ic, "WARNING: Received incomplete IQ-%s packet", type );
                         return XT_HANDLED;
-                }
-                
+                } else if( strcmp( s, XMLNS_ROSTER ) == 0 )
+                {
                 /* This is a roster push. XMPP servers send this when someone
                    was added to (or removed from) the buddy list. AFAIK they're
                    sent even if we added this buddy in our own session. */
-                if( strcmp( s, XMLNS_ROSTER ) == 0 )
-                {
                         int bare_len = strlen( ic->acc->user );
                         
@@ -140 +162 @@
                                 
                                 xt_free_node( reply );
-                                reply = jabber_make_error_packet( node, "not-allowed", "cancel" );
+                                reply = jabber_make_error_packet( node, "not-allowed", "cancel", NULL );
                                 pack = 0;
                         }
-                }
-                else
+                } else if( strcmp( s, XMLNS_BYTESTREAMS ) == 0 )
+                {
+                        /* Bytestream Request (stage 2 of file transfer) */
+                        return jabber_bs_recv_request( ic, node, c );
+                } else
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
                         pack = 0;
                 }