Changeset 038d17f for protocols/jabber/jabber.c

Timestamp:

2006-10-08T16:11:16Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

861c199

Parents:

36e9f62

Message:

Implemented a better node cache using a GLib hash, and preparing to add
event handlers that can be set when sending a packet to handle the reply
to this specific packet. This should allow me to make the iq handler a
lot cleaner.

File:

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

protocols/jabber/jabber.c

@@ -79 +79 @@
         jd->server ++;
         
-        jd->node_cache = xt_new_node( "cache", NULL, NULL );
+        jd->node_cache = g_hash_table_new_full( g_str_hash, g_str_equal, NULL, jabber_cache_entry_free );
         
         /* Figure out the hostname to connect to. */
@@ -125 +125 @@
                 g_free( jd->txq );
         
-        xt_free_node( jd->node_cache );
+        g_hash_table_destroy( jd->node_cache );
+        
         xt_free( jd->xt );
         
@@ -164 +165 @@
         
         return l;
+}
+
+static void jabber_get_info( struct gaim_connection *gc, char *who )
+{
+        struct xt_node *node;
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", "http://jabber.org/protocol/disco#info" );
+        node = jabber_make_packet( "iq", "get", who, node );
+        jabber_cache_add( gc, node );
+        
+        jabber_write_packet( gc, node );
 }
 
@@ -194 +207 @@
 static void jabber_keepalive( struct gaim_connection *gc )
 {
-        struct jabber_data *jd = gc->proto_data;
-        struct xt_node *c, *tmp;
-        
         /* Just any whitespace character is enough as a keepalive for XMPP sessions. */
         jabber_write( gc, "\n", 1 );
         
-        /* Let's abuse this keepalive for garbage collection of the node cache too.
-           It runs every minute, so let's mark every node with a special flag the
-           first time we see it, and clean it up the second time (clean up all
-           packets with the flag set).
-           
-           node->flags is normally only used by xmltree itself for parsing/handling,
-           so it should be safe to use the variable for gc. */
-        
-        /* This horrible loop is explained in xmltree.c. Makes me wonder if maybe I
-           didn't choose the perfect data structure... */
-        for( c = jd->node_cache->children; c; c =  c->next )
-                if( !( c->flags & XT_SEEN ) )
-                        break;
-        
-        /* Now c points at the first unflagged node (or at NULL). Clean up
-           everything until that point. */
-        while( jd->node_cache->children != c )
-        {
-                /*
-                printf( "Cleaning up:\n" );
-                xt_print( jd->node_cache->children );
-                */
-                
-                tmp = jd->node_cache->children->next;
-                xt_free_node( jd->node_cache->children );
-                jd->node_cache->children = tmp;
-        }
-        
-        /* Now flag the ones that were still unflagged. */
-        for( c = jd->node_cache->children; c; c = c->next )
-        {
-                /*
-                printf( "Flagged:\n" );
-                xt_print( c );
-                */
-                
-                c->flags |= XT_SEEN;
-        }
+        /* This runs the garbage collection every minute, which means every packet
+           is in the cache for about a minute (which should be enough AFAIK). */
+        jabber_cache_clean( gc );
 }
 
@@ -253 +228 @@
         ret->set_away = jabber_set_away;
 //      ret->set_info = jabber_set_info;
-//      ret->get_info = jabber_get_info;
+        ret->get_info = jabber_get_info;
         ret->add_buddy = jabber_add_buddy;
         ret->remove_buddy = jabber_remove_buddy;