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

Use inet_pton to read ipv4 addresses 

Use the standard POSIX inet_pton to convert from string to IPV4
address. This avoids problems where ip parses "127.2" wrong.
This commit is contained in:
Stephen Hemminger 2008-05-22 13:41:40 -07:00
parent 7dfb036665
commit 516ffb6b77
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/utils.c
View File

@ -246,10 +246,6 @@ int get_s8(__s8 *val, const char *arg, int base)
int get_addr_1(inet_prefix *addr, const char *name, int family) int get_addr_1(inet_prefix *addr, const char *name, int family)
{ {
const char *cp;
unsigned char *ap = (unsigned char*)addr->data;
int i;
memset(addr, 0, sizeof(*addr)); memset(addr, 0, sizeof(*addr));
if (strcmp(name, "default") == 0 || if (strcmp(name, "default") == 0 ||
@ -288,17 +284,10 @@ int get_addr_1(inet_prefix *addr, const char *name, int family)
addr->family = AF_INET; addr->family = AF_INET;
if (family != AF_UNSPEC && family != AF_INET) if (family != AF_UNSPEC && family != AF_INET)
return -1; return -1;
if (inet_pton(AF_INET, name, addr->data) <= 0)
return -1;
addr->bytelen = 4; addr->bytelen = 4;
addr->bitlen = -1; addr->bitlen = -1;
for (cp=name, i=0; *cp; cp++) {
if (*cp <= '9' && *cp >= '0') {
ap[i] = 10*ap[i] + (*cp-'0');
continue;
}
if (*cp == '.' && ++i <= 3)
continue;
return -1;
}
return 0; return 0;
} }