Changeset a03a9f3 for protocols

Timestamp:

2005-12-18T01:02:29Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

43f205b

Parents:

7c0a497

Message:

Non-blocking I/O for OpenSSL, plus some extra (important) cleanup code for GnuTLS.

Location:

protocols

Files:

• ssl_gnutls.c (modified) (2 diffs)
• ssl_openssl.c (modified) (6 diffs)

protocols/ssl_gnutls.c

@@ -111 +111 @@
         
         if( conn->inpa != -1 )
+        {
                 gaim_input_remove( conn->inpa );
+                conn->inpa = -1;
+        }
         
         if( ( st = gnutls_handshake( conn->session ) ) < 0 )
@@ -183 +186 @@
         struct scd *conn = conn_;
         
+        if( conn->inpa != -1 )
+                gaim_input_remove( conn->inpa );
+        
         if( conn->established )
                 gnutls_bye( conn->session, GNUTLS_SHUT_WR );

protocols/ssl_openssl.c

@@ -46 +46 @@
         gboolean established;
         
+        int inpa;
+        int lasterr;            /* Necessary for SSL_get_error */
         SSL *ssl;
         SSL_CTX *ssl_ctx;
@@ -93 +95 @@
 }
 
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
+
 static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
 {
@@ -98 +102 @@
         
         if( source == -1 )
-                goto ssl_connected_failure;
-        
+                return ssl_handshake( data, -1, cond );
+        
+        /* Make it non-blocking at least during the handshake... */
+        sock_make_nonblocking( conn->fd );
         SSL_set_fd( conn->ssl, conn->fd );
         
-        if( SSL_connect( conn->ssl ) < 0 )
-                goto ssl_connected_failure;
+        return ssl_handshake( data, source, 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 )
+        {
+                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->established = TRUE;
+        sock_make_blocking( conn->fd );         /* For now... */
         conn->func( conn->data, conn, cond );
         return;
@@ -127 +155 @@
 int ssl_read( void *conn, char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
-                return( 0 );
-        
-        return( SSL_read( ((struct scd*)conn)->ssl, buf, len ) );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return -1;
+        }
+        
+        st = SSL_read( ((struct scd*)conn)->ssl, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st <= 0 )
+        {
+                ((struct scd*)conn)->lasterr = SSL_get_error( ((struct scd*)conn)->ssl, st );
+                if( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_READ || ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE )
+                        ssl_errno = SSL_AGAIN;
+        }
+        
+        return st;
 }
 
 int ssl_write( void *conn, const char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
-                return( 0 );
-        
-        return( SSL_write( ((struct scd*)conn)->ssl, buf, len ) );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return -1;
+        }
+        
+        st = SSL_write( ((struct scd*)conn)->ssl, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st <= 0 )
+        {
+                ((struct scd*)conn)->lasterr = SSL_get_error( ((struct scd*)conn)->ssl, st );
+                if( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_READ || ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE )
+                        ssl_errno = SSL_AGAIN;
+        }
+        
+        return st;
 }
 
@@ -144 +202 @@
 {
         struct scd *conn = conn_;
+        
+        if( conn->inpa != -1 )
+                gaim_input_remove( conn->inpa );
         
         if( conn->established )
@@ -159 +220 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? GAIM_INPUT_WRITE : GAIM_INPUT_READ );
+}