diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-03-16 12:11:07 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-03-29 16:41:32 +0100 |
| commit | cccfff9309743f173c504dd265fae173caa5b47f (patch) | |
| tree | 520905377bd24962de63a6d581e3fa5037b96430 /extensions | |
| parent | d797d0ff0338d2938d18b03038d6f4455b000579 (diff) | |
libip6t_NETMAP: Use xtables_ip6mask_to_cidr and get rid of libip6tc dependency
This patch changes the NETMAP target extension (IPv6 side) to use
the xtables_ip6mask_to_cidr available in libxtables.
As a side effect, we get rid of the libip6tc dependency.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/GNUmakefile.in | 1 | ||||
| -rw-r--r-- | extensions/libip6t_NETMAP.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index adad4d68..3db69859 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -105,7 +105,6 @@ libxt_state.so: libxt_conntrack.so ${AM_VERBOSE_GEN} ln -fs $< $@ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD -ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la xt_RATEEST_LIBADD = -lm xt_statistic_LIBADD = -lm diff --git a/extensions/libip6t_NETMAP.c b/extensions/libip6t_NETMAP.c index d14dece3..a4df70ee 100644 --- a/extensions/libip6t_NETMAP.c +++ b/extensions/libip6t_NETMAP.c @@ -61,7 +61,7 @@ static void NETMAP_print(const void *ip, const struct xt_entry_target *target, printf("%s", xtables_ip6addr_to_numeric(&a)); for (i = 0; i < 4; i++) a.s6_addr32[i] = ~(r->min_addr.ip6[i] ^ r->max_addr.ip6[i]); - bits = ipv6_prefix_length(&a); + bits = xtables_ip6mask_to_cidr(&a); if (bits < 0) printf("/%s", xtables_ip6addr_to_numeric(&a)); else |