d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement slash/CIDR notation for IPv4 and IPv6 addresses.

Browse Source 
MFC after: 1 week

Reviewed by:	phk
Obtained from:	NetBSD
This commit is contained in:
jesper 2001-05-04 18:45:36 +00:00
parent 389d1c1b27
commit 814b5baeb7
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sbin/ifconfig/ifconfig.c
View File

@ -1292,6 +1292,26 @@ in_getaddr(s, which)
if (which != MASK) if (which != MASK)
sin->sin_family = AF_INET; sin->sin_family = AF_INET;
if (which == ADDR) {
char *p = NULL;
if((p = strrchr(s, '/')) != NULL) {
/* address is `name/masklen' */
int masklen;
int ret;
struct sockaddr_in *min = sintab[MASK];
*p = '\0';
ret = sscanf(p+1, "%u", &masklen);
if(ret != 1 || (masklen < 0 || masklen > 32)) {
*p = '/';
errx(1, "%s: bad value", s);
}
min->sin_len = sizeof(*min);
min->sin_addr.s_addr = htonl(~((1LL << (32 - masklen)) - 1) &
0xffffffff);
}
}
if (inet_aton(s, &sin->sin_addr)) if (inet_aton(s, &sin->sin_addr))
return; return;
if ((hp = gethostbyname(s)) != 0) if ((hp = gethostbyname(s)) != 0)
@ -1324,6 +1344,15 @@ in6_getaddr(s, which)
if (which != MASK) if (which != MASK)
sin->sin6_family = AF_INET6; sin->sin6_family = AF_INET6;
if (which == ADDR) {
char *p = NULL;
if((p = strrchr(s, '/')) != NULL) {
*p = '\0';
in6_getprefix(p + 1, MASK);
explicit_prefix = 1;
}
}
if (sin->sin6_family == AF_INET6) { if (sin->sin6_family == AF_INET6) {
bzero(&hints, sizeof(struct addrinfo)); bzero(&hints, sizeof(struct addrinfo));
hints.ai_family = AF_INET6; hints.ai_family = AF_INET6;