Changeset 4306d8b

Timestamp:

2007-12-02T16:43:57Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

911cc4f

Parents:

9ff5737

Message:

Removed retarded printf() (ARGH) and moved the event handling handling of
IQ packets to jabber_util so I can reuse it for certain presence packets.

Location:

protocols/jabber

Files:

• iq.c (modified) (2 diffs)
• jabber.c (modified) (1 diff)
• jabber.h (modified) (1 diff)
• jabber_util.c (modified) (1 diff)

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;
@@ -47 +46 @@
         if( strcmp( type, "result" ) == 0 || strcmp( type, "error" ) == 0 )
         {
-                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 );
+                return jabber_cache_handle_packet( ic, node );
         }
         else if( strcmp( type, "get" ) == 0 )

protocols/jabber/jabber.c

@@ -226 +226 @@
         jd->cached_id_prefix = g_strdup_printf( "%s%s", JABBER_CACHED_ID, s );
         g_free( s );
-        
-        printf( "%s\n", jd->cached_id_prefix );
 }
 

protocols/jabber/jabber.h

@@ -185 +185 @@
 void jabber_cache_entry_free( gpointer entry );
 void jabber_cache_clean( struct im_connection *ic );
+xt_status jabber_cache_handle_packet( struct im_connection *ic, struct xt_node *node );
 const struct jabber_away_state *jabber_away_state_by_code( char *code );
 const struct jabber_away_state *jabber_away_state_by_name( char *name );

protocols/jabber/jabber_util.c

@@ -179 +179 @@
                 return FALSE;
         }
+}
+
+xt_status jabber_cache_handle_packet( struct im_connection *ic, struct xt_node *node )
+{
+        struct jabber_data *jd = ic->proto_data;
+        struct jabber_cache_entry *entry;
+        char *s;
+        
+        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 %s-%s packet with unknown/expired ID %s!",
+                              node->name, xt_find_attr( node, "type" ) ? : "(no type)", s );
+        }
+        else if( entry->func )
+        {
+                return entry->func( ic, node, entry->node );
+        }
+        
+        return XT_HANDLED;
 }