Changeset 2b7d2d1

Timestamp:

2006-05-13T10:42:37Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

309cb9e

Parents:

fc2ee0f

Message:

Fixed GnuTLS support.

Location:

protocols

Files:

• events.h (modified) (1 diff)
• ssl_gnutls.c (modified) (6 diffs)

protocols/events.h

@@ -49 +49 @@
 #define GAIM_ERR_COND   (G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
-#define event_debug( x... ) printf( x )
+// #define event_debug( x... ) printf( x )
+#define event_debug( x... )
 
 G_MODULE_EXPORT void b_main_init();

protocols/ssl_gnutls.c

@@ -48 +48 @@
 };
 
-static void ssl_connected( gpointer data, gint source, b_input_condition cond );
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 
 
@@ -81 +81 @@
 }
 
-static void ssl_handshake( gpointer data, gint source, b_input_condition cond );
-
-static void ssl_connected( gpointer data, gint source, b_input_condition cond )
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
+
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct scd *conn = data;
@@ -96 +96 @@
                 g_free( conn );
                 
-                return;
+                return FALSE;
         }
         
@@ -102 +102 @@
         gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) conn->fd );
         
-        ssl_handshake( data, source, cond );
-}
-
-static void ssl_handshake( gpointer data, gint source, b_input_condition cond )
+        return ssl_handshake( data, source, cond );
+}
+
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond )
 {
         struct scd *conn = data;
         int st;
         
-        if( conn->inpa != -1 )
-        {
-                gaim_input_remove( conn->inpa );
-                conn->inpa = -1;
-        }
-        
         if( ( st = gnutls_handshake( conn->session ) ) < 0 )
         {
                 if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 {
-                        conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ),
-                                                     ssl_handshake, data );
+                        conn->inpa = b_input_add( conn->fd, ssl_getdirection( conn ),
+                                                  ssl_handshake, data );
                 }
                 else
@@ -142 +136 @@
                 conn->func( conn->data, conn, cond );
         }
+        
+        return FALSE;
 }
 
@@ -187 +183 @@
         
         if( conn->inpa != -1 )
-                gaim_input_remove( conn->inpa );
+                b_event_remove( conn->inpa );
         
         if( conn->established )