Re: [libvirt] [PATCH 1/2] util: add wrapper function to check if address string is an ip

On Tue, Aug 10, 2010 at 07:42:49PM +1000, Justin Clift wrote: Hum ... I think that it's better to allow virSocketParseAddr() to take a NULL Addr pointer it's very simple, I'm attaching the patch and then virIsNumericIPAddr(foo) can be replaced by virSocketParseAddr(foo, NULL, 0) it also has the extensibility of being able to cope with IPv4 or IPv6 only if one need, just by adjusting the hint. Am I right ? I see you do more initializations on hints.ai_family but the memset means the two functions are just the same for ai_socktype and ai_protocol,

diff --git a/src/util/network.c b/src/util/network.c index 6e24792..b17d419 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -56,7 +56,7 @@ static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) { /** * virSocketParseAddr: * @val: a numeric network address IPv4 or IPv6 - * @addr: where to store the return value. + * @addr: where to store the return value, optional. * @hint: optional hint to pass down to getaddrinfo * * Mostly a wrapper for getaddrinfo() extracting the address storage @@ -70,7 +70,7 @@ virSocketParseAddr(const char *val, virSocketAddrPtr addr, int hint) { struct addrinfo hints; struct addrinfo *res = NULL; - if ((val == NULL) || (addr == NULL)) + if (val == NULL) return(-1); memset(&hints, 0, sizeof(hints)); @@ -80,7 +80,8 @@ virSocketParseAddr(const char *val, virSocketAddrPtr addr, int hint) { } len = res->ai_addrlen; - memcpy(&addr->stor, res->ai_addr, len); + if (addr != NULL) + memcpy(&addr->stor, res->ai_addr, len); freeaddrinfo(res); return(len);