ipvsadm: use strtoul to convert ip addresses from hex
Subsystems (3)
Simon Horman
maintainerPATCH 1/1 ipvsadm: use strtoul to convert ip addresses from hex
The ip addresses that come out of /proc/net/ip_vs_conn as integers are in hex not decimal.
Without this change most IP addresses reported as integers end up being 0.0.0.0.
This change is against the development code ipvsadm-1.25-nl-4 from
http://sixpak.org/vince/google/ipvsadm/ . It is not relevant to ipvsadm-1.24, the current released version.
ipvsadm.c +3 -3
@@ -1212,9 +1212,9 @@ static void print_conn(char *buf, unsigninet_pton (AF_INET , temp2, &vaddr.ip);inet_pton (AF_INET , temp3, &daddr.ip); }else { - caddr.ip = (__u32 )htonl (atoi (temp1)); - vaddr.ip = (__u32 )htonl (atoi (temp2)); - daddr.ip = (__u32 )htonl (atoi (temp3)); + caddr.ip = (__u32 )htonl (strtoul (temp1,NULL ,16 )); + vaddr.ip = (__u32 )htonl (strtoul (temp2,NULL ,16 )); + daddr.ip = (__u32 )htonl (strtoul (temp3,NULL ,16 )); }if (!(cname =addrport_to_anyname (af, &caddr, cport, proto, format)))
Quoted 19 lines · Simon Horman
The ip addresses that come out of
/proc/net/ip_vs_connas integers are in hex not decimal.Without this change most IP addresses reported as integers end up being 0.0.0.0.
This change is against the development code ipvsadm-1.25-nl-4 from
http://sixpak.org/vince/google/ipvsadm/ . It is not relevant to ipvsadm-1.24, the current released version.Signed-off-by Simon Horman <[email protected]>Index:
ipvsadm-1.25-nl-4/ipvsadm.c
===================================================================ipvsadm.c 2008-08-20 15:16:39.000000000 +1000 renamed from ipvsadm.c 2008-08-20 15:16:18.000000000 +1000 +0
-0@@ -1212,9 +1212,9 @@ static void print_conn(char *buf, unsign inet_pton(AF_INET, temp2, &vaddr.ip); inet_pton(AF_INET, temp3, &daddr.ip);
ipvsadm.c 2008-08-20 15:16:39.000000000 +1000 static void print_conn(char *buf, unsign · line 1220
Quoted 10 lines
ipvsadm.c 2008-08-20 15:16:39.000000000 +1000 renamed from ipvsadm.c 2008-08-20 15:16:18.000000000 +1000 +3
-3} else { - caddr.ip = (__u32) htonl(atoi(temp1)); - vaddr.ip = (__u32) htonl(atoi(temp2)); - daddr.ip = (__u32) htonl(atoi(temp3)); + caddr.ip = (__u32) htonl(strtoul(temp1, NULL, 16)); + vaddr.ip = (__u32) htonl(strtoul(temp2, NULL, 16)); + daddr.ip = (__u32) htonl(strtoul(temp3, NULL, 16)); } if (!(cname = addrport_to_anyname(af, &caddr, cport, proto, format)))
Thanks for this fix! I'm sure Vince will release a new version with this once there is sunlight in his timezone :)
Do you think it'll make sense to host the new ipvsadm on linuxvirtualserver.org (marked as experimental, of course) when the Netlink patches go in? This seems more open than hosting it on our private servers...
Julius
Signature · 1 line
Google Switzerland GmbH
Quoted 6 lines · Julius Volz
Quoted 2 lines · Simon Horman
The ip addresses that come out of
/proc/net/ip_vs_connas integers are in hex not decimal.Thanks for this fix! I'm sure Vince will release a new version with this once there is sunlight in his timezone :)
A new version, which also fixes a bug in sorting IPv6 addresses, is up at http://sixpak.org/vince/google/ipvsadm/
Vince
Simon Horman
maintainerQuoted 34 lines · Julius Volz
Quoted 19 lines · Simon Horman
The ip addresses that come out of
/proc/net/ip_vs_connas integers are in hex not decimal.Without this change most IP addresses reported as integers end up being 0.0.0.0.
This change is against the development code ipvsadm-1.25-nl-4 from
http://sixpak.org/vince/google/ipvsadm/ . It is not relevant to ipvsadm-1.24, the current released version.Signed-off-by Simon Horman <[email protected]>Index:
ipvsadm-1.25-nl-4/ipvsadm.c
===================================================================ipvsadm.c 2008-08-20 15:16:39.000000000 +1000 renamed from ipvsadm.c 2008-08-20 15:16:18.000000000 +1000 +0
-0@@ -1212,9 +1212,9 @@ static void print_conn(char *buf, unsign inet_pton(AF_INET, temp2, &vaddr.ip); inet_pton(AF_INET, temp3, &daddr.ip);ipvsadm.c 2008-08-20 15:16:39.000000000 +1000 static void print_conn(char *buf, unsign · line 1220
Quoted 10 lines
ipvsadm.c 2008-08-20 15:16:39.000000000 +1000 renamed from ipvsadm.c 2008-08-20 15:16:18.000000000 +1000 +3
-3} else { - caddr.ip = (__u32) htonl(atoi(temp1)); - vaddr.ip = (__u32) htonl(atoi(temp2)); - daddr.ip = (__u32) htonl(atoi(temp3)); + caddr.ip = (__u32) htonl(strtoul(temp1, NULL, 16)); + vaddr.ip = (__u32) htonl(strtoul(temp2, NULL, 16)); + daddr.ip = (__u32) htonl(strtoul(temp3, NULL, 16)); } if (!(cname = addrport_to_anyname(af, &caddr, cport, proto, format)))Thanks for this fix! I'm sure Vince will release a new version with this once there is sunlight in his timezone :)
Quoted 4 lines
Do you think it'll make sense to host the new ipvsadm on linuxvirtualserver.org (marked as experimental, of course) when the Netlink patches go in? This seems more open than hosting it on our private servers...
I think that either hosting it on linuxvirtualserver.org or kernel.org would be a good idea. Wensong what do you think?
Simon Horman
maintainerQuoted 10 lines · Vince Busam
Quoted 6 lines · Julius Volz
Quoted 2 lines · Simon Horman
The ip addresses that come out of
/proc/net/ip_vs_connas integers are in hex not decimal.Thanks for this fix! I'm sure Vince will release a new version with this once there is sunlight in his timezone :)
A new version, which also fixes a bug in sorting IPv6 addresses, is up at http://sixpak.org/vince/google/ipvsadm/
Thanks. That does fix the 0.0.0.0 problem that I was seeing.