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

1 files changed, 12 insertions, 17 deletions

diff --git a/protocols/ssl_openssl.c b/protocols/ssl_openssl.c
index b79088cc..b6f6c520 100644
--- a/protocols/ssl_openssl.c
+++ b/protocols/ssl_openssl.c
@@ -51,8 +51,7 @@ struct scd
 	SSL_CTX *ssl_ctx;
 };
 
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
-
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
@@ -94,47 +93,41 @@ void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data
 	return( conn );
 }
 
-static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
 
-static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
 {
 	struct scd *conn = data;
 	
 	if( source == -1 )
 		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 );
 	
 	return ssl_handshake( data, source, cond );
 }	
 
-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 )
 	{
 		conn->lasterr = SSL_get_error( conn->ssl, st );
 		if( conn->lasterr != SSL_ERROR_WANT_READ && conn->lasterr != SSL_ERROR_WANT_WRITE )
 			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;
 	}
 	
 	conn->established = TRUE;
 	sock_make_blocking( conn->fd );		/* For now... */
 	conn->func( conn->data, conn, cond );
-	return;
+	return FALSE;
 	
 ssl_connected_failure:
 	conn->func( conn->data, NULL, cond );
@@ -150,6 +143,8 @@ ssl_connected_failure:
 	}
 	if( source >= 0 ) closesocket( source );
 	g_free( conn );
+	
+	return FALSE;
 }
 
 int ssl_read( void *conn, char *buf, int len )
@@ -203,7 +198,7 @@ void ssl_disconnect( void *conn_ )
 	struct scd *conn = conn_;
 	
 	if( conn->inpa != -1 )
-		gaim_input_remove( conn->inpa );
+		b_event_remove( conn->inpa );
 	
 	if( conn->established )
 		SSL_shutdown( conn->ssl );
@@ -220,7 +215,7 @@ int ssl_getfd( void *conn )
 	return( ((struct scd*)conn)->fd );
 }
 
-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 );
 }