Changeset b72caac for protocols/ssl_openssl.c

Timestamp:

2006-06-21T16:34:33Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

59f5c42a

Parents:

3af70b0 (diff), df417ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging libevent branch: Events can now be handles by both glib and libevent.

File:

• protocols/ssl_openssl.c (modified) (9 diffs)

protocols/ssl_openssl.c

@@ -52 +52 @@
 };
 
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
-
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 
 
@@ -95 +94 @@
 }
 
-static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
-
-static void ssl_connected( gpointer data, gint source, GaimInputCondition 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;
@@ -104 +103 @@
                 return ssl_handshake( data, -1, cond );
         
-        /* Make it non-blocking at least during the handshake... */
+        /* We can do at least the handshake with non-blocking I/O */
         sock_make_nonblocking( conn->fd );
         SSL_set_fd( conn->ssl, conn->fd );
@@ -111 +110 @@
 }       
 
-static void ssl_handshake( gpointer data, gint source, GaimInputCondition 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 = SSL_connect( conn->ssl ) ) < 0 )
@@ -128 +121 @@
                         goto ssl_connected_failure;
                 
-                conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ), ssl_handshake, data );
-                return;
+                conn->inpa = b_input_add( conn->fd, ssl_getdirection( conn ), ssl_handshake, data );
+                return FALSE;
         }
         
@@ -135 +128 @@
         sock_make_blocking( conn->fd );         /* For now... */
         conn->func( conn->data, conn, cond );
-        return;
+        return FALSE;
         
 ssl_connected_failure:
@@ -151 +144 @@
         if( source >= 0 ) closesocket( source );
         g_free( conn );
+        
+        return FALSE;
 }
 
@@ -204 +199 @@
         
         if( conn->inpa != -1 )
-                gaim_input_remove( conn->inpa );
+                b_event_remove( conn->inpa );
         
         if( conn->established )
@@ -221 +216 @@
 }
 
-GaimInputCondition ssl_getdirection( void *conn )
+b_input_condition ssl_getdirection( void *conn )
 {
         return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? GAIM_INPUT_WRITE : GAIM_INPUT_READ );