jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipv6 parsing code (formerly dummied-out)

Browse source
This commit is contained in:
Rich Felker 2011-04-25 17:04:40 -04:00
commit 34d81974d3
2 changed files with 62 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/network/__ipparse.c
View file

@ -2,11 +2,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h>
#include "__dns.h" #include "__dns.h"
#include <stdio.h> #include <stdio.h>
int __ipparse(void *dest, int family, const char *s) int __ipparse(void *dest, int family, const char *s0)
{ {
const char *s = s0;
unsigned char *d = dest; unsigned char *d = dest;
unsigned long a[16] = { 0 }; unsigned long a[16] = { 0 };
const char *z; const char *z;
@ -37,5 +39,7 @@ int __ipparse(void *dest, int family, const char *s)
return 0; return 0;
not_v4: not_v4:
return -1; 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;
} }

62
src/network/inet_pton.c
View file

@ -4,14 +4,23 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include "__dns.h" #include <string.h>
static int hexval(unsigned c)
{
if (c-'0'<10) return c-'0';
c |= 32;
if (c-'a'<6) return c-'a'+10;
return -1;
}
int inet_pton(int af, const char *s, void *a0) int inet_pton(int af, const char *s, void *a0)
{ {
uint16_t ip[8];
unsigned char *a = a0; unsigned char *a = a0;
const char *z; const char *z;
unsigned long x; unsigned long x;
int i; int i, j, v, d, brk=-1, need_v4=0;
/* Reimplement this because inet_pton cannot accept special v4 forms */ /* Reimplement this because inet_pton cannot accept special v4 forms */
if (af==AF_INET) { if (af==AF_INET) {
@ -22,10 +31,51 @@ int inet_pton(int af, const char *s, void *a0)
s=z+1; s=z+1;
} }
return 1; return 1;
} else if (af==AF_INET6) { } else if (af!=AF_INET6) {
return !__ipparse(a, AF_INET6, s); errno = EAFNOSUPPORT;
return -1;
} }
errno = EAFNOSUPPORT; if (s[0]==':' && s[1]==':') {
return -1; s+=2;
brk=0;
}
for (i=0; ; i++, s+=j+1) {
if (s[0]==':' && brk<0) {
brk=i;
j=0;
ip[i]=0;
if (!s[1]) break;
continue;
}
if (hexval(s[0])<0) return -1;
while (s[0]=='0' && s[1]=='0') s++;
for (v=j=0; j<5 && (d=hexval(s[j]))>=0; j++)
v=16*v+d;
if (v > 65535) return -1;
ip[i] = v;
if (!s[j]) {
if (brk<0 && i!=7) return -1;
break;
}
if (i<7) {
if (s[j]==':') continue;
if (s[j]!='.') return -1;
need_v4=1;
i++;
break;
}
return -1;
}
if (brk>=0) {
memmove(ip+brk+7-i, ip+brk, 2*(i+1-brk));
for (j=0; j<7-i; j++) ip[brk+j] = 0;
}
for (j=0; j<8; j++) {
*a++ = ip[j]>>8;
*a++ = ip[j];
}
if (need_v4 &&inet_pton(AF_INET, (void *)s, a-4) <= 0) return -1;
return 1;
} }