aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2017-04-03 21:57:11 +0100
committerWilmer van der Gaast <github@wilmer.gaast.net>2017-04-06 21:25:08 +0100
commit0156c4220b58515294d7689ea69da8c215a33bdb (patch)
treecff274f11e0291718233ef4cbf95d737f33c5489
parentd179fd900a89a41c8cf95a0f61caef4ec7c6c09e (diff)
Remove ip6_*wrap() functions which are no longer needed.
-rw-r--r--lib/misc.c45
-rw-r--r--lib/misc.h3
2 files changed, 0 insertions, 48 deletions
diff --git a/lib/misc.c b/lib/misc.c
index d79471c0..21f3ad2e 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -334,51 +334,6 @@ char *strip_newlines(char *source)
return source;
}
-/* 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.
from_cs, to_cs: Source and destination charsets
diff --git a/lib/misc.h b/lib/misc.h
index 953abc25..ece4bbff 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -130,9 +130,6 @@ G_MODULE_EXPORT char *escape_html(const char *html);
G_MODULE_EXPORT void http_decode(char *s);
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);
G_MODULE_EXPORT void random_bytes(unsigned char *buf, int count);