Changes in protocols/ssl_gnutls.c [701acdd4:a03a9f3]

File:

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

protocols/ssl_gnutls.c

@@ -38 +38 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
@@ -51 +51 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );
@@ -111 +111 @@
         
         if( conn->inpa != -1 )
+        {
                 gaim_input_remove( conn->inpa );
+                conn->inpa = -1;
+        }
         
         if( ( st = gnutls_handshake( conn->session ) ) < 0 )
@@ -117 +120 @@
                 if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 {
-                        conn->inpa = gaim_input_add( conn->fd,
-                                                     gnutls_record_get_direction( conn->session ) ?
-                                                         GAIM_INPUT_WRITE : GAIM_INPUT_READ,
+                        conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ),
                                                      ssl_handshake, data );
                 }
@@ -145 +146 @@
 int ssl_read( void *conn, char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
         {
@@ -151 +154 @@
         }
         
-        return( gnutls_record_recv( ((struct scd*)conn)->session, buf, len ) );
-        
+        st = gnutls_record_recv( ((struct scd*)conn)->session, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
+                ssl_errno = SSL_AGAIN;
+        
+        return st;
 }
 
 int ssl_write( void *conn, const char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
         {
@@ -163 +173 @@
         }
         
-        return( gnutls_record_send( ((struct scd*)conn)->session, buf, len ) );
+        st = gnutls_record_send( ((struct scd*)conn)->session, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
+                ssl_errno = SSL_AGAIN;
+        
+        return st;
 }
 
@@ -169 +185 @@
 {
         struct scd *conn = conn_;
+        
+        if( conn->inpa != -1 )
+                gaim_input_remove( conn->inpa );
         
         if( conn->established )
@@ -184 +203 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        return( gnutls_record_get_direction( ((struct scd*)conn)->session ) ?
+                GAIM_INPUT_WRITE : GAIM_INPUT_READ );
+}