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

File:

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

protocols/ssl_gnutls.c

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