Changes in protocols/ssl_openssl.c [19ac9c5:26fdfc5]

File:

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

protocols/ssl_openssl.c

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