Changeset 7a9d968 for lib/misc.c

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (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 branch 'master' into HEAD

File:

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

lib/misc.c

@@ -1 @@
-/********************************************************************\
+  /********************************************************************\
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
@@ -335 +335 @@
 }
 
-/* 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.