Changeset 8a9afe4

Timestamp:

2005-12-17T16:54:12Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

52b3a99

Parents:

3d64e5b (diff), dd9a51b (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:

http_client lib

Files:

• Makefile (modified) (1 diff)
• protocols/Makefile (modified) (1 diff)
• protocols/http_client.c (added)
• protocols/http_client.h (added)
• protocols/proxy.c (modified) (1 diff)
• protocols/ssl_client.h (modified) (1 diff)
• protocols/ssl_gnutls.c (modified) (5 diffs)
• sock.h (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o storage_text.o storage.o
+objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o storage.o storage_text.o unix.o url.o user.o
 subdirs = protocols
 

protocols/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = md5.o nogaim.o proxy.o sha.o util.o $(SSL_CLIENT)
+objects = http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT) util.o
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))

protocols/proxy.c

@@ -106 +106 @@
         if (condition & GAIM_WRITE_COND)
                 gaim_cond |= GAIM_INPUT_WRITE;
-//      if (condition & GAIM_ERR_COND)
-//              fprintf( stderr, "ERROR! fd=%d\n", g_io_channel_unix_get_fd( source ) );
 
         closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);

protocols/ssl_client.h

@@ -40 +40 @@
 G_MODULE_EXPORT void ssl_disconnect( void *conn_ );
 G_MODULE_EXPORT int ssl_getfd( void *conn );
+G_MODULE_EXPORT GaimInputCondition ssl_getdirection( void *conn );

protocols/ssl_gnutls.c

@@ -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 );
+}

sock.h

@@ +1 @@
+#include <errno.h>
+#include <fcntl.h>
+
 #ifndef _WIN32
 #include <unistd.h>