Changes in lib/misc.c [e9b755e:eded1f7]

File:

• lib/misc.c (modified) (3 diffs)

lib/misc.c

@@ -44 +44 @@
 #include <resolv.h>
 #endif
+
+#include "ssl_client.h"
 
 void strip_linefeed(gchar *text)
@@ -322 +324 @@
 }
 
+/* Wrap an IPv4 address into IPv6 space. Not thread-safe... */
+char *ipv6_wrap( char *src )
+{
+        static char dst[64];
+        int i;
+        
+        for( i = 0; src[i]; i ++ )
+                if( ( src[i] < '0' || src[i] > '9' ) && src[i] != '.' )
+                        break;
+        
+        /* Hmm, it's not even an IP... */
+        if( src[i] )
+                return src;
+        
+        g_snprintf( dst, sizeof( dst ), "::ffff:%s", src );
+        
+        return dst;
+}
+
+/* Unwrap an IPv4 address into IPv6 space. Thread-safe, because it's very simple. :-) */
+char *ipv6_unwrap( char *src )
+{
+        int i;
+        
+        if( g_strncasecmp( src, "::ffff:", 7 ) != 0 )
+                return src;
+        
+        for( i = 7; src[i]; i ++ )
+                if( ( src[i] < '0' || src[i] > '9' ) && src[i] != '.' )
+                        break;
+        
+        /* Hmm, it's not even an IP... */
+        if( src[i] )
+                return src;
+        
+        return ( src + 7 );
+}
+
 /* Convert from one charset to another.
    
@@ -553 +593 @@
         return g_string_free( ret, FALSE );
 }
+
+gboolean ssl_sockerr_again( void *ssl )
+{
+        if( ssl )
+                return ssl_errno == SSL_AGAIN;
+        else
+                return sockerr_again();
+}