diff options
author | Shivani Bhardwaj <shivanib134@gmail.com> | 2016-11-07 18:15:17 +0530 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-11-10 01:34:19 +0100 |
commit | f59418d6025d36e2a2c299f02570418c36f92b35 (patch) | |
tree | 0370f083e1233210f8be43042745cab2a93ce373 /extensions/libxt_mangle.c | |
parent | a6a4c04c14e07498026765f85f6b45bc5487d0fe (diff) |
extensions: libxt_mangle: Use getaddrinfo()
Replace gethostbyname() with getaddrinfo() as getaddrinfo()
deprecates the former and allows programs to eliminate
IPv4-versus-IPv6 dependencies.
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'extensions/libxt_mangle.c')
-rw-r--r-- | extensions/libxt_mangle.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/extensions/libxt_mangle.c b/extensions/libxt_mangle.c index 4b20feb3..360742b6 100644 --- a/extensions/libxt_mangle.c +++ b/extensions/libxt_mangle.c @@ -74,22 +74,30 @@ static void inaddrcpy(struct in_addr *dst, struct in_addr *src) static struct in_addr *host_to_addr(const char *name, unsigned int *naddr) { - struct hostent *host; struct in_addr *addr; + struct addrinfo hints; + struct addrinfo *res, *p; + int err; unsigned int i; - *naddr = 0; - if ((host = gethostbyname(name)) != NULL) { - if (host->h_addrtype != AF_INET || - host->h_length != sizeof(struct in_addr)) - return (struct in_addr *) NULL; + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_CANONNAME; + hints.ai_family = AF_INET; + hints.ai_socktype = SOCK_RAW; - while (host->h_addr_list[*naddr] != (char *) NULL) + *naddr = 0; + err = getaddrinfo(name, NULL, &hints, &res); + if (err != 0) + return NULL; + else { + for (p = res; p != NULL; p = p->ai_next) (*naddr)++; addr = xtables_calloc(*naddr, sizeof(struct in_addr)); - for (i = 0; i < *naddr; i++) - inaddrcpy(&(addr[i]), - (struct in_addr *) host->h_addr_list[i]); + for (i = 0, p = res; p != NULL; p = p->ai_next) + memcpy(&addr[i++], + &((const struct sockaddr_in *)p->ai_addr)->sin_addr, + sizeof(struct in_addr)); + freeaddrinfo(res); return addr; } |