Changeset 0fbd3a6d for lib

Timestamp:

2007-12-19T00:24:32Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

1ba7e8f

Parents:

793cc25 (diff), 2379566 (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:

Now with sending via a proxy. The proxy is automatically discovered from your
jabber server.

Also merged in revs 279..288 from upstream (e.g. PING)

Location:

lib

Files:

• misc.c (modified) (2 diffs)
• misc.h (modified) (1 diff)
• ssl_gnutls.c (modified) (1 diff)

lib/misc.c

@@ -44 +44 @@
 #include <resolv.h>
 #endif
+
+#include "ssl_client.h"
 
 void strip_linefeed(gchar *text)
@@ -591 +593 @@
         return g_string_free( ret, FALSE );
 }
+
+gboolean ssl_sockerr_again( void *ssl )
+{
+        if( ssl )
+                return ssl_errno == SSL_AGAIN;
+        else
+                return sockerr_again();
+}

lib/misc.h

@@ -66 +66 @@
 G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
 
+G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
+
 #endif

lib/ssl_gnutls.c

@@ -223 +223 @@
         closesocket( conn->fd );
         
-        gnutls_deinit( conn->session );
-        gnutls_certificate_free_credentials( conn->xcred );
+        if( conn->session )
+                gnutls_deinit( conn->session );
+        if( conn->xcred )
+                gnutls_certificate_free_credentials( conn->xcred );
         g_free( conn );
 }