Changeset 8a2221a7

Timestamp:

2008-03-23T14:29:19Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dd14ecc

Parents:

851a8c2

Message:

Fixed stalling issue with OpenSSL and Jabber (#368).

Files:

• lib/ssl_client.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (1 diff)
• lib/ssl_nss.c (modified) (1 diff)
• lib/ssl_openssl.c (modified) (2 diffs)
• protocols/jabber/io.c (modified) (1 diff)

lib/ssl_client.h

@@ -60 +60 @@
 G_MODULE_EXPORT int ssl_write( void *conn, const char *buf, int len );
 
+/* See ssl_openssl.c for an explanation. */
+G_MODULE_EXPORT int ssl_pending( void *conn );
+
 /* Abort the SSL connection and disconnect the socket. Do not use close()
    directly, both the SSL library and the peer will be unhappy! */

lib/ssl_gnutls.c

@@ -211 +211 @@
 }
 
+/* See ssl_openssl.c for an explanation. */
+int ssl_pending( void *conn )
+{
+        return 0;
+}
+
 void ssl_disconnect( void *conn_ )
 {

lib/ssl_nss.c

@@ -169 +169 @@
 }
 
+/* See ssl_openssl.c for an explanation. */
+int ssl_pending( void *conn )
+{
+        return 0;
+}
+
 void ssl_disconnect( void *conn_ )
 {

lib/ssl_openssl.c

@@ -62 +62 @@
         
         conn->fd = proxy_connect( host, port, ssl_connected, conn );
+        if( conn->fd < 0 )
+        {
+                g_free( conn );
+                return NULL;
+        }
+        
         conn->func = func;
         conn->data = data;
         conn->inpa = -1;
-        
-        if( conn->fd < 0 )
-        {
-                g_free( conn );
-                return NULL;
-        }
         
         return conn;
@@ -231 +231 @@
 }
 
+/* Only OpenSSL *really* needs this (and well, maybe NSS). See for more info:
+   http://www.gnu.org/software/gnutls/manual/gnutls.html#index-gnutls_005frecord_005fcheck_005fpending-209
+   http://www.openssl.org/docs/ssl/SSL_pending.html
+   
+   Required because OpenSSL empties the TCP buffer completely but doesn't
+   necessarily give us all the unencrypted data.
+   
+   Returns 0 if there's nothing left or if we don't have to care (GnuTLS),
+   1 if there's more data. */
+int ssl_pending( void *conn )
+{
+        return ( ((struct scd*)conn) && ((struct scd*)conn)->established ) ?
+               SSL_pending( ((struct scd*)conn)->ssl ) > 0 : 0;
+}
+
 void ssl_disconnect( void *conn_ )
 {

protocols/jabber/io.c

@@ -241 +241 @@
         }
         
-        /* EAGAIN/etc or a successful read. */
-        return TRUE;
+        if( ssl_pending( jd->ssl ) )
+                /* OpenSSL empties the TCP buffers completely but may keep some
+                   data in its internap buffers. select() won't see that, but
+                   ssl_pending() does. */
+                return jabber_read_callback( data, fd, cond );
+        else
+                return TRUE;
 }