diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2017-05-30 09:56:26 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-06-06 17:37:43 +0200 |
| commit | ef410bf00a5b1e36dada75127dd525cd377a4756 (patch) | |
| tree | 7b0d10a23b063ccf1700932917bead6bd2e5b3c0 /src/conntrack.c | |
| parent | 3d9849649ec617b45a57a50c93244c13ea8244e0 (diff) | |
conntrackd: remove use of HAVE_INET_PTON_IPV6
The goal of this patch is to fix the ipv6 support when conntrackd is
cross-compiled. The AC_RUN_IFELSE macro must be avoided as much as possible.
See section 6.6 of the gnu autoconf:
"If you really need to test for a runtime behavior while configuring, you can
write a test program to determine the result, and compile and run it using
AC_RUN_IFELSE. Avoid running test programs if possible, because this prevents
people from configuring your package for cross-compiling."
Let's remove this check and test the returned error to handle the case where
ipv6 is not supported (inet_pton() returns -1 when the family is not supported).
Reported-by: Zhenlin Zhang <zhenlin.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/conntrack.c')
| -rw-r--r-- | src/conntrack.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/conntrack.c b/src/conntrack.c index 57dbed7..8d19cca 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -1057,10 +1057,8 @@ parse_inetaddr(const char *cp, struct addr_parse *parse) { if (inet_aton(cp, &parse->addr)) return AF_INET; -#ifdef HAVE_INET_PTON_IPV6 else if (inet_pton(AF_INET6, cp, &parse->addr6) > 0) return AF_INET6; -#endif return AF_UNSPEC; } |