diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2008-11-20 10:15:35 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-11-20 10:15:35 +0100 |
commit | 5d9678ad3eabc34ac40dfe055d7f6a8e44445a5a (patch) | |
tree | a5c47ee7391d84ba496646536ba0212af03f688c /extensions | |
parent | 7937e94ed36d2bdb909cc0744fbf229564a55592 (diff) |
src: remove inclusion of iptables.h
iptables.h and ip6tables.h only include declarations internal to
iptables (specifically iptables.c and ip6tables.c), as most of the
public API has been moved to xtables.h a few months ago.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'extensions')
40 files changed, 38 insertions, 38 deletions
diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c index b8064286..92266e49 100644 --- a/extensions/libip6t_HL.c +++ b/extensions/libip6t_HL.c @@ -9,7 +9,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_HL.h> diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c index b75d8063..40a551f4 100644 --- a/extensions/libip6t_LOG.c +++ b/extensions/libip6t_LOG.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <syslog.h> #include <getopt.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_LOG.h> diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c index 9c6fe7aa..0e212021 100644 --- a/extensions/libip6t_REJECT.c +++ b/extensions/libip6t_REJECT.c @@ -9,7 +9,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_REJECT.h> diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c index 9f7cfabf..6a3e7841 100644 --- a/extensions/libip6t_ah.c +++ b/extensions/libip6t_ah.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <getopt.h> #include <errno.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6t_ah.h> static void ah_help(void) diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c index dabca0d6..17e87808 100644 --- a/extensions/libip6t_dst.c +++ b/extensions/libip6t_dst.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <getopt.h> #include <errno.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6t_opts.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/extensions/libip6t_eui64.c b/extensions/libip6t_eui64.c index 4caa66ad..c92c8687 100644 --- a/extensions/libip6t_eui64.c +++ b/extensions/libip6t_eui64.c @@ -9,7 +9,7 @@ #else #include <linux/if_ether.h> #endif -#include <ip6tables.h> +#include <xtables.h> static void eui64_help(void) { diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c index 1a6e3be8..1f8f801d 100644 --- a/extensions/libip6t_frag.c +++ b/extensions/libip6t_frag.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <getopt.h> #include <errno.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6t_frag.h> static void frag_help(void) diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c index e07955f8..ce79af94 100644 --- a/extensions/libip6t_hbh.c +++ b/extensions/libip6t_hbh.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <getopt.h> #include <errno.h> -#include <ip6tables.h> +#include <xtables.h> /*#include <linux/in6.h>*/ #include <linux/netfilter_ipv6/ip6t_opts.h> #include <sys/types.h> diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c index 1046b2ec..f683dc73 100644 --- a/extensions/libip6t_hl.c +++ b/extensions/libip6t_hl.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_hl.h> diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c index 2b3bd684..b87538f9 100644 --- a/extensions/libip6t_icmp6.c +++ b/extensions/libip6t_icmp6.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6_tables.h> struct icmpv6_names { diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c index 63c60bff..e114451d 100644 --- a/extensions/libip6t_ipv6header.c +++ b/extensions/libip6t_ipv6header.c @@ -5,7 +5,7 @@ on whether they contain certain headers */ * Rewritten by: Andras Kis-Szabo <kisza@sch.bme.hu> */ #include <getopt.h> -#include <ip6tables.h> +#include <xtables.h> #include <stddef.h> #include <stdio.h> #include <stdlib.h> diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c index 305fadb6..e76d7c36 100644 --- a/extensions/libip6t_mh.c +++ b/extensions/libip6t_mh.c @@ -16,7 +16,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <ip6tables.h> +#include <xtables.h> #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_mh.h> diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index 92e6d0d8..357cbea1 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -10,8 +10,8 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <xtables.h> #include <ip6tables.h> - #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_policy.h> diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c index 25e410c2..c1f72af8 100644 --- a/extensions/libip6t_rt.c +++ b/extensions/libip6t_rt.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <getopt.h> #include <errno.h> -#include <ip6tables.h> +#include <xtables.h> /*#include <linux/in6.h>*/ #include <linux/netfilter_ipv6/ip6t_rt.h> #include <sys/types.h> diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c index 7e73b9ec..47184965 100644 --- a/extensions/libipt_CLUSTERIP.c +++ b/extensions/libipt_CLUSTERIP.c @@ -15,7 +15,7 @@ #include <linux/if_ether.h> #endif -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_CLUSTERIP.h> diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index da99b7fe..e884b03e 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -4,6 +4,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> +#include <xtables.h> #include <iptables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter/nf_nat.h> diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c index 1336bb9a..e9312f06 100644 --- a/extensions/libipt_ECN.c +++ b/extensions/libipt_ECN.c @@ -13,7 +13,7 @@ #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_ECN.h> diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c index d4f5e46f..668b5654 100644 --- a/extensions/libipt_LOG.c +++ b/extensions/libipt_LOG.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <syslog.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_LOG.h> diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c index ffbff580..1f932949 100644 --- a/extensions/libipt_MASQUERADE.c +++ b/extensions/libipt_MASQUERADE.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter/nf_nat.h> diff --git a/extensions/libipt_MIRROR.c b/extensions/libipt_MIRROR.c index 1322f59e..3a3a85d4 100644 --- a/extensions/libipt_MIRROR.c +++ b/extensions/libipt_MIRROR.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> static void MIRROR_help(void) diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c index 85334bcd..f6c688df 100644 --- a/extensions/libipt_NETMAP.c +++ b/extensions/libipt_NETMAP.c @@ -7,7 +7,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter/nf_nat.h> diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c index 79e47310..64ab737b 100644 --- a/extensions/libipt_REDIRECT.c +++ b/extensions/libipt_REDIRECT.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter/nf_nat.h> diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c index 2aeb6dfe..ef404e67 100644 --- a/extensions/libipt_REJECT.c +++ b/extensions/libipt_REJECT.c @@ -6,7 +6,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_REJECT.h> #include <linux/version.h> diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c index 51507ebd..6cb09afc 100644 --- a/extensions/libipt_SAME.c +++ b/extensions/libipt_SAME.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter/nf_nat.h> /* For 64bit kernel / 32bit userspace */ diff --git a/extensions/libipt_SET.c b/extensions/libipt_SET.c index 7bf3510f..7ec0c31c 100644 --- a/extensions/libipt_SET.c +++ b/extensions/libipt_SET.c @@ -16,7 +16,7 @@ #include <getopt.h> #include <ctype.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ip_set.h> #include <linux/netfilter_ipv4/ipt_set.h> diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index fbd2a80d..8c28c0ee 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -4,6 +4,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> +#include <xtables.h> #include <iptables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter/nf_nat.h> diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c index 7939dac5..7647f2f7 100644 --- a/extensions/libipt_TTL.c +++ b/extensions/libipt_TTL.c @@ -9,7 +9,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_TTL.h> diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c index 8c191d04..d73a3f65 100644 --- a/extensions/libipt_ULOG.c +++ b/extensions/libipt_ULOG.c @@ -15,7 +15,7 @@ #include <stdlib.h> #include <syslog.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> /* For 64bit kernel / 32bit userspace */ #include <linux/netfilter_ipv4/ipt_ULOG.h> diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c index e0de799a..3c83a012 100644 --- a/extensions/libipt_addrtype.c +++ b/extensions/libipt_addrtype.c @@ -6,7 +6,7 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_addrtype.h> diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c index b308053e..5084332a 100644 --- a/extensions/libipt_ah.c +++ b/extensions/libipt_ah.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <getopt.h> #include <errno.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ipt_ah.h> static void ah_help(void) diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c index 30eaec21..72353d5f 100644 --- a/extensions/libipt_ecn.c +++ b/extensions/libipt_ecn.c @@ -12,7 +12,7 @@ #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_ecn.h> diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c index 314a122a..d0b7bb31 100644 --- a/extensions/libipt_icmp.c +++ b/extensions/libipt_icmp.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> /* special hack for icmp-type 'any': diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c index 02686850..9c701820 100644 --- a/extensions/libipt_policy.c +++ b/extensions/libipt_policy.c @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_policy.h> diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c index 38128530..5af2fd41 100644 --- a/extensions/libipt_realm.c +++ b/extensions/libipt_realm.c @@ -11,7 +11,7 @@ #else #include <linux/if_ether.h> #endif -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ipt_realm.h> static void realm_help(void) diff --git a/extensions/libipt_set.c b/extensions/libipt_set.c index 8aa4d1e7..9bdb007d 100644 --- a/extensions/libipt_set.c +++ b/extensions/libipt_set.c @@ -17,7 +17,7 @@ #include <ctype.h> #include <errno.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ipt_set.h> #include "libipt_set.h" diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c index cd93ca0a..055c92ee 100644 --- a/extensions/libipt_ttl.c +++ b/extensions/libipt_ttl.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv4/ipt_ttl.h> diff --git a/extensions/libipt_unclean.c b/extensions/libipt_unclean.c index 50a3ec30..93d9013e 100644 --- a/extensions/libipt_unclean.c +++ b/extensions/libipt_unclean.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <stdlib.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> static void unclean_help(void) { diff --git a/extensions/libxt_TPROXY.c b/extensions/libxt_TPROXY.c index d4b5c0a9..deb214f8 100644 --- a/extensions/libxt_TPROXY.c +++ b/extensions/libxt_TPROXY.c @@ -10,7 +10,6 @@ #include <stdlib.h> #include <limits.h> -#include <iptables.h> #include <xtables.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter/xt_TPROXY.h> diff --git a/extensions/libxt_connlimit.c b/extensions/libxt_connlimit.c index 65de1936..117222a7 100644 --- a/extensions/libxt_connlimit.c +++ b/extensions/libxt_connlimit.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <stddef.h> #include <getopt.h> -#include <iptables.h> +#include <xtables.h> #include <linux/netfilter/xt_connlimit.h> static void connlimit_help(void) diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index c7f80e0d..d5dee7e6 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -15,7 +15,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <iptables.h> #include <xtables.h> #include <linux/netfilter.h> #include <linux/netfilter/xt_conntrack.h> |