Changeset 7c0a497 for protocols/ssl_gnutls.c

Timestamp:

2005-12-17T20:56:50Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a03a9f3

Parents:

b5a22e3 (diff), ad8b8a3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Moved HTTP-stuff (right now only for passport) into a separate module. This
all works 100% asynchronous and non-blocking, so almost all I/O in BitlBee
should be completely non-blocking now!

Right now support for other modules than GnuTLS is probably broken, I'll fix
it later.

File:

• protocols/ssl_gnutls.c (modified) (7 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 );
@@ -117 +117 @@
                 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 +143 @@
 int ssl_read( void *conn, char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
         {
@@ -151 +151 @@
         }
         
-        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 +170 @@
         }
         
-        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;
 }
 
@@ -184 +197 @@
         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 );
+}