Changeset e9b755e for lib

Timestamp:

2007-10-18T16:44:25Z (17 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

7435ccf

Parents:

c511365

Message:

Use standard functions for dealing with both IPv6 and IPv4.

Location:

lib

Files:

• misc.c (modified) (1 diff)
• misc.h (modified) (1 diff)

lib/misc.c

@@ -322 +322 @@
 }
 
-#ifdef IPV6
-/* 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 );
-}
-#endif
-
 /* Convert from one charset to another.
    

lib/misc.h

@@ -52 +52 @@
 G_MODULE_EXPORT void http_encode( char *s );
 
-G_MODULE_EXPORT char *ipv6_wrap( char *src );
-G_MODULE_EXPORT char *ipv6_unwrap( char *src );
-
 G_MODULE_EXPORT signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf );