about summary refs log tree commit diff
path: root/src/network/__ipparse.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-06-02 05:00:48 -0400
committerRich Felker <dalias@aerifal.cx>2014-06-02 05:00:48 -0400
commit76f440cff73878a7359e944618a7722dfd23bdec (patch)
tree1792a5a1b2db7e946fcdda1da16e7bb0e1641127 /src/network/__ipparse.c
parent3330198060c7b3165a2fba530ffde5fc6706ecf2 (diff)
downloadmusl-76f440cff73878a7359e944618a7722dfd23bdec.tar.gz
musl-76f440cff73878a7359e944618a7722dfd23bdec.tar.xz
musl-76f440cff73878a7359e944618a7722dfd23bdec.zip
remove cruft from old resolver and numeric ip parsing
the old resolver code used a function __ipparse which contained the
logic for inet_addr and inet_aton, which is needed in getaddrinfo.
this was phased out in the resolver overhaul in favor of directly
using inet_aton and inet_pton as appropriate.

this commit cleans up some stuff that was left behind.
Diffstat (limited to 'src/network/__ipparse.c')
-rw-r--r--src/network/__ipparse.c51
1 files changed, 0 insertions, 51 deletions
diff --git a/src/network/__ipparse.c b/src/network/__ipparse.c
deleted file mode 100644
index 79f3b8cf..00000000
--- a/src/network/__ipparse.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include "__dns.h"
-
-int __ipparse(void *dest, int family, const char *s0)
-{
-	const char *s = s0;
-	unsigned char *d = dest;
-	unsigned long a[16] = { 0 };
-	char *z;
-	int i;
-
-	if (family == AF_INET6) goto not_v4;
-
-	for (i=0; i<4; i++) {
-		a[i] = strtoul(s, &z, 0);
-		if (z==s || (*z && *z != '.') || !isdigit(*s)) {
-			if (family == AF_INET) return -1;
-			goto not_v4;
-		}
-		if (!*z) break;
-		s=z+1;
-	}
-	if (i==4) return -1;
-	switch (i) {
-	case 0:
-		a[1] = a[0] & 0xffffff;
-		a[0] >>= 24;
-	case 1:
-		a[2] = a[1] & 0xffff;
-		a[1] >>= 16;
-	case 2:
-		a[3] = a[2] & 0xff;
-		a[2] >>= 8;
-	}
-	((struct sockaddr_in *)d)->sin_family = AF_INET;
-	d = (void *)&((struct sockaddr_in *)d)->sin_addr;
-	for (i=0; i<4; i++) {
-		if (a[i] > 255) return -1;
-		d[i] = a[i];
-	}
-	return 0;
-
-not_v4:
-	s = s0;
-	((struct sockaddr_in6 *)d)->sin6_family = AF_INET6;
-	return inet_pton(AF_INET6, s, (void *)&((struct sockaddr_in6 *)d)->sin6_addr) <= 0 ? -1 : 0;
-}