narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inet_aton doesn't overwrite the IP address unless it is valid.

pull/1/head
Michael Brown 2005-04-30 13:50:34 +00:00
parent 55ae308821
commit 903ddd9878
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/misc.c
View File

@ -146,9 +146,8 @@ int strcasecmp(const char *a, const char *b)
/************************************************************************** /**************************************************************************
INET_ATON - Convert an ascii x.x.x.x to binary form INET_ATON - Convert an ascii x.x.x.x to binary form
**************************************************************************/ **************************************************************************/
int inet_aton(const char *start, in_addr *i) int inet_aton ( const char *cp, struct in_addr *inp ) {
{ const char *p = cp;
const char *p = start;
const char *digits_start; const char *digits_start;
unsigned long ip = 0; unsigned long ip = 0;
unsigned long val; unsigned long val;
@ -160,8 +159,11 @@ int inet_aton(const char *start, in_addr *i)
if ( ( j < 3 ) && ( *(p++) != '.' ) ) return 0; if ( ( j < 3 ) && ( *(p++) != '.' ) ) return 0;
ip = (ip << 8) | val; ip = (ip << 8) | val;
} }
i->s_addr = htonl(ip); if ( *p == '\0' ) {
return p - start; inp->s_addr = htonl(ip);
return 1;
}
return 0;
} }
unsigned long strtoul(const char *p, const char **endp, int base) unsigned long strtoul(const char *p, const char **endp, int base)