Changeset 643dfc4 for protocols

Timestamp:

2005-12-17T01:25:58Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

e3fb678

Parents:

4146a07 (diff), 32c632f (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:

Merge integration

Location:

protocols

Files:

• nogaim.c (modified) (2 diffs)
• oscar/conn.c (modified) (1 diff)
• proxy.c (modified) (4 diffs)
• ssl_bogus.c (modified) (1 diff)
• ssl_client.h (modified) (1 diff)
• ssl_gnutls.c (modified) (8 diffs)
• ssl_nss.c (modified) (1 diff)
• ssl_openssl.c (modified) (1 diff)

protocols/nogaim.c

@@ -82 +82 @@
         GError *error = NULL;
 
-        dir = g_dir_open(PLUGINDIR, 0, &error);
+        dir = g_dir_open(global.conf->plugindir, 0, &error);
 
         if (dir) {
@@ -89 +89 @@
 
                 while ((entry = g_dir_read_name(dir))) {
-                        path = g_build_filename(PLUGINDIR, entry, NULL);
+                        path = g_build_filename(global.conf->plugindir, entry, NULL);
                         if(!path) {
                                 log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);

protocols/oscar/conn.c

@@ -627 +627 @@
         }
 
-#ifndef _WIN32
-        fcntl(conn->fd, F_SETFL, 0); /* XXX should restore original flags */
-#endif
+        sock_make_blocking(conn->fd);
 
         conn->status &= ~AIM_CONN_STATUS_INPROGRESS;

protocols/proxy.c

@@ -133 +133 @@
                 return;
         }
-        fcntl(source, F_SETFL, 0);
 #endif
+        sock_make_blocking(source);
         gaim_input_remove(phb->inpa);
         if( phb->proxy_func )
@@ -229 +229 @@
                 return;
         }
-#ifdef F_SETFL
-        fcntl(source, F_SETFL, 0);
-#endif
+        sock_make_blocking(source);
 
         g_snprintf(cmd, sizeof(cmd), "CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\n", phb->host, phb->port,
@@ -322 +320 @@
                 return;
         }
-#ifdef F_SETFL
-        fcntl(source, F_SETFL, 0);
-#endif
+        sock_make_blocking(source);
 
         /* XXX does socks4 not support host name lookups by the proxy? */
@@ -509 +505 @@
                 return;
         }
-#ifdef F_SETFL
-        fcntl(source, F_SETFL, 0);
-#endif
+        sock_make_blocking(source);
 
         i = 0;

protocols/ssl_bogus.c

@@ -26 +26 @@
 #include "ssl_client.h"
 
+int ssl_errno;
+
 void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
 {

protocols/ssl_client.h

@@ -27 +27 @@
 #include "proxy.h"
 
+#define SSL_OK            0
+#define SSL_NOHANDSHAKE   1
+#define SSL_AGAIN         2
+
+extern int ssl_errno;
+
 typedef void (*SslInputFunction)(gpointer, void*, GaimInputCondition);
 

protocols/ssl_gnutls.c

@@ -25 +25 @@
 
 #include <gnutls/gnutls.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include "proxy.h"
 #include "ssl_client.h"
 #include "sock.h"
 #include "stdlib.h"
+
+int ssl_errno = 0;
 
 static gboolean initialized = FALSE;
@@ -38 +42 @@
         int fd;
         gboolean established;
+        int inpa;
         
         gnutls_session session;
@@ -44 +49 @@
 
 static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
-
 
 
@@ -54 +58 @@
         conn->func = func;
         conn->data = data;
+        conn->inpa = -1;
         
         if( conn->fd < 0 )
@@ -76 +81 @@
 }
 
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
+
 static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
 {
@@ -81 +88 @@
         
         if( source == -1 )
-                goto ssl_connected_failure;
+        {
+                conn->func( conn->data, NULL, cond );
+                
+                gnutls_deinit( conn->session );
+                gnutls_certificate_free_credentials( conn->xcred );
+                
+                g_free( conn );
+                
+                return;
+        }
         
+        sock_make_nonblocking( conn->fd );
         gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) conn->fd );
         
-        if( gnutls_handshake( conn->session ) < 0 )
-                goto ssl_connected_failure;
+        ssl_handshake( data, source, cond );
+}
+
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond )
+{
+        struct scd *conn = data;
+        int st;
         
-        conn->established = TRUE;
-        conn->func( conn->data, conn, cond );
-        return;
+        if( conn->inpa != -1 )
+                gaim_input_remove( conn->inpa );
         
-ssl_connected_failure:
-        conn->func( conn->data, NULL, cond );
-        
-        gnutls_deinit( conn->session );
-        gnutls_certificate_free_credentials( conn->xcred );
-        if( source >= 0 ) closesocket( source );
-        g_free( conn );
+        if( ( st = gnutls_handshake( conn->session ) ) < 0 )
+        {
+                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,
+                                                     ssl_handshake, data );
+                }
+                else
+                {
+                        conn->func( conn->data, NULL, cond );
+                        
+                        gnutls_deinit( conn->session );
+                        gnutls_certificate_free_credentials( conn->xcred );
+                        closesocket( conn->fd );
+                        
+                        g_free( conn );
+                }
+        }
+        else
+        {
+                /* For now we can't handle non-blocking perfectly everywhere... */
+                sock_make_blocking( conn->fd );
+                
+                conn->established = TRUE;
+                conn->func( conn->data, conn, cond );
+        }
 }
 
@@ -104 +146 @@
 {
         if( !((struct scd*)conn)->established )
-                return( 0 );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return( -1 );
+        }
         
         return( gnutls_record_recv( ((struct scd*)conn)->session, buf, len ) );
+        
 }
 
@@ -112 +158 @@
 {
         if( !((struct scd*)conn)->established )
-                return( 0 );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return( -1 );
+        }
         
         return( gnutls_record_send( ((struct scd*)conn)->session, buf, len ) );

protocols/ssl_nss.c

@@ -38 +38 @@
 #include <secerr.h>
 #include <sslerr.h>
+
+int ssl_errno = 0;
 
 static gboolean initialized = FALSE;

protocols/ssl_openssl.c

@@ -34 +34 @@
 #include "ssl_client.h"
 #include "sock.h"
+
+int ssl_errno = 0;
 
 static gboolean initialized = FALSE;