mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: tools: make url2ipv4 return the exact number of bytes parsed

Browse Source 
The function's return value is currently used as a boolean but we'll
need it to return the number of bytes parsed. Right now it returns
it minus one, unless the last char doesn't match what is permitted.
Let's update this to make it more usable.
This commit is contained in:
Willy Tarreau 2021-03-25 11:34:40 +01:00
parent a9a9e9aac9
commit 12e1027aa6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools.c
View File

@ -1447,7 +1447,9 @@ int str62net(const char *str, struct in6_addr *addr, unsigned char *mask)
/*
* Parse IPv4 address found in url.
* Parse IPv4 address found in url. Return the number of bytes parsed. It
* expects exactly 4 numbers between 0 and 255 delimited by dots, and returns
* zero in case of mismatch.
*/
int url2ipv4(const char *addr, struct in_addr *dst)
{
@ -1460,9 +1462,10 @@ int url2ipv4(const char *addr, struct in_addr *dst)
*(tp = tmp) = 0;
while (*addr) {
unsigned char digit = (ch = *addr++) - '0';
unsigned char digit = (ch = *addr) - '0';
if (digit > 9 && ch != '.')
break;
addr++;
if (digit <= 9) {
u_int new = *tp * 10 + digit;
if (new > 255)
@ -1486,7 +1489,7 @@ int url2ipv4(const char *addr, struct in_addr *dst)
return 0;
memcpy(&dst->s_addr, tmp, 4);
return addr-cp-1;
return addr - cp;
}
/*