matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix dotted quad for bit order 

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
This commit is contained in:
Stephen Hemminger 2007-12-11 10:03:28 -08:00
parent 5a0d1cbf69
commit 4b270b172a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/utils.c
View File

@ -47,7 +47,7 @@ int get_integer(int *val, const char *arg, int base)
return 0; return 0;
} }
/* a valid netmask must be 2^n - 1 (n = 1..31) */ /* a valid netmask must be 2^n - 1 */
static int is_valid_netmask(const inet_prefix *addr) static int is_valid_netmask(const inet_prefix *addr)
{ {
uint32_t host; uint32_t host;
@ -60,6 +60,17 @@ static int is_valid_netmask(const inet_prefix *addr)
return (host & (host + 1)) == 0; return (host & (host + 1)) == 0;
} }
static unsigned cidr(const inet_prefix *addr)
{
unsigned bits = 0;
u_int32_t mask;
for (mask = ntohl(addr->data[0]); mask; mask <<= 1)
++bits;
return bits;
}
static int get_netmask(unsigned *val, const char *arg, int base) static int get_netmask(unsigned *val, const char *arg, int base)
{ {
inet_prefix addr; inet_prefix addr;
@ -69,14 +80,10 @@ static int get_netmask(unsigned *val, const char *arg, int base)
/* try coverting dotted quad to CIDR */ /* try coverting dotted quad to CIDR */
if (!get_addr_1(&addr, arg, AF_INET)) { if (!get_addr_1(&addr, arg, AF_INET)) {
u_int32_t mask;
*val=0;
for (mask = addr.data[0]; mask; mask >>= 1)
(*val)++;
if (is_valid_netmask(&addr)) if (is_valid_netmask(&addr))
return 0; return 0;
*val = cidr(&addr);
} }
return -1; return -1;