Changeset 9b67285

Timestamp:

2012-12-24T19:17:37Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c1d9c95

Parents:

def3650

Message:

SSL session caching. You'd think that this makes Twitter stuff faster, except
Twitter webservers seem to do successful session resumes only sporadically.

File:

• lib/ssl_gnutls.c (modified) (7 diffs)

lib/ssl_gnutls.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2011 Wilmer van der Gaast and others                *
+  * Copyright 2002-2012 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -63 +63 @@
 };
 
+static GHashTable *session_cache;
+
 static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 static gboolean ssl_starttls_real( gpointer data, gint source, b_input_condition cond );
@@ -97 +99 @@
         */
         
+        session_cache = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, g_free );
+        
         atexit( ssl_deinit );
 }
@@ -104 +108 @@
         gnutls_global_deinit();
         gnutls_certificate_free_credentials( xcred );
+        g_hash_table_destroy( session_cache );
+        session_cache = NULL;
 }
 
@@ -220 +226 @@
 
         return verifyret;
+}
+
+struct ssl_session
+{
+        size_t size;
+        char data[];
+};
+
+static void ssl_cache_add( struct scd *conn )
+{
+        size_t data_size;
+        struct ssl_session *data;
+        char *hostname;
+        
+        if( !conn->hostname || 
+            gnutls_session_get_data( conn->session, NULL, &data_size ) != 0 )
+                return;
+        
+        data = g_malloc( sizeof( struct ssl_session ) + data_size );
+        if( gnutls_session_get_data( conn->session, data->data, &data->size ) != 0 )
+        {
+                g_free( data );
+                return;
+        }
+        
+        hostname = g_strdup( conn->hostname );
+        g_hash_table_insert( session_cache, hostname, data );
+}
+
+static void ssl_cache_resume( struct scd *conn )
+{
+        struct ssl_session *data;
+        
+        if( conn->hostname &&
+            ( data = g_hash_table_lookup( session_cache, conn->hostname ) ) )
+        {
+                gnutls_session_set_data( conn->session, data->data, data->size );
+                g_hash_table_remove( session_cache, conn->hostname );
+        }
 }
 
@@ -280 +325 @@
         gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr_t) GNUTLS_STUPID_CAST conn->fd );
         
+        ssl_cache_resume( conn );
+        
         return ssl_handshake( data, source, cond );
 }
@@ -320 +367 @@
                         /* For now we can't handle non-blocking perfectly everywhere... */
                         sock_make_blocking( conn->fd );
-                
+                        
+                        ssl_cache_add( conn );
                         conn->established = TRUE;
                         conn->func( conn->data, 0, conn, cond );