iptables carries a private copy of a number of system headers. These were mostly still being included with angle brackets as though they were in a standard location. Tested configurations of gcc would pick up the private copy in these cases but it has been reported that others do not. By using double quotes, developers are reminded that the code is using a private copy of a system header which may differ from the installed one. Signed-off-by: Duncan Roe <duncan_roe@xxxxxxxxxxxxxxx> --- extensions/dscp_helper.c | 2 +- extensions/libarpt_mangle.c | 4 ++-- extensions/libebt_802_3.c | 4 ++-- extensions/libebt_arp.c | 4 ++-- extensions/libebt_dnat.c | 2 +- extensions/libebt_ip.c | 2 +- extensions/libebt_ip6.c | 2 +- extensions/libebt_limit.c | 2 +- extensions/libebt_log.c | 2 +- extensions/libebt_mark.c | 4 ++-- extensions/libebt_mark_m.c | 4 ++-- extensions/libebt_nflog.c | 2 +- extensions/libebt_pkttype.c | 2 +- extensions/libebt_redirect.c | 2 +- extensions/libebt_snat.c | 2 +- extensions/libebt_vlan.c | 4 ++-- extensions/libip6t_DNAT.c | 8 ++++---- extensions/libip6t_DNPT.c | 6 +++--- extensions/libip6t_HL.c | 4 ++-- extensions/libip6t_LOG.c | 4 ++-- extensions/libip6t_MASQUERADE.c | 6 +++--- extensions/libip6t_NETMAP.c | 6 +++--- extensions/libip6t_REDIRECT.c | 6 +++--- extensions/libip6t_REJECT.c | 4 ++-- extensions/libip6t_SNAT.c | 8 ++++---- extensions/libip6t_SNPT.c | 6 +++--- extensions/libip6t_ah.c | 4 ++-- extensions/libip6t_dst.c | 4 ++-- extensions/libip6t_eui64.c | 2 +- extensions/libip6t_frag.c | 4 ++-- extensions/libip6t_hbh.c | 4 ++-- extensions/libip6t_hl.c | 4 ++-- extensions/libip6t_icmp6.c | 4 ++-- extensions/libip6t_ipv6header.c | 4 ++-- extensions/libip6t_mh.c | 4 ++-- extensions/libip6t_rt.c | 4 ++-- extensions/libip6t_srh.c | 4 ++-- extensions/libipt_CLUSTERIP.c | 4 ++-- extensions/libipt_DNAT.c | 8 ++++---- extensions/libipt_ECN.c | 4 ++-- extensions/libipt_LOG.c | 4 ++-- extensions/libipt_MASQUERADE.c | 6 +++--- extensions/libipt_NETMAP.c | 4 ++-- extensions/libipt_REDIRECT.c | 6 +++--- extensions/libipt_REJECT.c | 4 ++-- extensions/libipt_SNAT.c | 8 ++++---- extensions/libipt_TTL.c | 4 ++-- extensions/libipt_ULOG.c | 4 ++-- extensions/libipt_ah.c | 4 ++-- extensions/libipt_icmp.c | 4 ++-- extensions/libipt_realm.c | 4 ++-- extensions/libipt_ttl.c | 4 ++-- extensions/libxt_AUDIT.c | 4 ++-- extensions/libxt_CHECKSUM.c | 4 ++-- extensions/libxt_CLASSIFY.c | 4 ++-- extensions/libxt_CONNMARK.c | 4 ++-- extensions/libxt_CONNSECMARK.c | 4 ++-- extensions/libxt_CT.c | 6 +++--- extensions/libxt_DSCP.c | 4 ++-- extensions/libxt_HMARK.c | 2 +- extensions/libxt_IDLETIMER.c | 4 ++-- extensions/libxt_LED.c | 4 ++-- extensions/libxt_MARK.c | 4 ++-- extensions/libxt_NFLOG.c | 6 +++--- extensions/libxt_NFQUEUE.c | 4 ++-- extensions/libxt_RATEEST.c | 6 +++--- extensions/libxt_SECMARK.c | 4 ++-- extensions/libxt_SET.c | 4 ++-- extensions/libxt_SYNPROXY.c | 4 ++-- extensions/libxt_TCPMSS.c | 4 ++-- extensions/libxt_TCPOPTSTRIP.c | 4 ++-- extensions/libxt_TEE.c | 8 ++++---- extensions/libxt_TOS.c | 4 ++-- extensions/libxt_TPROXY.c | 4 ++-- extensions/libxt_TRACE.c | 4 ++-- extensions/libxt_addrtype.c | 4 ++-- extensions/libxt_bpf.c | 4 ++-- extensions/libxt_cgroup.c | 4 ++-- extensions/libxt_cluster.c | 4 ++-- extensions/libxt_comment.c | 4 ++-- extensions/libxt_connbytes.c | 4 ++-- extensions/libxt_connlabel.c | 4 ++-- extensions/libxt_connlimit.c | 4 ++-- extensions/libxt_connmark.c | 4 ++-- extensions/libxt_conntrack.c | 8 ++++---- extensions/libxt_cpu.c | 4 ++-- extensions/libxt_dccp.c | 6 +++--- extensions/libxt_devgroup.c | 4 ++-- extensions/libxt_dscp.c | 4 ++-- extensions/libxt_ecn.c | 4 ++-- extensions/libxt_esp.c | 4 ++-- extensions/libxt_hashlimit.c | 6 +++--- extensions/libxt_helper.c | 4 ++-- extensions/libxt_ipcomp.c | 4 ++-- extensions/libxt_iprange.c | 6 +++--- extensions/libxt_ipvs.c | 4 ++-- extensions/libxt_length.c | 4 ++-- extensions/libxt_limit.c | 6 +++--- extensions/libxt_mac.c | 4 ++-- extensions/libxt_mangle.c | 4 ++-- extensions/libxt_mark.c | 4 ++-- extensions/libxt_multiport.c | 8 ++++---- extensions/libxt_nfacct.c | 6 +++--- extensions/libxt_osf.c | 4 ++-- extensions/libxt_owner.c | 4 ++-- extensions/libxt_physdev.c | 4 ++-- extensions/libxt_pkttype.c | 4 ++-- extensions/libxt_policy.c | 4 ++-- extensions/libxt_quota.c | 4 ++-- extensions/libxt_rateest.c | 4 ++-- extensions/libxt_recent.c | 4 ++-- extensions/libxt_rpfilter.c | 4 ++-- extensions/libxt_sctp.c | 4 ++-- extensions/libxt_set.c | 4 ++-- extensions/libxt_socket.c | 4 ++-- extensions/libxt_standard.c | 2 +- extensions/libxt_statistic.c | 4 ++-- extensions/libxt_string.c | 4 ++-- extensions/libxt_tcp.c | 4 ++-- extensions/libxt_tcpmss.c | 4 ++-- extensions/libxt_time.c | 6 +++--- extensions/libxt_tos.c | 4 ++-- extensions/libxt_u32.c | 4 ++-- extensions/libxt_udp.c | 4 ++-- include/ip6tables.h | 4 ++-- include/iptables.h | 4 ++-- include/libipq/libipq.h | 2 +- include/libiptc/libip6tc.h | 8 ++++---- include/libiptc/libiptc.h | 8 ++++---- include/libiptc/libxtc.h | 4 ++-- include/libipulog/libipulog.h | 2 +- include/linux/filter.h | 2 +- include/linux/netfilter.h | 2 +- include/linux/netfilter/ipset/ip_set.h | 2 +- include/linux/netfilter/nf_nat.h | 4 ++-- include/linux/netfilter/nfnetlink.h | 2 +- include/linux/netfilter/x_tables.h | 4 ++-- include/linux/netfilter/xt_AUDIT.h | 2 +- include/linux/netfilter/xt_CHECKSUM.h | 2 +- include/linux/netfilter/xt_CLASSIFY.h | 2 +- include/linux/netfilter/xt_CONNMARK.h | 2 +- include/linux/netfilter/xt_CONNSECMARK.h | 2 +- include/linux/netfilter/xt_CT.h | 2 +- include/linux/netfilter/xt_DSCP.h | 4 ++-- include/linux/netfilter/xt_HMARK.h | 2 +- include/linux/netfilter/xt_IDLETIMER.h | 2 +- include/linux/netfilter/xt_LED.h | 2 +- include/linux/netfilter/xt_MARK.h | 2 +- include/linux/netfilter/xt_NFLOG.h | 2 +- include/linux/netfilter/xt_NFQUEUE.h | 2 +- include/linux/netfilter/xt_RATEEST.h | 2 +- include/linux/netfilter/xt_SECMARK.h | 2 +- include/linux/netfilter/xt_TCPMSS.h | 2 +- include/linux/netfilter/xt_TCPOPTSTRIP.h | 2 +- include/linux/netfilter/xt_TPROXY.h | 2 +- include/linux/netfilter/xt_addrtype.h | 2 +- include/linux/netfilter/xt_bpf.h | 4 ++-- include/linux/netfilter/xt_cgroup.h | 2 +- include/linux/netfilter/xt_cluster.h | 2 +- include/linux/netfilter/xt_connbytes.h | 2 +- include/linux/netfilter/xt_connlabel.h | 2 +- include/linux/netfilter/xt_connlimit.h | 2 +- include/linux/netfilter/xt_connmark.h | 2 +- include/linux/netfilter/xt_conntrack.h | 4 ++-- include/linux/netfilter/xt_cpu.h | 2 +- include/linux/netfilter/xt_dccp.h | 2 +- include/linux/netfilter/xt_devgroup.h | 2 +- include/linux/netfilter/xt_dscp.h | 2 +- include/linux/netfilter/xt_ecn.h | 4 ++-- include/linux/netfilter/xt_esp.h | 2 +- include/linux/netfilter/xt_hashlimit.h | 2 +- include/linux/netfilter/xt_ipcomp.h | 2 +- include/linux/netfilter/xt_iprange.h | 2 +- include/linux/netfilter/xt_ipvs.h | 2 +- include/linux/netfilter/xt_length.h | 2 +- include/linux/netfilter/xt_limit.h | 2 +- include/linux/netfilter/xt_mark.h | 2 +- include/linux/netfilter/xt_multiport.h | 2 +- include/linux/netfilter/xt_nfacct.h | 2 +- include/linux/netfilter/xt_osf.h | 2 +- include/linux/netfilter/xt_owner.h | 2 +- include/linux/netfilter/xt_physdev.h | 2 +- include/linux/netfilter/xt_policy.h | 2 +- include/linux/netfilter/xt_quota.h | 2 +- include/linux/netfilter/xt_rateest.h | 2 +- include/linux/netfilter/xt_realm.h | 2 +- include/linux/netfilter/xt_recent.h | 2 +- include/linux/netfilter/xt_rpfilter.h | 2 +- include/linux/netfilter/xt_sctp.h | 2 +- include/linux/netfilter/xt_set.h | 4 ++-- include/linux/netfilter/xt_socket.h | 2 +- include/linux/netfilter/xt_statistic.h | 2 +- include/linux/netfilter/xt_string.h | 2 +- include/linux/netfilter/xt_tcpmss.h | 2 +- include/linux/netfilter/xt_tcpudp.h | 2 +- include/linux/netfilter/xt_time.h | 2 +- include/linux/netfilter/xt_u32.h | 2 +- include/linux/netfilter_arp.h | 2 +- include/linux/netfilter_arp/arp_tables.h | 6 +++--- include/linux/netfilter_arp/arpt_mangle.h | 2 +- include/linux/netfilter_bridge/ebt_802_3.h | 2 +- include/linux/netfilter_bridge/ebt_ip.h | 2 +- include/linux/netfilter_bridge/ebt_mark_m.h | 2 +- include/linux/netfilter_ipv4.h | 2 +- include/linux/netfilter_ipv4/ip_tables.h | 8 ++++---- include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 2 +- include/linux/netfilter_ipv4/ipt_ECN.h | 4 ++-- include/linux/netfilter_ipv4/ipt_TTL.h | 2 +- include/linux/netfilter_ipv4/ipt_addrtype.h | 2 +- include/linux/netfilter_ipv4/ipt_ah.h | 2 +- include/linux/netfilter_ipv4/ipt_realm.h | 2 +- include/linux/netfilter_ipv4/ipt_ttl.h | 2 +- include/linux/netfilter_ipv6.h | 2 +- include/linux/netfilter_ipv6/ip6_tables.h | 8 ++++---- include/linux/netfilter_ipv6/ip6t_HL.h | 2 +- include/linux/netfilter_ipv6/ip6t_NPT.h | 4 ++-- include/linux/netfilter_ipv6/ip6t_REJECT.h | 2 +- include/linux/netfilter_ipv6/ip6t_ah.h | 2 +- include/linux/netfilter_ipv6/ip6t_frag.h | 2 +- include/linux/netfilter_ipv6/ip6t_hl.h | 2 +- include/linux/netfilter_ipv6/ip6t_ipv6header.h | 2 +- include/linux/netfilter_ipv6/ip6t_mh.h | 2 +- include/linux/netfilter_ipv6/ip6t_opts.h | 2 +- include/linux/netfilter_ipv6/ip6t_rt.h | 2 +- include/linux/netfilter_ipv6/ip6t_srh.h | 4 ++-- include/xtables.h | 6 +++--- iptables/getethertype.c | 2 +- iptables/ip6tables-standalone.c | 2 +- iptables/ip6tables.c | 4 ++-- iptables/iptables-standalone.c | 2 +- iptables/iptables-xml.c | 2 +- iptables/iptables.c | 4 ++-- iptables/nft-arp.c | 8 ++++---- iptables/nft-bridge.c | 8 ++++---- iptables/nft-bridge.h | 6 +++--- iptables/nft-ipv4.c | 4 ++-- iptables/nft-ipv6.c | 4 ++-- iptables/nft-shared.c | 6 +++--- iptables/nft-shared.h | 2 +- iptables/nft.c | 22 +++++++++++----------- iptables/xshared.c | 2 +- iptables/xshared.h | 4 ++-- iptables/xtables-arp-standalone.c | 4 ++-- iptables/xtables-arp.c | 6 +++--- iptables/xtables-config-parser.y | 2 +- iptables/xtables-eb-standalone.c | 4 ++-- iptables/xtables-eb-translate.c | 12 ++++++------ iptables/xtables-eb.c | 12 ++++++------ iptables/xtables-standalone.c | 2 +- iptables/xtables-translate.c | 6 +++--- iptables/xtables.c | 4 ++-- libipq/ipq_create_handle.3 | 2 +- libipq/ipq_errstr.3 | 2 +- libipq/ipq_message_type.3 | 2 +- libipq/ipq_read.3 | 2 +- libipq/ipq_set_mode.3 | 2 +- libipq/ipq_set_verdict.3 | 2 +- libipq/libipq.3 | 4 ++-- libipq/libipq.c | 4 ++-- libiptc/libiptc.c | 4 ++-- libxtables/xtables.c | 10 +++++----- utils/nfnl_osf.c | 6 +++--- 262 files changed, 483 insertions(+), 483 deletions(-) diff --git a/extensions/dscp_helper.c b/extensions/dscp_helper.c index 75b1fec..39111d2 100644 --- a/extensions/dscp_helper.c +++ b/extensions/dscp_helper.c @@ -11,7 +11,7 @@ #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" static const struct ds_class diff --git a/extensions/libarpt_mangle.c b/extensions/libarpt_mangle.c index 0d1f140..ea91e8d 100644 --- a/extensions/libarpt_mangle.c +++ b/extensions/libarpt_mangle.c @@ -10,8 +10,8 @@ #include <limits.h> #include <getopt.h> #include <netinet/ether.h> -#include <xtables.h> -#include <linux/netfilter_arp/arpt_mangle.h> +#include "xtables.h" +#include "linux/netfilter_arp/arpt_mangle.h" #include "iptables/nft.h" #include "iptables/nft-arp.h" diff --git a/extensions/libebt_802_3.c b/extensions/libebt_802_3.c index f05d02e..4b59ad1 100644 --- a/extensions/libebt_802_3.c +++ b/extensions/libebt_802_3.c @@ -14,8 +14,8 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <xtables.h> -#include <linux/netfilter_bridge/ebt_802_3.h> +#include "xtables.h" +#include "linux/netfilter_bridge/ebt_802_3.h" #define _802_3_SAP '1' #define _802_3_TYPE '2' diff --git a/extensions/libebt_arp.c b/extensions/libebt_arp.c index 45fc8d7..7eec922 100644 --- a/extensions/libebt_arp.c +++ b/extensions/libebt_arp.c @@ -11,10 +11,10 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" #include <netinet/ether.h> -#include <ebtables/ethernetdb.h> +#include "ebtables/ethernetdb.h" #include <net/if_arp.h> #include <linux/netfilter_bridge/ebt_arp.h> #include "iptables/nft.h" diff --git a/extensions/libebt_dnat.c b/extensions/libebt_dnat.c index c179d8c..a39eeb5 100644 --- a/extensions/libebt_dnat.c +++ b/extensions/libebt_dnat.c @@ -11,7 +11,7 @@ #include <string.h> #include <getopt.h> #include <netinet/ether.h> -#include <xtables.h> +#include "xtables.h" #include <linux/netfilter_bridge/ebt_nat.h> #include "iptables/nft.h" #include "iptables/nft-bridge.h" diff --git a/extensions/libebt_ip.c b/extensions/libebt_ip.c index 4b5c166..beb1810 100644 --- a/extensions/libebt_ip.c +++ b/extensions/libebt_ip.c @@ -19,7 +19,7 @@ #include <getopt.h> #include <netdb.h> #include <inttypes.h> -#include <xtables.h> +#include "xtables.h" #include "libxt_icmp.h" diff --git a/extensions/libebt_ip6.c b/extensions/libebt_ip6.c index 4c60570..b1e78c2 100644 --- a/extensions/libebt_ip6.c +++ b/extensions/libebt_ip6.c @@ -20,7 +20,7 @@ #include <string.h> #include <getopt.h> #include <netdb.h> -#include <xtables.h> +#include "xtables.h" #include <linux/netfilter_bridge/ebt_ip6.h> #include "libxt_icmp.h" diff --git a/extensions/libebt_limit.c b/extensions/libebt_limit.c index e8da2a1..a0f4883 100644 --- a/extensions/libebt_limit.c +++ b/extensions/libebt_limit.c @@ -16,7 +16,7 @@ #include <string.h> #include <getopt.h> #include <errno.h> -#include <xtables.h> +#include "xtables.h" #include <linux/netfilter_bridge/ebt_limit.h> #include "iptables/nft.h" #include "iptables/nft-bridge.h" diff --git a/extensions/libebt_log.c b/extensions/libebt_log.c index a86bdeb..7720e56 100644 --- a/extensions/libebt_log.c +++ b/extensions/libebt_log.c @@ -15,7 +15,7 @@ #include <syslog.h> #include <string.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" #include <linux/netfilter_bridge/ebt_log.h> #define LOG_DEFAULT_LEVEL LOG_INFO diff --git a/extensions/libebt_mark.c b/extensions/libebt_mark.c index 94f489e..5f0bc55 100644 --- a/extensions/libebt_mark.c +++ b/extensions/libebt_mark.c @@ -13,8 +13,8 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> -#include <xtables.h> -#include <linux/netfilter_bridge/ebt_mark_t.h> +#include "xtables.h" +#include "linux/netfilter_bridge/ebt_mark_t.h" #include "iptables/nft.h" #include "iptables/nft-bridge.h" diff --git a/extensions/libebt_mark_m.c b/extensions/libebt_mark_m.c index 244fe12..8197bb1 100644 --- a/extensions/libebt_mark_m.c +++ b/extensions/libebt_mark_m.c @@ -13,8 +13,8 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> -#include <xtables.h> -#include <linux/netfilter_bridge/ebt_mark_m.h> +#include "xtables.h" +#include "linux/netfilter_bridge/ebt_mark_m.h" #define MARK '1' diff --git a/extensions/libebt_nflog.c b/extensions/libebt_nflog.c index 9801f35..523289b 100644 --- a/extensions/libebt_nflog.c +++ b/extensions/libebt_nflog.c @@ -17,7 +17,7 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" #include "iptables/nft.h" #include "iptables/nft-bridge.h" #include <linux/netfilter_bridge/ebt_nflog.h> diff --git a/extensions/libebt_pkttype.c b/extensions/libebt_pkttype.c index 4e2d19d..1bde631 100644 --- a/extensions/libebt_pkttype.c +++ b/extensions/libebt_pkttype.c @@ -11,7 +11,7 @@ #include <string.h> #include <getopt.h> #include <netdb.h> -#include <xtables.h> +#include "xtables.h" #include <linux/if_packet.h> #include <linux/netfilter_bridge/ebt_pkttype.h> diff --git a/extensions/libebt_redirect.c b/extensions/libebt_redirect.c index a88713d..539d213 100644 --- a/extensions/libebt_redirect.c +++ b/extensions/libebt_redirect.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" #include <linux/netfilter_bridge/ebt_redirect.h> #include "iptables/nft.h" #include "iptables/nft-bridge.h" diff --git a/extensions/libebt_snat.c b/extensions/libebt_snat.c index 95b32f9..058efbb 100644 --- a/extensions/libebt_snat.c +++ b/extensions/libebt_snat.c @@ -11,7 +11,7 @@ #include <string.h> #include <getopt.h> #include <netinet/ether.h> -#include <xtables.h> +#include "xtables.h" #include <linux/netfilter_bridge/ebt_nat.h> #include "iptables/nft.h" #include "iptables/nft-bridge.h" diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c index 4e2ea0f..8ea21b3 100644 --- a/extensions/libebt_vlan.c +++ b/extensions/libebt_vlan.c @@ -11,8 +11,8 @@ #include <string.h> #include <getopt.h> #include <ctype.h> -#include <xtables.h> -#include <ebtables/ethernetdb.h> +#include "xtables.h" +#include "ebtables/ethernetdb.h" #include <linux/netfilter_bridge/ebt_vlan.h> #include <linux/if_ether.h> #include "iptables/nft.h" diff --git a/extensions/libip6t_DNAT.c b/extensions/libip6t_DNAT.c index 89c5ceb..6ec4951 100644 --- a/extensions/libip6t_DNAT.c +++ b/extensions/libip6t_DNAT.c @@ -9,11 +9,11 @@ #include <netdb.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <iptables.h> +#include "xtables.h" +#include "iptables.h" #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_DEST = 0, diff --git a/extensions/libip6t_DNPT.c b/extensions/libip6t_DNPT.c index d045e44..52a6d8f 100644 --- a/extensions/libip6t_DNPT.c +++ b/extensions/libip6t_DNPT.c @@ -4,9 +4,9 @@ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter_ipv6/ip6t_NPT.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "linux/netfilter_ipv6/ip6t_NPT.h" enum { O_SRC_PFX = 1 << 0, diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c index 52ca5d3..50fb321 100644 --- a/extensions/libip6t_HL.c +++ b/extensions/libip6t_HL.c @@ -5,8 +5,8 @@ * This program is distributed under the terms of GNU GPL */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_HL.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_HL.h" enum { O_HL_SET = 0, diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c index 40adc69..9357e94 100644 --- a/extensions/libip6t_LOG.c +++ b/extensions/libip6t_LOG.c @@ -1,8 +1,8 @@ #include <stdio.h> #include <string.h> #include <syslog.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_LOG.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_LOG.h" #ifndef IP6T_LOG_UID /* Old kernel */ #define IP6T_LOG_UID 0x08 diff --git a/extensions/libip6t_MASQUERADE.c b/extensions/libip6t_MASQUERADE.c index f92760f..e974ff9 100644 --- a/extensions/libip6t_MASQUERADE.c +++ b/extensions/libip6t_MASQUERADE.c @@ -10,10 +10,10 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_PORTS = 0, diff --git a/extensions/libip6t_NETMAP.c b/extensions/libip6t_NETMAP.c index 579ed04..66e2810 100644 --- a/extensions/libip6t_NETMAP.c +++ b/extensions/libip6t_NETMAP.c @@ -10,9 +10,9 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <xtables.h> -#include <libiptc/libip6tc.h> -#include <linux/netfilter/nf_nat.h> +#include "xtables.h" +#include "libiptc/libip6tc.h" +#include "linux/netfilter/nf_nat.h" #define MODULENAME "NETMAP" diff --git a/extensions/libip6t_REDIRECT.c b/extensions/libip6t_REDIRECT.c index 8e04d2c..e9293df 100644 --- a/extensions/libip6t_REDIRECT.c +++ b/extensions/libip6t_REDIRECT.c @@ -8,10 +8,10 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_PORTS = 0, diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c index c5b980d..f060bd5 100644 --- a/extensions/libip6t_REJECT.c +++ b/extensions/libip6t_REJECT.c @@ -7,8 +7,8 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_REJECT.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_REJECT.h" struct reject_names { const char *name; diff --git a/extensions/libip6t_SNAT.c b/extensions/libip6t_SNAT.c index 7d74b3d..abec1eb 100644 --- a/extensions/libip6t_SNAT.c +++ b/extensions/libip6t_SNAT.c @@ -9,11 +9,11 @@ #include <netdb.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <iptables.h> +#include "xtables.h" +#include "iptables.h" #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_SRC = 0, diff --git a/extensions/libip6t_SNPT.c b/extensions/libip6t_SNPT.c index 65f787d..2853235 100644 --- a/extensions/libip6t_SNPT.c +++ b/extensions/libip6t_SNPT.c @@ -4,9 +4,9 @@ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter_ipv6/ip6t_NPT.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "linux/netfilter_ipv6/ip6t_NPT.h" enum { O_SRC_PFX = 1 << 0, diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c index f35982f..b4c5baf 100644 --- a/extensions/libip6t_ah.c +++ b/extensions/libip6t_ah.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_ah.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_ah.h" enum { O_AHSPI = 0, diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c index fe7e340..595e8ff 100644 --- a/extensions/libip6t_dst.c +++ b/extensions/libip6t_dst.c @@ -2,8 +2,8 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_opts.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_opts.h" enum { O_DSTLEN = 0, diff --git a/extensions/libip6t_eui64.c b/extensions/libip6t_eui64.c index 607bf86..7f6e29c 100644 --- a/extensions/libip6t_eui64.c +++ b/extensions/libip6t_eui64.c @@ -1,5 +1,5 @@ /* Shared library add-on to ip6tables to add EUI64 address checking support. */ -#include <xtables.h> +#include "xtables.h" static struct xtables_match eui64_mt6_reg = { .name = "eui64", diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c index 3842496..799e7e4 100644 --- a/extensions/libip6t_frag.c +++ b/extensions/libip6t_frag.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_frag.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_frag.h" enum { O_FRAGID = 0, diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c index 76b4ff0..f9a1de9 100644 --- a/extensions/libip6t_hbh.c +++ b/extensions/libip6t_hbh.c @@ -2,8 +2,8 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_opts.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_opts.h" #define DEBUG 0 diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c index 37922f6..3cd25f9 100644 --- a/extensions/libip6t_hl.c +++ b/extensions/libip6t_hl.c @@ -6,8 +6,8 @@ * Cleanups by Stephane Ouellette <ouellettes@xxxxxxxxxxxx> */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_hl.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_hl.h" enum { O_HL_EQ = 0, diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c index 45a7187..c4c8228 100644 --- a/extensions/libip6t_icmp6.c +++ b/extensions/libip6t_icmp6.c @@ -1,9 +1,9 @@ #include <stdint.h> #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip6_tables.h */ -#include <linux/netfilter_ipv6/ip6_tables.h> +#include "linux/netfilter_ipv6/ip6_tables.h" #include <netinet/icmp6.h> #include "libxt_icmp.h" diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c index 6f03087..7e3362b 100644 --- a/extensions/libip6t_ipv6header.c +++ b/extensions/libip6t_ipv6header.c @@ -8,8 +8,8 @@ on whether they contain certain headers */ #include <stdlib.h> #include <string.h> #include <netdb.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_ipv6header.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_ipv6header.h" enum { O_HEADER = 0, diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c index f4c0fd9..3ccd493 100644 --- a/extensions/libip6t_mh.c +++ b/extensions/libip6t_mh.c @@ -15,8 +15,8 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_mh.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_mh.h" enum { O_MH_TYPE = 0, diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c index 3cb3b24..73835fc 100644 --- a/extensions/libip6t_rt.c +++ b/extensions/libip6t_rt.c @@ -1,8 +1,8 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_rt.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_rt.h" #include <arpa/inet.h> enum { diff --git a/extensions/libip6t_srh.c b/extensions/libip6t_srh.c index 94db6f1..1bc42bf 100644 --- a/extensions/libip6t_srh.c +++ b/extensions/libip6t_srh.c @@ -5,8 +5,8 @@ */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv6/ip6t_srh.h> +#include "xtables.h" +#include "linux/netfilter_ipv6/ip6t_srh.h" #include <string.h> /* srh command-line options */ diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c index f4b638b..55175dd 100644 --- a/extensions/libipt_CLUSTERIP.c +++ b/extensions/libipt_CLUSTERIP.c @@ -16,8 +16,8 @@ #include <linux/if_ether.h> #endif -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_CLUSTERIP.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_CLUSTERIP.h" enum { O_NEW = 0, diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index 4907a2e..8d2612c 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -2,11 +2,11 @@ #include <netdb.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <iptables.h> /* get_kernel_version */ +#include "xtables.h" +#include "iptables.h" /* get_kernel_version */ #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_DEST = 0, diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c index ee09f29..825aeae 100644 --- a/extensions/libipt_ECN.c +++ b/extensions/libipt_ECN.c @@ -7,8 +7,8 @@ * libipt_ECN.c borrowed heavily from libipt_DSCP.c */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_ECN.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_ECN.h" enum { O_ECN_TCP_REMOVE = 0, diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c index 36e2e73..cb7e5cd 100644 --- a/extensions/libipt_LOG.c +++ b/extensions/libipt_LOG.c @@ -1,8 +1,8 @@ #include <stdio.h> #include <string.h> #include <syslog.h> -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_LOG.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_LOG.h" #define LOG_DEFAULT_LEVEL LOG_WARNING diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c index 90bf606..49536dc 100644 --- a/extensions/libipt_MASQUERADE.c +++ b/extensions/libipt_MASQUERADE.c @@ -3,10 +3,10 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_PORTS = 0, diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c index f30615a..2e83e48 100644 --- a/extensions/libipt_NETMAP.c +++ b/extensions/libipt_NETMAP.c @@ -6,8 +6,8 @@ #include <string.h> #include <stdlib.h> #include <getopt.h> -#include <xtables.h> -#include <linux/netfilter/nf_nat.h> +#include "xtables.h" +#include "linux/netfilter/nf_nat.h" #define MODULENAME "NETMAP" diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c index 7850306..e93a498 100644 --- a/extensions/libipt_REDIRECT.c +++ b/extensions/libipt_REDIRECT.c @@ -1,10 +1,10 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_PORTS = 0, diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c index ba815ba..2ec13fc 100644 --- a/extensions/libipt_REJECT.c +++ b/extensions/libipt_REJECT.c @@ -4,8 +4,8 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_REJECT.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_REJECT.h" #include <linux/version.h> /* If we are compiling against a kernel that does not support diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index e92d811..316db31 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -2,11 +2,11 @@ #include <netdb.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <iptables.h> +#include "xtables.h" +#include "iptables.h" #include <limits.h> /* INT_MAX in ip_tables.h */ -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter/nf_nat.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter/nf_nat.h" enum { O_TO_SRC = 0, diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c index 0f81280..89503c1 100644 --- a/extensions/libipt_TTL.c +++ b/extensions/libipt_TTL.c @@ -4,8 +4,8 @@ * This program is distributed under the terms of GNU GPL */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_TTL.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_TTL.h" enum { O_TTL_SET = 0, diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c index fafb220..3284096 100644 --- a/extensions/libipt_ULOG.c +++ b/extensions/libipt_ULOG.c @@ -11,9 +11,9 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" /* For 64bit kernel / 32bit userspace */ -#include <linux/netfilter_ipv4/ipt_ULOG.h> +#include "linux/netfilter_ipv4/ipt_ULOG.h" enum { O_ULOG_NLGROUP = 0, diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c index fec5705..50c829a 100644 --- a/extensions/libipt_ah.c +++ b/extensions/libipt_ah.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_ah.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_ah.h" enum { O_AHSPI = 0, diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c index 5418997..2820041 100644 --- a/extensions/libipt_icmp.c +++ b/extensions/libipt_icmp.c @@ -1,9 +1,9 @@ #include <stdint.h> #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip6_tables.h */ -#include <linux/netfilter_ipv4/ip_tables.h> +#include "linux/netfilter_ipv4/ip_tables.h" #include "libxt_icmp.h" diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c index e01d048..5085c81 100644 --- a/extensions/libipt_realm.c +++ b/extensions/libipt_realm.c @@ -7,8 +7,8 @@ #else #include <linux/if_ether.h> #endif -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_realm.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_realm.h" enum { O_REALM = 0, diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c index 6bdd219..fe734c6 100644 --- a/extensions/libipt_ttl.c +++ b/extensions/libipt_ttl.c @@ -3,8 +3,8 @@ * * This program is released under the terms of GNU GPL */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter_ipv4/ipt_ttl.h> +#include "xtables.h" +#include "linux/netfilter_ipv4/ipt_ttl.h" enum { O_TTL_EQ = 0, diff --git a/extensions/libxt_AUDIT.c b/extensions/libxt_AUDIT.c index 86a61cb..350dc1c 100644 --- a/extensions/libxt_AUDIT.c +++ b/extensions/libxt_AUDIT.c @@ -7,8 +7,8 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_AUDIT.h> +#include "xtables.h" +#include "linux/netfilter/xt_AUDIT.h" enum { O_AUDIT_TYPE = 0, diff --git a/extensions/libxt_CHECKSUM.c b/extensions/libxt_CHECKSUM.c index df9f9b3..4aef9bb 100644 --- a/extensions/libxt_CHECKSUM.c +++ b/extensions/libxt_CHECKSUM.c @@ -9,8 +9,8 @@ * libxt_CHECKSUM.c borrowed some bits from libipt_ECN.c */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_CHECKSUM.h> +#include "xtables.h" +#include "linux/netfilter/xt_CHECKSUM.h" enum { O_CHECKSUM_FILL = 0, diff --git a/extensions/libxt_CLASSIFY.c b/extensions/libxt_CLASSIFY.c index ba88f75..53fce66 100644 --- a/extensions/libxt_CLASSIFY.c +++ b/extensions/libxt_CLASSIFY.c @@ -3,8 +3,8 @@ */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_CLASSIFY.h> +#include "xtables.h" +#include "linux/netfilter/xt_CLASSIFY.h" #include <linux/pkt_sched.h> enum { diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c index 21e1091..01027fe 100644 --- a/extensions/libxt_CONNMARK.c +++ b/extensions/libxt_CONNMARK.c @@ -22,8 +22,8 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_CONNMARK.h> +#include "xtables.h" +#include "linux/netfilter/xt_CONNMARK.h" struct xt_connmark_target_info { unsigned long mark; diff --git a/extensions/libxt_CONNSECMARK.c b/extensions/libxt_CONNSECMARK.c index 0b3cd79..31df659 100644 --- a/extensions/libxt_CONNSECMARK.c +++ b/extensions/libxt_CONNSECMARK.c @@ -6,8 +6,8 @@ * Copyright (C) 2006 Red Hat, Inc., James Morris <jmorris@xxxxxxxxxx> */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_CONNSECMARK.h> +#include "xtables.h" +#include "linux/netfilter/xt_CONNSECMARK.h" #define PFX "CONNSECMARK target: " diff --git a/extensions/libxt_CT.c b/extensions/libxt_CT.c index 371b217..04d471d 100644 --- a/extensions/libxt_CT.c +++ b/extensions/libxt_CT.c @@ -4,9 +4,9 @@ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/nf_conntrack_common.h> -#include <linux/netfilter/xt_CT.h> +#include "xtables.h" +#include "linux/netfilter/nf_conntrack_common.h" +#include "linux/netfilter/xt_CT.h" static void ct_help(void) { diff --git a/extensions/libxt_DSCP.c b/extensions/libxt_DSCP.c index cae0d83..9dde85e 100644 --- a/extensions/libxt_DSCP.c +++ b/extensions/libxt_DSCP.c @@ -11,8 +11,8 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_DSCP.h> +#include "xtables.h" +#include "linux/netfilter/xt_DSCP.h" /* This is evil, but it's my code - HW*/ #include "dscp_helper.c" diff --git a/extensions/libxt_HMARK.c b/extensions/libxt_HMARK.c index 94aebe9..455e255 100644 --- a/extensions/libxt_HMARK.c +++ b/extensions/libxt_HMARK.c @@ -17,7 +17,7 @@ #include <string.h> #include "xtables.h" -#include <linux/netfilter/xt_HMARK.h> +#include "linux/netfilter/xt_HMARK.h" static void HMARK_help(void) { diff --git a/extensions/libxt_IDLETIMER.c b/extensions/libxt_IDLETIMER.c index 21004a4..552ae9a 100644 --- a/extensions/libxt_IDLETIMER.c +++ b/extensions/libxt_IDLETIMER.c @@ -21,8 +21,8 @@ * */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_IDLETIMER.h> +#include "xtables.h" +#include "linux/netfilter/xt_IDLETIMER.h" enum { O_TIMEOUT = 0, diff --git a/extensions/libxt_LED.c b/extensions/libxt_LED.c index 8622c37..f9bed9d 100644 --- a/extensions/libxt_LED.c +++ b/extensions/libxt_LED.c @@ -12,8 +12,8 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <linux/netfilter/xt_LED.h> +#include "xtables.h" +#include "linux/netfilter/xt_LED.h" enum { O_LED_TRIGGER_ID = 0, diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c index 5c6186f..1559fc8 100644 --- a/extensions/libxt_MARK.c +++ b/extensions/libxt_MARK.c @@ -1,7 +1,7 @@ #include <stdbool.h> #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_MARK.h> +#include "xtables.h" +#include "linux/netfilter/xt_MARK.h" /* Version 0 */ struct xt_mark_target_info { diff --git a/extensions/libxt_NFLOG.c b/extensions/libxt_NFLOG.c index 02a1b4a..435262e 100644 --- a/extensions/libxt_NFLOG.c +++ b/extensions/libxt_NFLOG.c @@ -3,10 +3,10 @@ #include <stdio.h> #include <string.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/xt_NFLOG.h> +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/xt_NFLOG.h" enum { O_GROUP = 0, diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c index fe51907..d74719b 100644 --- a/extensions/libxt_NFQUEUE.c +++ b/extensions/libxt_NFQUEUE.c @@ -6,8 +6,8 @@ * */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_NFQUEUE.h> +#include "xtables.h" +#include "linux/netfilter/xt_NFQUEUE.h" enum { O_QUEUE_NUM = 0, diff --git a/extensions/libxt_RATEEST.c b/extensions/libxt_RATEEST.c index 449ceab..86fe201 100644 --- a/extensions/libxt_RATEEST.c +++ b/extensions/libxt_RATEEST.c @@ -7,9 +7,9 @@ #include <stdlib.h> #include <math.h> -#include <xtables.h> -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/xt_RATEEST.h> +#include "xtables.h" +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/xt_RATEEST.h" struct rateest_tg_udata { unsigned int interval; diff --git a/extensions/libxt_SECMARK.c b/extensions/libxt_SECMARK.c index 6ba8606..ae1308d 100644 --- a/extensions/libxt_SECMARK.c +++ b/extensions/libxt_SECMARK.c @@ -6,8 +6,8 @@ * Copyright (C) 2006 Red Hat, Inc., James Morris <jmorris@xxxxxxxxxx> */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_SECMARK.h> +#include "xtables.h" +#include "linux/netfilter/xt_SECMARK.h" #define PFX "SECMARK target: " diff --git a/extensions/libxt_SET.c b/extensions/libxt_SET.c index 2a7640a..d3723a4 100644 --- a/extensions/libxt_SET.c +++ b/extensions/libxt_SET.c @@ -17,8 +17,8 @@ #include <getopt.h> #include <ctype.h> -#include <xtables.h> -#include <linux/netfilter/xt_set.h> +#include "xtables.h" +#include "linux/netfilter/xt_set.h" #include "libxt_set.h" /* Revision 0 */ diff --git a/extensions/libxt_SYNPROXY.c b/extensions/libxt_SYNPROXY.c index 475590e..3b65f70 100644 --- a/extensions/libxt_SYNPROXY.c +++ b/extensions/libxt_SYNPROXY.c @@ -9,8 +9,8 @@ #include <stdbool.h> #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_SYNPROXY.h> +#include "xtables.h" +#include "linux/netfilter/xt_SYNPROXY.h" enum { O_SACK_PERM = 0, diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c index 0d9b200..68c6833 100644 --- a/extensions/libxt_TCPMSS.c +++ b/extensions/libxt_TCPMSS.c @@ -4,9 +4,9 @@ */ #include "config.h" #include <stdio.h> -#include <xtables.h> +#include "xtables.h" #include <netinet/ip.h> -#include <linux/netfilter/xt_TCPMSS.h> +#include "linux/netfilter/xt_TCPMSS.h" enum { O_SET_MSS = 0, diff --git a/extensions/libxt_TCPOPTSTRIP.c b/extensions/libxt_TCPOPTSTRIP.c index 6ea3489..b2af11e 100644 --- a/extensions/libxt_TCPOPTSTRIP.c +++ b/extensions/libxt_TCPOPTSTRIP.c @@ -6,9 +6,9 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" #include <netinet/tcp.h> -#include <linux/netfilter/xt_TCPOPTSTRIP.h> +#include "linux/netfilter/xt_TCPOPTSTRIP.h" #ifndef TCPOPT_MD5SIG # define TCPOPT_MD5SIG 19 #endif diff --git a/extensions/libxt_TEE.c b/extensions/libxt_TEE.c index 4676e33..b82e0f8 100644 --- a/extensions/libxt_TEE.c +++ b/extensions/libxt_TEE.c @@ -19,10 +19,10 @@ #include <net/if.h> #include <netinet/in.h> -#include <xtables.h> -#include <linux/netfilter.h> -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/xt_TEE.h> +#include "xtables.h" +#include "linux/netfilter.h" +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/xt_TEE.h" enum { O_GATEWAY = 0, diff --git a/extensions/libxt_TOS.c b/extensions/libxt_TOS.c index b66fa32..a36b874 100644 --- a/extensions/libxt_TOS.c +++ b/extensions/libxt_TOS.c @@ -11,8 +11,8 @@ #include <string.h> #include <netinet/in.h> -#include <xtables.h> -#include <linux/netfilter/xt_DSCP.h> +#include "xtables.h" +#include "linux/netfilter/xt_DSCP.h" #include "tos_values.c" struct ipt_tos_target_info { diff --git a/extensions/libxt_TPROXY.c b/extensions/libxt_TPROXY.c index d13ec85..3bcad69 100644 --- a/extensions/libxt_TPROXY.c +++ b/extensions/libxt_TPROXY.c @@ -5,8 +5,8 @@ */ #include <stdio.h> #include <limits.h> -#include <xtables.h> -#include <linux/netfilter/xt_TPROXY.h> +#include "xtables.h" +#include "linux/netfilter/xt_TPROXY.h" #include <arpa/inet.h> enum { diff --git a/extensions/libxt_TRACE.c b/extensions/libxt_TRACE.c index ac4f6fa..c83849c 100644 --- a/extensions/libxt_TRACE.c +++ b/extensions/libxt_TRACE.c @@ -4,8 +4,8 @@ #include <stdlib.h> #include <getopt.h> -#include <xtables.h> -#include <linux/netfilter/x_tables.h> +#include "xtables.h" +#include "linux/netfilter/x_tables.h" static int trace_xlate(struct xt_xlate *xl, const struct xt_xlate_tg_params *params) diff --git a/extensions/libxt_addrtype.c b/extensions/libxt_addrtype.c index 2748540..8635c4e 100644 --- a/extensions/libxt_addrtype.c +++ b/extensions/libxt_addrtype.c @@ -5,8 +5,8 @@ * This program is released under the terms of GNU GPL */ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_addrtype.h> +#include "xtables.h" +#include "linux/netfilter/xt_addrtype.h" enum { O_SRC_TYPE = 0, diff --git a/extensions/libxt_bpf.c b/extensions/libxt_bpf.c index 9295824..8118b39 100644 --- a/extensions/libxt_bpf.c +++ b/extensions/libxt_bpf.c @@ -6,7 +6,7 @@ * Licensed under the GNU General Public License version 2 (GPLv2) */ -#include <linux/netfilter/xt_bpf.h> +#include "linux/netfilter/xt_bpf.h" #include <errno.h> #include <fcntl.h> #include <stdio.h> @@ -15,7 +15,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -#include <xtables.h> +#include "xtables.h" #include "config.h" #ifdef HAVE_LINUX_BPF_H diff --git a/extensions/libxt_cgroup.c b/extensions/libxt_cgroup.c index 480d64c..c6b983a 100644 --- a/extensions/libxt_cgroup.c +++ b/extensions/libxt_cgroup.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_cgroup.h> +#include "xtables.h" +#include "linux/netfilter/xt_cgroup.h" enum { O_CLASSID = 0, diff --git a/extensions/libxt_cluster.c b/extensions/libxt_cluster.c index c9c35ee..9c4a3ee 100644 --- a/extensions/libxt_cluster.c +++ b/extensions/libxt_cluster.c @@ -6,8 +6,8 @@ * published by the Free Software Foundation. */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_cluster.h> +#include "xtables.h" +#include "linux/netfilter/xt_cluster.h" static void cluster_help(void) diff --git a/extensions/libxt_comment.c b/extensions/libxt_comment.c index 69795b6..158bcf9 100644 --- a/extensions/libxt_comment.c +++ b/extensions/libxt_comment.c @@ -7,8 +7,8 @@ * Port to patch-o-matic-ng */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_comment.h> +#include "xtables.h" +#include "linux/netfilter/xt_comment.h" enum { O_COMMENT = 0, diff --git a/extensions/libxt_connbytes.c b/extensions/libxt_connbytes.c index b57f0fc..a2f4a91 100644 --- a/extensions/libxt_connbytes.c +++ b/extensions/libxt_connbytes.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_connbytes.h> +#include "xtables.h" +#include "linux/netfilter/xt_connbytes.h" enum { O_CONNBYTES = 0, diff --git a/extensions/libxt_connlabel.c b/extensions/libxt_connlabel.c index d06bb27..f229c22 100644 --- a/extensions/libxt_connlabel.c +++ b/extensions/libxt_connlabel.c @@ -3,8 +3,8 @@ #include <string.h> #include <stdio.h> #include <stdint.h> -#include <xtables.h> -#include <linux/netfilter/xt_connlabel.h> +#include "xtables.h" +#include "linux/netfilter/xt_connlabel.h" #include <libnetfilter_conntrack/libnetfilter_conntrack.h> enum { diff --git a/extensions/libxt_connlimit.c b/extensions/libxt_connlimit.c index a569f86..e4fc8c8 100644 --- a/extensions/libxt_connlimit.c +++ b/extensions/libxt_connlimit.c @@ -1,8 +1,8 @@ #include <stdio.h> #include <netdb.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_connlimit.h> +#include "xtables.h" +#include "linux/netfilter/xt_connlimit.h" enum { O_UPTO = 0, diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c index cb4264e..8da7dab 100644 --- a/extensions/libxt_connmark.c +++ b/extensions/libxt_connmark.c @@ -22,8 +22,8 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_connmark.h> +#include "xtables.h" +#include "linux/netfilter/xt_connmark.h" struct xt_connmark_info { unsigned long mark, mask; diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index 72c5220..724b08a 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -11,10 +11,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_conntrack.h> -#include <linux/netfilter/xt_state.h> -#include <linux/netfilter/nf_conntrack_common.h> +#include "xtables.h" +#include "linux/netfilter/xt_conntrack.h" +#include "linux/netfilter/xt_state.h" +#include "linux/netfilter/nf_conntrack_common.h" #ifndef XT_STATE_UNTRACKED #define XT_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 1)) #endif diff --git a/extensions/libxt_cpu.c b/extensions/libxt_cpu.c index 41c13c3..30f3932 100644 --- a/extensions/libxt_cpu.c +++ b/extensions/libxt_cpu.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_cpu.h> +#include "xtables.h" +#include "linux/netfilter/xt_cpu.h" enum { O_CPU = 0, diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c index 5e67c26..0a039a2 100644 --- a/extensions/libxt_dccp.c +++ b/extensions/libxt_dccp.c @@ -11,10 +11,10 @@ #include <stdlib.h> #include <netdb.h> #include <arpa/inet.h> -#include <xtables.h> +#include "xtables.h" #include <linux/dccp.h> -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/xt_dccp.h> +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/xt_dccp.h" #if 0 #define DEBUGP(format, first...) printf(format, ##first) diff --git a/extensions/libxt_devgroup.c b/extensions/libxt_devgroup.c index a88211c..2f95ead 100644 --- a/extensions/libxt_devgroup.c +++ b/extensions/libxt_devgroup.c @@ -6,8 +6,8 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#include <xtables.h> -#include <linux/netfilter/xt_devgroup.h> +#include "xtables.h" +#include "linux/netfilter/xt_devgroup.h" static void devgroup_help(void) { diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c index d5c7323..4b513c0 100644 --- a/extensions/libxt_dscp.c +++ b/extensions/libxt_dscp.c @@ -14,8 +14,8 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_dscp.h> +#include "xtables.h" +#include "linux/netfilter/xt_dscp.h" /* This is evil, but it's my code - HW*/ #include "dscp_helper.c" diff --git a/extensions/libxt_ecn.c b/extensions/libxt_ecn.c index ad3c7a0..5abd403 100644 --- a/extensions/libxt_ecn.c +++ b/extensions/libxt_ecn.c @@ -9,8 +9,8 @@ * */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_ecn.h> +#include "xtables.h" +#include "linux/netfilter/xt_ecn.h" enum { O_ECN_TCP_CWR = 0, diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c index 2c7ff94..6953dcb 100644 --- a/extensions/libxt_esp.c +++ b/extensions/libxt_esp.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_esp.h> +#include "xtables.h" +#include "linux/netfilter/xt_esp.h" enum { O_ESPSPI = 0, diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c index 70bc615..5773644 100644 --- a/extensions/libxt_hashlimit.c +++ b/extensions/libxt_hashlimit.c @@ -20,9 +20,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#include <xtables.h> -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/xt_hashlimit.h> +#include "xtables.h" +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/xt_hashlimit.h" #define XT_HASHLIMIT_BURST 5 #define XT_HASHLIMIT_BURST_MAX_v1 10000 diff --git a/extensions/libxt_helper.c b/extensions/libxt_helper.c index 2afbf99..ba9ea2e 100644 --- a/extensions/libxt_helper.c +++ b/extensions/libxt_helper.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_helper.h> +#include "xtables.h" +#include "linux/netfilter/xt_helper.h" enum { O_HELPER = 0, diff --git a/extensions/libxt_ipcomp.c b/extensions/libxt_ipcomp.c index b5c4312..7943d1f 100644 --- a/extensions/libxt_ipcomp.c +++ b/extensions/libxt_ipcomp.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_ipcomp.h> +#include "xtables.h" +#include "linux/netfilter/xt_ipcomp.h" enum { O_compSPI = 0, diff --git a/extensions/libxt_iprange.c b/extensions/libxt_iprange.c index 8be2481..881b337 100644 --- a/extensions/libxt_iprange.c +++ b/extensions/libxt_iprange.c @@ -2,9 +2,9 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <linux/netfilter.h> -#include <linux/netfilter/xt_iprange.h> +#include "xtables.h" +#include "linux/netfilter.h" +#include "linux/netfilter/xt_iprange.h" struct ipt_iprange { /* Inclusive: network order. */ diff --git a/extensions/libxt_ipvs.c b/extensions/libxt_ipvs.c index 4672766..0cf0b73 100644 --- a/extensions/libxt_ipvs.c +++ b/extensions/libxt_ipvs.c @@ -8,9 +8,9 @@ #include <stdbool.h> #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" #include <linux/ip_vs.h> -#include <linux/netfilter/xt_ipvs.h> +#include "linux/netfilter/xt_ipvs.h" enum { /* For xt_ipvs: make sure this matches up with %XT_IPVS_*'s order */ diff --git a/extensions/libxt_length.c b/extensions/libxt_length.c index 04eac4a..bc71a43 100644 --- a/extensions/libxt_length.c +++ b/extensions/libxt_length.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_length.h> +#include "xtables.h" +#include "linux/netfilter/xt_length.h" enum { O_LENGTH = 0, diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c index c8ddca8..d7741bd 100644 --- a/extensions/libxt_limit.c +++ b/extensions/libxt_limit.c @@ -10,9 +10,9 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/xt_limit.h> +#include "xtables.h" +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/xt_limit.h" #define XT_LIMIT_AVG "3/hour" #define XT_LIMIT_BURST 5 diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c index b6d717b..0246c15 100644 --- a/extensions/libxt_mac.c +++ b/extensions/libxt_mac.c @@ -4,8 +4,8 @@ #else #include <linux/if_ether.h> #endif -#include <xtables.h> -#include <linux/netfilter/xt_mac.h> +#include "xtables.h" +#include "linux/netfilter/xt_mac.h" enum { O_MAC = 0, diff --git a/extensions/libxt_mangle.c b/extensions/libxt_mangle.c index 360742b..695151c 100644 --- a/extensions/libxt_mangle.c +++ b/extensions/libxt_mangle.c @@ -18,8 +18,8 @@ #include <errno.h> #include <netinet/ether.h> -#include <xtables.h> -#include <linux/netfilter_arp/arpt_mangle.h> +#include "xtables.h" +#include "linux/netfilter_arp/arpt_mangle.h" static void mangle_help(void) { diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 134ad43..a3476aa 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -1,7 +1,7 @@ #include <stdbool.h> #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_mark.h> +#include "xtables.h" +#include "linux/netfilter/xt_mark.h" struct xt_mark_info { unsigned long mark, mask; diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c index 07ad4cf..28af6bb 100644 --- a/extensions/libxt_multiport.c +++ b/extensions/libxt_multiport.c @@ -2,11 +2,11 @@ #include <netdb.h> #include <string.h> #include <stdlib.h> -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip_tables.h/ip6_tables.h */ -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <linux/netfilter/xt_multiport.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "linux/netfilter/xt_multiport.h" enum { O_SOURCE_PORTS = 0, diff --git a/extensions/libxt_nfacct.c b/extensions/libxt_nfacct.c index 2ad59d5..204a3a8 100644 --- a/extensions/libxt_nfacct.c +++ b/extensions/libxt_nfacct.c @@ -11,10 +11,10 @@ #include <stdio.h> #include <string.h> #include <getopt.h> -#include <xtables.h> +#include "xtables.h" -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/xt_nfacct.h> +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/xt_nfacct.h" enum { O_NAME = 0, diff --git a/extensions/libxt_osf.c b/extensions/libxt_osf.c index 496b480..0b56566 100644 --- a/extensions/libxt_osf.c +++ b/extensions/libxt_osf.c @@ -22,10 +22,10 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" #include <netinet/ip.h> #include <netinet/tcp.h> -#include <linux/netfilter/xt_osf.h> +#include "linux/netfilter/xt_osf.h" enum { O_GENRE = 0, diff --git a/extensions/libxt_owner.c b/extensions/libxt_owner.c index 87e4df3..ca69987 100644 --- a/extensions/libxt_owner.c +++ b/extensions/libxt_owner.c @@ -9,8 +9,8 @@ #include <stdbool.h> #include <stdio.h> #include <limits.h> -#include <xtables.h> -#include <linux/netfilter/xt_owner.h> +#include "xtables.h" +#include "linux/netfilter/xt_owner.h" /* match and invert flags */ enum { diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c index a11faf4..e7caa71 100644 --- a/extensions/libxt_physdev.c +++ b/extensions/libxt_physdev.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_physdev.h> +#include "xtables.h" +#include "linux/netfilter/xt_physdev.h" enum { O_PHYSDEV_IN = 0, diff --git a/extensions/libxt_pkttype.c b/extensions/libxt_pkttype.c index bf6f5b9..4dbe116 100644 --- a/extensions/libxt_pkttype.c +++ b/extensions/libxt_pkttype.c @@ -6,9 +6,9 @@ */ #include <stdio.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" #include <linux/if_packet.h> -#include <linux/netfilter/xt_pkttype.h> +#include "linux/netfilter/xt_pkttype.h" enum { O_PKTTYPE = 0, diff --git a/extensions/libxt_policy.c b/extensions/libxt_policy.c index f9a4819..1ccb4c0 100644 --- a/extensions/libxt_policy.c +++ b/extensions/libxt_policy.c @@ -7,8 +7,8 @@ #include <stdio.h> #include <string.h> #include <netdb.h> -#include <xtables.h> -#include <linux/netfilter/xt_policy.h> +#include "xtables.h" +#include "linux/netfilter/xt_policy.h" enum { O_DIRECTION = 0, diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c index bad77d2..f361ebc 100644 --- a/extensions/libxt_quota.c +++ b/extensions/libxt_quota.c @@ -4,8 +4,8 @@ * Sam Johnston <samj@xxxxxxxx> */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_quota.h> +#include "xtables.h" +#include "linux/netfilter/xt_quota.h" enum { O_QUOTA = 0, diff --git a/extensions/libxt_rateest.c b/extensions/libxt_rateest.c index fb24412..6b71820 100644 --- a/extensions/libxt_rateest.c +++ b/extensions/libxt_rateest.c @@ -9,8 +9,8 @@ #include <stddef.h> #include <getopt.h> -#include <xtables.h> -#include <linux/netfilter/xt_rateest.h> +#include "xtables.h" +#include "linux/netfilter/xt_rateest.h" static void rateest_help(void) { diff --git a/extensions/libxt_recent.c b/extensions/libxt_recent.c index 055ae35..6e16228 100644 --- a/extensions/libxt_recent.c +++ b/extensions/libxt_recent.c @@ -1,8 +1,8 @@ #include <stdbool.h> #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_recent.h> +#include "xtables.h" +#include "linux/netfilter/xt_recent.h" enum { O_SET = 0, diff --git a/extensions/libxt_rpfilter.c b/extensions/libxt_rpfilter.c index d166baa..0e2e3f5 100644 --- a/extensions/libxt_rpfilter.c +++ b/extensions/libxt_rpfilter.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_rpfilter.h> +#include "xtables.h" +#include "linux/netfilter/xt_rpfilter.h" enum { O_RPF_LOOSE = 0, diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c index 140de26..fb89699 100644 --- a/extensions/libxt_sctp.c +++ b/extensions/libxt_sctp.c @@ -16,9 +16,9 @@ #include <ctype.h> #include <netinet/in.h> -#include <xtables.h> +#include "xtables.h" -#include <linux/netfilter/xt_sctp.h> +#include "linux/netfilter/xt_sctp.h" #if 0 #define DEBUGP(format, first...) printf(format, ##first) diff --git a/extensions/libxt_set.c b/extensions/libxt_set.c index 679c04c..4341470 100644 --- a/extensions/libxt_set.c +++ b/extensions/libxt_set.c @@ -18,8 +18,8 @@ #include <ctype.h> #include <errno.h> -#include <xtables.h> -#include <linux/netfilter/xt_set.h> +#include "xtables.h" +#include "linux/netfilter/xt_set.h" #include "libxt_set.h" /* Revision 0 */ diff --git a/extensions/libxt_socket.c b/extensions/libxt_socket.c index a99135c..5cf721b 100644 --- a/extensions/libxt_socket.c +++ b/extensions/libxt_socket.c @@ -4,8 +4,8 @@ * Copyright (C) 2007 BalaBit IT Ltd. */ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_socket.h> +#include "xtables.h" +#include "linux/netfilter/xt_socket.h" enum { O_TRANSPARENT = 0, diff --git a/extensions/libxt_standard.c b/extensions/libxt_standard.c index c64ba29..63d9efe 100644 --- a/extensions/libxt_standard.c +++ b/extensions/libxt_standard.c @@ -1,6 +1,6 @@ /* Shared library add-on to iptables for standard target support. */ #include <stdio.h> -#include <xtables.h> +#include "xtables.h" static void standard_help(void) { diff --git a/extensions/libxt_statistic.c b/extensions/libxt_statistic.c index 4f3341a..16c3aa6 100644 --- a/extensions/libxt_statistic.c +++ b/extensions/libxt_statistic.c @@ -5,8 +5,8 @@ #include <math.h> #include <stdio.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_statistic.h> +#include "xtables.h" +#include "linux/netfilter/xt_statistic.h" enum { O_MODE = 0, diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c index fb15980..3fec069 100644 --- a/extensions/libxt_string.c +++ b/extensions/libxt_string.c @@ -25,8 +25,8 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <xtables.h> -#include <linux/netfilter/xt_string.h> +#include "xtables.h" +#include "linux/netfilter/xt_string.h" enum { O_FROM = 0, diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c index 58f3c0a..a107d6f 100644 --- a/extensions/libxt_tcp.c +++ b/extensions/libxt_tcp.c @@ -6,8 +6,8 @@ #include <stdlib.h> #include <getopt.h> #include <netinet/in.h> -#include <xtables.h> -#include <linux/netfilter/xt_tcpudp.h> +#include "xtables.h" +#include "linux/netfilter/xt_tcpudp.h" static void tcp_help(void) { diff --git a/extensions/libxt_tcpmss.c b/extensions/libxt_tcpmss.c index bcd357a..125a43c 100644 --- a/extensions/libxt_tcpmss.c +++ b/extensions/libxt_tcpmss.c @@ -1,6 +1,6 @@ #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_tcpmss.h> +#include "xtables.h" +#include "linux/netfilter/xt_tcpmss.h" enum { O_TCPMSS = 0, diff --git a/extensions/libxt_time.c b/extensions/libxt_time.c index 9c5bda8..33b8f16 100644 --- a/extensions/libxt_time.c +++ b/extensions/libxt_time.c @@ -13,9 +13,9 @@ #include <string.h> #include <stdlib.h> #include <time.h> -#include <linux/types.h> -#include <linux/netfilter/xt_time.h> -#include <xtables.h> +#include "linux/types.h" +#include "linux/netfilter/xt_time.h" +#include "xtables.h" enum { O_DATE_START = 0, diff --git a/extensions/libxt_tos.c b/extensions/libxt_tos.c index 81c096f..75c7650 100644 --- a/extensions/libxt_tos.c +++ b/extensions/libxt_tos.c @@ -11,8 +11,8 @@ #include <stdlib.h> #include <string.h> -#include <xtables.h> -#include <linux/netfilter/xt_dscp.h> +#include "xtables.h" +#include "linux/netfilter/xt_dscp.h" #include "tos_values.c" struct ipt_tos_info { diff --git a/extensions/libxt_u32.c b/extensions/libxt_u32.c index 2a7f5d8..5532065 100644 --- a/extensions/libxt_u32.c +++ b/extensions/libxt_u32.c @@ -15,8 +15,8 @@ #include <stdint.h> #include <stdlib.h> #include <stdio.h> -#include <xtables.h> -#include <linux/netfilter/xt_u32.h> +#include "xtables.h" +#include "linux/netfilter/xt_u32.h" enum { O_U32 = 0, diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c index 0c7a4bc..12da6f0 100644 --- a/extensions/libxt_udp.c +++ b/extensions/libxt_udp.c @@ -2,8 +2,8 @@ #include <stdio.h> #include <netdb.h> #include <arpa/inet.h> -#include <xtables.h> -#include <linux/netfilter/xt_tcpudp.h> +#include "xtables.h" +#include "linux/netfilter/xt_tcpudp.h" enum { O_SOURCE_PORT = 0, diff --git a/include/ip6tables.h b/include/ip6tables.h index 5f1c5b6..d95953e 100644 --- a/include/ip6tables.h +++ b/include/ip6tables.h @@ -2,8 +2,8 @@ #define _IP6TABLES_USER_H #include <netinet/ip.h> -#include <xtables.h> -#include <libiptc/libip6tc.h> +#include "xtables.h" +#include "libiptc/libip6tc.h" #include <iptables/internal.h> /* Your shared library should call one of these. */ diff --git a/include/iptables.h b/include/iptables.h index 78c10ab..70bae02 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -2,8 +2,8 @@ #define _IPTABLES_USER_H #include <netinet/ip.h> -#include <xtables.h> -#include <libiptc/libiptc.h> +#include "xtables.h" +#include "libiptc/libiptc.h" #include <iptables/internal.h> /* Your shared library should call one of these. */ diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h index 3cd1329..8c99c46 100644 --- a/include/libipq/libipq.h +++ b/include/libipq/libipq.h @@ -30,7 +30,7 @@ #include <asm/types.h> #include <linux/netlink.h> -#include <linux/netfilter_ipv4/ip_queue.h> +#include "linux/netfilter_ipv4/ip_queue.h" typedef unsigned long ipq_id_t; #ifdef DEBUG_LIBIPQ diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h index 9aed80a..0d189a8 100644 --- a/include/libiptc/libip6tc.h +++ b/include/libiptc/libip6tc.h @@ -2,15 +2,15 @@ #define _LIBIP6TC_H /* Library which manipulates firewall rules. Version 0.2. */ -#include <linux/types.h> -#include <libiptc/ipt_kernel_headers.h> +#include "linux/types.h" +#include "libiptc/ipt_kernel_headers.h" #ifdef __cplusplus # include <climits> #else # include <limits.h> /* INT_MAX in ip6_tables.h */ #endif -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <libiptc/xtcshared.h> +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "libiptc/xtcshared.h" #define ip6tc_handle xtc_handle #define ip6t_chainlabel xt_chainlabel diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h index 24cdbdb..da75bea 100644 --- a/include/libiptc/libiptc.h +++ b/include/libiptc/libiptc.h @@ -2,15 +2,15 @@ #define _LIBIPTC_H /* Library which manipulates filtering rules. */ -#include <linux/types.h> -#include <libiptc/ipt_kernel_headers.h> +#include "linux/types.h" +#include "libiptc/ipt_kernel_headers.h" #ifdef __cplusplus # include <climits> #else # include <limits.h> /* INT_MAX in ip_tables.h */ #endif -#include <linux/netfilter_ipv4/ip_tables.h> -#include <libiptc/xtcshared.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "libiptc/xtcshared.h" #ifdef __cplusplus extern "C" { diff --git a/include/libiptc/libxtc.h b/include/libiptc/libxtc.h index 3701018..3062476 100644 --- a/include/libiptc/libxtc.h +++ b/include/libiptc/libxtc.h @@ -2,8 +2,8 @@ #define _LIBXTC_H /* Library which manipulates filtering rules. */ -#include <libiptc/ipt_kernel_headers.h> -#include <linux/netfilter/x_tables.h> +#include "libiptc/ipt_kernel_headers.h" +#include "linux/netfilter/x_tables.h" #ifdef __cplusplus extern "C" { diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h index 3f4cc2c..15af141 100644 --- a/include/libipulog/libipulog.h +++ b/include/libipulog/libipulog.h @@ -12,7 +12,7 @@ #include <asm/types.h> #include <linux/netlink.h> #include <net/if.h> -#include <linux/netfilter_ipv4/ipt_ULOG.h> +#include "linux/netfilter_ipv4/ipt_ULOG.h" /* FIXME: glibc sucks */ #ifndef MSG_TRUNC diff --git a/include/linux/filter.h b/include/linux/filter.h index a9ae93c..dc14392 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -6,7 +6,7 @@ #define __LINUX_FILTER_H__ -#include <linux/types.h> +#include "linux/types.h" /* diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 5477131..b8a6656 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -1,7 +1,7 @@ #ifndef __LINUX_NETFILTER_H #define __LINUX_NETFILTER_H -#include <linux/types.h> +#include "linux/types.h" #include <linux/sysctl.h> diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h index b69bbc7..49a7ec3 100644 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h @@ -11,7 +11,7 @@ #define _UAPI_IP_SET_H -#include <linux/types.h> +#include "linux/types.h" /* The protocol version */ #define IPSET_PROTOCOL 6 diff --git a/include/linux/netfilter/nf_nat.h b/include/linux/netfilter/nf_nat.h index b600000..8bbd986 100644 --- a/include/linux/netfilter/nf_nat.h +++ b/include/linux/netfilter/nf_nat.h @@ -1,8 +1,8 @@ #ifndef _NETFILTER_NF_NAT_H #define _NETFILTER_NF_NAT_H -#include <linux/netfilter.h> -#include <linux/netfilter/nf_conntrack_tuple_common.h> +#include "linux/netfilter.h" +#include "linux/netfilter/nf_conntrack_tuple_common.h" #define NF_NAT_RANGE_MAP_IPS (1 << 0) #define NF_NAT_RANGE_PROTO_SPECIFIED (1 << 1) diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h index 06eea26..c609775 100644 --- a/include/linux/netfilter/nfnetlink.h +++ b/include/linux/netfilter/nfnetlink.h @@ -1,6 +1,6 @@ #ifndef _NFNETLINK_H #define _NFNETLINK_H -#include <linux/types.h> +#include "linux/types.h" #include <linux/netfilter/nfnetlink_compat.h> enum nfnetlink_groups { diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 4120970..5e484cd 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -1,7 +1,7 @@ #ifndef _X_TABLES_H #define _X_TABLES_H -#include <linux/kernel.h> -#include <linux/types.h> +#include "linux/kernel.h" +#include "linux/types.h" #define XT_FUNCTION_MAXNAMELEN 30 #define XT_EXTENSION_MAXNAMELEN 29 diff --git a/include/linux/netfilter/xt_AUDIT.h b/include/linux/netfilter/xt_AUDIT.h index 38751d2..4acaf31 100644 --- a/include/linux/netfilter/xt_AUDIT.h +++ b/include/linux/netfilter/xt_AUDIT.h @@ -12,7 +12,7 @@ #ifndef _XT_AUDIT_TARGET_H #define _XT_AUDIT_TARGET_H -#include <linux/types.h> +#include "linux/types.h" enum { XT_AUDIT_TYPE_ACCEPT = 0, diff --git a/include/linux/netfilter/xt_CHECKSUM.h b/include/linux/netfilter/xt_CHECKSUM.h index 9a2e466..c8eb3f0 100644 --- a/include/linux/netfilter/xt_CHECKSUM.h +++ b/include/linux/netfilter/xt_CHECKSUM.h @@ -9,7 +9,7 @@ #ifndef _XT_CHECKSUM_TARGET_H #define _XT_CHECKSUM_TARGET_H -#include <linux/types.h> +#include "linux/types.h" #define XT_CHECKSUM_OP_FILL 0x01 /* fill in checksum in IP header */ diff --git a/include/linux/netfilter/xt_CLASSIFY.h b/include/linux/netfilter/xt_CLASSIFY.h index a813bf1..4d7cf82 100644 --- a/include/linux/netfilter/xt_CLASSIFY.h +++ b/include/linux/netfilter/xt_CLASSIFY.h @@ -1,7 +1,7 @@ #ifndef _XT_CLASSIFY_H #define _XT_CLASSIFY_H -#include <linux/types.h> +#include "linux/types.h" struct xt_classify_target_info { __u32 priority; diff --git a/include/linux/netfilter/xt_CONNMARK.h b/include/linux/netfilter/xt_CONNMARK.h index 2f2e48e..9e0aebd 100644 --- a/include/linux/netfilter/xt_CONNMARK.h +++ b/include/linux/netfilter/xt_CONNMARK.h @@ -1,6 +1,6 @@ #ifndef _XT_CONNMARK_H_target #define _XT_CONNMARK_H_target -#include <linux/netfilter/xt_connmark.h> +#include "linux/netfilter/xt_connmark.h" #endif /*_XT_CONNMARK_H_target*/ diff --git a/include/linux/netfilter/xt_CONNSECMARK.h b/include/linux/netfilter/xt_CONNSECMARK.h index b973ff8..9427b5a 100644 --- a/include/linux/netfilter/xt_CONNSECMARK.h +++ b/include/linux/netfilter/xt_CONNSECMARK.h @@ -1,7 +1,7 @@ #ifndef _XT_CONNSECMARK_H_target #define _XT_CONNSECMARK_H_target -#include <linux/types.h> +#include "linux/types.h" enum { CONNSECMARK_SAVE = 1, diff --git a/include/linux/netfilter/xt_CT.h b/include/linux/netfilter/xt_CT.h index c3907db..465865c 100644 --- a/include/linux/netfilter/xt_CT.h +++ b/include/linux/netfilter/xt_CT.h @@ -1,7 +1,7 @@ #ifndef _XT_CT_H #define _XT_CT_H -#include <linux/types.h> +#include "linux/types.h" enum { XT_CT_NOTRACK = 1 << 0, diff --git a/include/linux/netfilter/xt_DSCP.h b/include/linux/netfilter/xt_DSCP.h index 648e0b3..3c06108 100644 --- a/include/linux/netfilter/xt_DSCP.h +++ b/include/linux/netfilter/xt_DSCP.h @@ -10,8 +10,8 @@ */ #ifndef _XT_DSCP_TARGET_H #define _XT_DSCP_TARGET_H -#include <linux/netfilter/xt_dscp.h> -#include <linux/types.h> +#include "linux/netfilter/xt_dscp.h" +#include "linux/types.h" /* target info */ struct xt_DSCP_info { diff --git a/include/linux/netfilter/xt_HMARK.h b/include/linux/netfilter/xt_HMARK.h index 826fc58..9f867e8 100644 --- a/include/linux/netfilter/xt_HMARK.h +++ b/include/linux/netfilter/xt_HMARK.h @@ -1,7 +1,7 @@ #ifndef XT_HMARK_H_ #define XT_HMARK_H_ -#include <linux/types.h> +#include "linux/types.h" enum { XT_HMARK_SADDR_MASK, diff --git a/include/linux/netfilter/xt_IDLETIMER.h b/include/linux/netfilter/xt_IDLETIMER.h index 208ae93..8653ad1 100644 --- a/include/linux/netfilter/xt_IDLETIMER.h +++ b/include/linux/netfilter/xt_IDLETIMER.h @@ -29,7 +29,7 @@ #ifndef _XT_IDLETIMER_H #define _XT_IDLETIMER_H -#include <linux/types.h> +#include "linux/types.h" #define MAX_IDLETIMER_LABEL_SIZE 28 diff --git a/include/linux/netfilter/xt_LED.h b/include/linux/netfilter/xt_LED.h index f5509e7..33cd9ed 100644 --- a/include/linux/netfilter/xt_LED.h +++ b/include/linux/netfilter/xt_LED.h @@ -1,7 +1,7 @@ #ifndef _XT_LED_H #define _XT_LED_H -#include <linux/types.h> +#include "linux/types.h" struct xt_led_info { char id[27]; /* Unique ID for this trigger in the LED class */ diff --git a/include/linux/netfilter/xt_MARK.h b/include/linux/netfilter/xt_MARK.h index 41c456d..dd68781 100644 --- a/include/linux/netfilter/xt_MARK.h +++ b/include/linux/netfilter/xt_MARK.h @@ -1,6 +1,6 @@ #ifndef _XT_MARK_H_target #define _XT_MARK_H_target -#include <linux/netfilter/xt_mark.h> +#include "linux/netfilter/xt_mark.h" #endif /*_XT_MARK_H_target */ diff --git a/include/linux/netfilter/xt_NFLOG.h b/include/linux/netfilter/xt_NFLOG.h index f330707..0e9e0bc 100644 --- a/include/linux/netfilter/xt_NFLOG.h +++ b/include/linux/netfilter/xt_NFLOG.h @@ -1,7 +1,7 @@ #ifndef _XT_NFLOG_TARGET #define _XT_NFLOG_TARGET -#include <linux/types.h> +#include "linux/types.h" #define XT_NFLOG_DEFAULT_GROUP 0x1 #define XT_NFLOG_DEFAULT_THRESHOLD 0 diff --git a/include/linux/netfilter/xt_NFQUEUE.h b/include/linux/netfilter/xt_NFQUEUE.h index 8bb5fe6..978b379 100644 --- a/include/linux/netfilter/xt_NFQUEUE.h +++ b/include/linux/netfilter/xt_NFQUEUE.h @@ -8,7 +8,7 @@ #ifndef _XT_NFQ_TARGET_H #define _XT_NFQ_TARGET_H -#include <linux/types.h> +#include "linux/types.h" /* target info */ struct xt_NFQ_info { diff --git a/include/linux/netfilter/xt_RATEEST.h b/include/linux/netfilter/xt_RATEEST.h index 6605e20..f9bd365 100644 --- a/include/linux/netfilter/xt_RATEEST.h +++ b/include/linux/netfilter/xt_RATEEST.h @@ -1,7 +1,7 @@ #ifndef _XT_RATEEST_TARGET_H #define _XT_RATEEST_TARGET_H -#include <linux/types.h> +#include "linux/types.h" struct xt_rateest_target_info { char name[IFNAMSIZ]; diff --git a/include/linux/netfilter/xt_SECMARK.h b/include/linux/netfilter/xt_SECMARK.h index 989092b..26e2b1a 100644 --- a/include/linux/netfilter/xt_SECMARK.h +++ b/include/linux/netfilter/xt_SECMARK.h @@ -1,7 +1,7 @@ #ifndef _XT_SECMARK_H_target #define _XT_SECMARK_H_target -#include <linux/types.h> +#include "linux/types.h" /* * This is intended for use by various security subsystems (but not diff --git a/include/linux/netfilter/xt_TCPMSS.h b/include/linux/netfilter/xt_TCPMSS.h index 9a6960a..6df03aa 100644 --- a/include/linux/netfilter/xt_TCPMSS.h +++ b/include/linux/netfilter/xt_TCPMSS.h @@ -1,7 +1,7 @@ #ifndef _XT_TCPMSS_H #define _XT_TCPMSS_H -#include <linux/types.h> +#include "linux/types.h" struct xt_tcpmss_info { __u16 mss; diff --git a/include/linux/netfilter/xt_TCPOPTSTRIP.h b/include/linux/netfilter/xt_TCPOPTSTRIP.h index 7157318..2b10617 100644 --- a/include/linux/netfilter/xt_TCPOPTSTRIP.h +++ b/include/linux/netfilter/xt_TCPOPTSTRIP.h @@ -1,7 +1,7 @@ #ifndef _XT_TCPOPTSTRIP_H #define _XT_TCPOPTSTRIP_H -#include <linux/types.h> +#include "linux/types.h" #define tcpoptstrip_set_bit(bmap, idx) \ (bmap[(idx) >> 5] |= 1U << (idx & 31)) diff --git a/include/linux/netfilter/xt_TPROXY.h b/include/linux/netfilter/xt_TPROXY.h index 902043c..9c28833 100644 --- a/include/linux/netfilter/xt_TPROXY.h +++ b/include/linux/netfilter/xt_TPROXY.h @@ -1,7 +1,7 @@ #ifndef _XT_TPROXY_H #define _XT_TPROXY_H -#include <linux/types.h> +#include "linux/types.h" /* TPROXY target is capable of marking the packet to perform * redirection. We can get rid of that whenever we get support for diff --git a/include/linux/netfilter/xt_addrtype.h b/include/linux/netfilter/xt_addrtype.h index b156baa..cc89784 100644 --- a/include/linux/netfilter/xt_addrtype.h +++ b/include/linux/netfilter/xt_addrtype.h @@ -1,7 +1,7 @@ #ifndef _XT_ADDRTYPE_H #define _XT_ADDRTYPE_H -#include <linux/types.h> +#include "linux/types.h" enum { XT_ADDRTYPE_INVERT_SOURCE = 0x0001, diff --git a/include/linux/netfilter/xt_bpf.h b/include/linux/netfilter/xt_bpf.h index b97725a..e1e62ab 100644 --- a/include/linux/netfilter/xt_bpf.h +++ b/include/linux/netfilter/xt_bpf.h @@ -1,9 +1,9 @@ #ifndef _XT_BPF_H #define _XT_BPF_H -#include <linux/filter.h> +#include "linux/filter.h" #include <linux/limits.h> -#include <linux/types.h> +#include "linux/types.h" #define XT_BPF_MAX_NUM_INSTR 64 #define XT_BPF_PATH_MAX (XT_BPF_MAX_NUM_INSTR * sizeof(struct sock_filter)) diff --git a/include/linux/netfilter/xt_cgroup.h b/include/linux/netfilter/xt_cgroup.h index 7fe61ed..3b78d5a 100644 --- a/include/linux/netfilter/xt_cgroup.h +++ b/include/linux/netfilter/xt_cgroup.h @@ -1,7 +1,7 @@ #ifndef _XT_CGROUP_H #define _XT_CGROUP_H -#include <linux/types.h> +#include "linux/types.h" #include <linux/limits.h> struct xt_cgroup_info_v0 { diff --git a/include/linux/netfilter/xt_cluster.h b/include/linux/netfilter/xt_cluster.h index 9b883c8..0fca1a0 100644 --- a/include/linux/netfilter/xt_cluster.h +++ b/include/linux/netfilter/xt_cluster.h @@ -1,7 +1,7 @@ #ifndef _XT_CLUSTER_MATCH_H #define _XT_CLUSTER_MATCH_H -#include <linux/types.h> +#include "linux/types.h" enum xt_cluster_flags { XT_CLUSTER_F_INV = (1 << 0) diff --git a/include/linux/netfilter/xt_connbytes.h b/include/linux/netfilter/xt_connbytes.h index f1d6c15..b8fe357 100644 --- a/include/linux/netfilter/xt_connbytes.h +++ b/include/linux/netfilter/xt_connbytes.h @@ -1,7 +1,7 @@ #ifndef _XT_CONNBYTES_H #define _XT_CONNBYTES_H -#include <linux/types.h> +#include "linux/types.h" enum xt_connbytes_what { XT_CONNBYTES_PKTS, diff --git a/include/linux/netfilter/xt_connlabel.h b/include/linux/netfilter/xt_connlabel.h index c4bc9ee..3a9f3db 100644 --- a/include/linux/netfilter/xt_connlabel.h +++ b/include/linux/netfilter/xt_connlabel.h @@ -1,4 +1,4 @@ -#include <linux/types.h> +#include "linux/types.h" #define XT_CONNLABEL_MAXBIT 127 enum xt_connlabel_mtopts { diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h index f9e8c67..84340a9 100644 --- a/include/linux/netfilter/xt_connlimit.h +++ b/include/linux/netfilter/xt_connlimit.h @@ -1,7 +1,7 @@ #ifndef _XT_CONNLIMIT_H #define _XT_CONNLIMIT_H -#include <linux/types.h> +#include "linux/types.h" struct xt_connlimit_data; diff --git a/include/linux/netfilter/xt_connmark.h b/include/linux/netfilter/xt_connmark.h index bbf2acc..17f02ea 100644 --- a/include/linux/netfilter/xt_connmark.h +++ b/include/linux/netfilter/xt_connmark.h @@ -1,7 +1,7 @@ #ifndef _XT_CONNMARK_H #define _XT_CONNMARK_H -#include <linux/types.h> +#include "linux/types.h" /* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com> * by Henrik Nordstrom <hno@xxxxxxxxxxxxxxx> diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h index e971501..d27ac70 100644 --- a/include/linux/netfilter/xt_conntrack.h +++ b/include/linux/netfilter/xt_conntrack.h @@ -5,8 +5,8 @@ #ifndef _XT_CONNTRACK_H #define _XT_CONNTRACK_H -#include <linux/types.h> -#include <linux/netfilter/nf_conntrack_tuple_common.h> +#include "linux/types.h" +#include "linux/netfilter/nf_conntrack_tuple_common.h" #define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1)) #define XT_CONNTRACK_STATE_INVALID (1 << 0) diff --git a/include/linux/netfilter/xt_cpu.h b/include/linux/netfilter/xt_cpu.h index 93c7f11..e5655da 100644 --- a/include/linux/netfilter/xt_cpu.h +++ b/include/linux/netfilter/xt_cpu.h @@ -1,7 +1,7 @@ #ifndef _XT_CPU_H #define _XT_CPU_H -#include <linux/types.h> +#include "linux/types.h" struct xt_cpu_info { __u32 cpu; diff --git a/include/linux/netfilter/xt_dccp.h b/include/linux/netfilter/xt_dccp.h index a579e1b..cc1ed7e 100644 --- a/include/linux/netfilter/xt_dccp.h +++ b/include/linux/netfilter/xt_dccp.h @@ -1,7 +1,7 @@ #ifndef _XT_DCCP_H_ #define _XT_DCCP_H_ -#include <linux/types.h> +#include "linux/types.h" #define XT_DCCP_SRC_PORTS 0x01 #define XT_DCCP_DEST_PORTS 0x02 diff --git a/include/linux/netfilter/xt_devgroup.h b/include/linux/netfilter/xt_devgroup.h index 1babde0..6a050b9 100644 --- a/include/linux/netfilter/xt_devgroup.h +++ b/include/linux/netfilter/xt_devgroup.h @@ -1,7 +1,7 @@ #ifndef _XT_DEVGROUP_H #define _XT_DEVGROUP_H -#include <linux/types.h> +#include "linux/types.h" enum xt_devgroup_flags { XT_DEVGROUP_MATCH_SRC = 0x1, diff --git a/include/linux/netfilter/xt_dscp.h b/include/linux/netfilter/xt_dscp.h index 15f8932..f2f9d62 100644 --- a/include/linux/netfilter/xt_dscp.h +++ b/include/linux/netfilter/xt_dscp.h @@ -10,7 +10,7 @@ #ifndef _XT_DSCP_H #define _XT_DSCP_H -#include <linux/types.h> +#include "linux/types.h" #define XT_DSCP_MASK 0xfc /* 11111100 */ #define XT_DSCP_SHIFT 2 diff --git a/include/linux/netfilter/xt_ecn.h b/include/linux/netfilter/xt_ecn.h index c21cc28..c52adf4 100644 --- a/include/linux/netfilter/xt_ecn.h +++ b/include/linux/netfilter/xt_ecn.h @@ -7,8 +7,8 @@ #ifndef _XT_ECN_H #define _XT_ECN_H -#include <linux/types.h> -#include <linux/netfilter/xt_dscp.h> +#include "linux/types.h" +#include "linux/netfilter/xt_dscp.h" #define XT_ECN_IP_MASK (~XT_DSCP_MASK) diff --git a/include/linux/netfilter/xt_esp.h b/include/linux/netfilter/xt_esp.h index ee68824..702346f 100644 --- a/include/linux/netfilter/xt_esp.h +++ b/include/linux/netfilter/xt_esp.h @@ -1,7 +1,7 @@ #ifndef _XT_ESP_H #define _XT_ESP_H -#include <linux/types.h> +#include "linux/types.h" struct xt_esp { __u32 spis[2]; /* Security Parameter Index */ diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h index ade33f6..2fbb75d 100644 --- a/include/linux/netfilter/xt_hashlimit.h +++ b/include/linux/netfilter/xt_hashlimit.h @@ -1,7 +1,7 @@ #ifndef _XT_HASHLIMIT_H #define _XT_HASHLIMIT_H -#include <linux/types.h> +#include "linux/types.h" /* timings are in milliseconds. */ #define XT_HASHLIMIT_SCALE 10000 diff --git a/include/linux/netfilter/xt_ipcomp.h b/include/linux/netfilter/xt_ipcomp.h index 45c7e40..23d38a4 100644 --- a/include/linux/netfilter/xt_ipcomp.h +++ b/include/linux/netfilter/xt_ipcomp.h @@ -1,7 +1,7 @@ #ifndef _XT_IPCOMP_H #define _XT_IPCOMP_H -#include <linux/types.h> +#include "linux/types.h" struct xt_ipcomp { __u32 spis[2]; /* Security Parameter Index */ diff --git a/include/linux/netfilter/xt_iprange.h b/include/linux/netfilter/xt_iprange.h index c1f21a7..5c3da41 100644 --- a/include/linux/netfilter/xt_iprange.h +++ b/include/linux/netfilter/xt_iprange.h @@ -1,7 +1,7 @@ #ifndef _LINUX_NETFILTER_XT_IPRANGE_H #define _LINUX_NETFILTER_XT_IPRANGE_H 1 -#include <linux/types.h> +#include "linux/types.h" enum { IPRANGE_SRC = 1 << 0, /* match source IP address */ diff --git a/include/linux/netfilter/xt_ipvs.h b/include/linux/netfilter/xt_ipvs.h index eff34ac..d865f2f 100644 --- a/include/linux/netfilter/xt_ipvs.h +++ b/include/linux/netfilter/xt_ipvs.h @@ -1,7 +1,7 @@ #ifndef _XT_IPVS_H #define _XT_IPVS_H -#include <linux/types.h> +#include "linux/types.h" enum { XT_IPVS_IPVS_PROPERTY = 1 << 0, /* all other options imply this one */ diff --git a/include/linux/netfilter/xt_length.h b/include/linux/netfilter/xt_length.h index b82ed7c..97a17d6 100644 --- a/include/linux/netfilter/xt_length.h +++ b/include/linux/netfilter/xt_length.h @@ -1,7 +1,7 @@ #ifndef _XT_LENGTH_H #define _XT_LENGTH_H -#include <linux/types.h> +#include "linux/types.h" struct xt_length_info { __u16 min, max; diff --git a/include/linux/netfilter/xt_limit.h b/include/linux/netfilter/xt_limit.h index bb47fc4..6047b43 100644 --- a/include/linux/netfilter/xt_limit.h +++ b/include/linux/netfilter/xt_limit.h @@ -1,7 +1,7 @@ #ifndef _XT_RATE_H #define _XT_RATE_H -#include <linux/types.h> +#include "linux/types.h" /* timings are in milliseconds. */ #define XT_LIMIT_SCALE 10000 diff --git a/include/linux/netfilter/xt_mark.h b/include/linux/netfilter/xt_mark.h index ecadc40..54cc417 100644 --- a/include/linux/netfilter/xt_mark.h +++ b/include/linux/netfilter/xt_mark.h @@ -1,7 +1,7 @@ #ifndef _XT_MARK_H #define _XT_MARK_H -#include <linux/types.h> +#include "linux/types.h" struct xt_mark_tginfo2 { __u32 mark, mask; diff --git a/include/linux/netfilter/xt_multiport.h b/include/linux/netfilter/xt_multiport.h index 5b7e72d..bccec71 100644 --- a/include/linux/netfilter/xt_multiport.h +++ b/include/linux/netfilter/xt_multiport.h @@ -1,7 +1,7 @@ #ifndef _XT_MULTIPORT_H #define _XT_MULTIPORT_H -#include <linux/types.h> +#include "linux/types.h" enum xt_multiport_flags { XT_MULTIPORT_SOURCE, diff --git a/include/linux/netfilter/xt_nfacct.h b/include/linux/netfilter/xt_nfacct.h index 59ab00d..6e8c31a 100644 --- a/include/linux/netfilter/xt_nfacct.h +++ b/include/linux/netfilter/xt_nfacct.h @@ -1,7 +1,7 @@ #ifndef _XT_NFACCT_MATCH_H #define _XT_NFACCT_MATCH_H -#include <linux/types.h> +#include "linux/types.h" #ifndef NFACCT_NAME_MAX #define NFACCT_NAME_MAX 32 diff --git a/include/linux/netfilter/xt_osf.h b/include/linux/netfilter/xt_osf.h index d0c4c76..1d22fdc 100644 --- a/include/linux/netfilter/xt_osf.h +++ b/include/linux/netfilter/xt_osf.h @@ -20,7 +20,7 @@ #ifndef _XT_OSF_H #define _XT_OSF_H -#include <linux/types.h> +#include "linux/types.h" #define MAXGENRELEN 32 diff --git a/include/linux/netfilter/xt_owner.h b/include/linux/netfilter/xt_owner.h index 2081761..9a74f2b 100644 --- a/include/linux/netfilter/xt_owner.h +++ b/include/linux/netfilter/xt_owner.h @@ -1,7 +1,7 @@ #ifndef _XT_OWNER_MATCH_H #define _XT_OWNER_MATCH_H -#include <linux/types.h> +#include "linux/types.h" enum { XT_OWNER_UID = 1 << 0, diff --git a/include/linux/netfilter/xt_physdev.h b/include/linux/netfilter/xt_physdev.h index 7d53660..6c44008 100644 --- a/include/linux/netfilter/xt_physdev.h +++ b/include/linux/netfilter/xt_physdev.h @@ -1,7 +1,7 @@ #ifndef _XT_PHYSDEV_H #define _XT_PHYSDEV_H -#include <linux/types.h> +#include "linux/types.h" #define XT_PHYSDEV_OP_IN 0x01 diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h index d246eac..695a9fd 100644 --- a/include/linux/netfilter/xt_policy.h +++ b/include/linux/netfilter/xt_policy.h @@ -1,7 +1,7 @@ #ifndef _XT_POLICY_H #define _XT_POLICY_H -#include <linux/types.h> +#include "linux/types.h" #define XT_POLICY_MAX_ELEM 4 diff --git a/include/linux/netfilter/xt_quota.h b/include/linux/netfilter/xt_quota.h index 9314723..9c5e03c 100644 --- a/include/linux/netfilter/xt_quota.h +++ b/include/linux/netfilter/xt_quota.h @@ -1,7 +1,7 @@ #ifndef _XT_QUOTA_H #define _XT_QUOTA_H -#include <linux/types.h> +#include "linux/types.h" enum xt_quota_flags { XT_QUOTA_INVERT = 0x1, diff --git a/include/linux/netfilter/xt_rateest.h b/include/linux/netfilter/xt_rateest.h index d40a619..1ce41fa 100644 --- a/include/linux/netfilter/xt_rateest.h +++ b/include/linux/netfilter/xt_rateest.h @@ -1,7 +1,7 @@ #ifndef _XT_RATEEST_MATCH_H #define _XT_RATEEST_MATCH_H -#include <linux/types.h> +#include "linux/types.h" enum xt_rateest_match_flags { XT_RATEEST_MATCH_INVERT = 1<<0, diff --git a/include/linux/netfilter/xt_realm.h b/include/linux/netfilter/xt_realm.h index d4a82ee..39b2bbf 100644 --- a/include/linux/netfilter/xt_realm.h +++ b/include/linux/netfilter/xt_realm.h @@ -1,7 +1,7 @@ #ifndef _XT_REALM_H #define _XT_REALM_H -#include <linux/types.h> +#include "linux/types.h" struct xt_realm_info { __u32 id; diff --git a/include/linux/netfilter/xt_recent.h b/include/linux/netfilter/xt_recent.h index 6ef36c1..fb2b55b 100644 --- a/include/linux/netfilter/xt_recent.h +++ b/include/linux/netfilter/xt_recent.h @@ -1,7 +1,7 @@ #ifndef _LINUX_NETFILTER_XT_RECENT_H #define _LINUX_NETFILTER_XT_RECENT_H 1 -#include <linux/types.h> +#include "linux/types.h" enum { XT_RECENT_CHECK = 1 << 0, diff --git a/include/linux/netfilter/xt_rpfilter.h b/include/linux/netfilter/xt_rpfilter.h index 672b605..ec2a5cd 100644 --- a/include/linux/netfilter/xt_rpfilter.h +++ b/include/linux/netfilter/xt_rpfilter.h @@ -1,7 +1,7 @@ #ifndef _XT_RPATH_H #define _XT_RPATH_H -#include <linux/types.h> +#include "linux/types.h" enum { XT_RPFILTER_LOOSE = 1 << 0, diff --git a/include/linux/netfilter/xt_sctp.h b/include/linux/netfilter/xt_sctp.h index a501e61..938704d 100644 --- a/include/linux/netfilter/xt_sctp.h +++ b/include/linux/netfilter/xt_sctp.h @@ -1,7 +1,7 @@ #ifndef _XT_SCTP_H_ #define _XT_SCTP_H_ -#include <linux/types.h> +#include "linux/types.h" #define XT_SCTP_SRC_PORTS 0x01 #define XT_SCTP_DEST_PORTS 0x02 diff --git a/include/linux/netfilter/xt_set.h b/include/linux/netfilter/xt_set.h index 4210c9b..a3193c9 100644 --- a/include/linux/netfilter/xt_set.h +++ b/include/linux/netfilter/xt_set.h @@ -1,8 +1,8 @@ #ifndef _XT_SET_H #define _XT_SET_H -#include <linux/types.h> -#include <linux/netfilter/ipset/ip_set.h> +#include "linux/types.h" +#include "linux/netfilter/ipset/ip_set.h" /* Revision 0 interface: backward compatible with netfilter/iptables */ diff --git a/include/linux/netfilter/xt_socket.h b/include/linux/netfilter/xt_socket.h index 87644f8..10c0215 100644 --- a/include/linux/netfilter/xt_socket.h +++ b/include/linux/netfilter/xt_socket.h @@ -1,7 +1,7 @@ #ifndef _XT_SOCKET_H #define _XT_SOCKET_H -#include <linux/types.h> +#include "linux/types.h" enum { XT_SOCKET_TRANSPARENT = 1 << 0, diff --git a/include/linux/netfilter/xt_statistic.h b/include/linux/netfilter/xt_statistic.h index 4e983ef..24adc0f 100644 --- a/include/linux/netfilter/xt_statistic.h +++ b/include/linux/netfilter/xt_statistic.h @@ -1,7 +1,7 @@ #ifndef _XT_STATISTIC_H #define _XT_STATISTIC_H -#include <linux/types.h> +#include "linux/types.h" enum xt_statistic_mode { XT_STATISTIC_MODE_RANDOM, diff --git a/include/linux/netfilter/xt_string.h b/include/linux/netfilter/xt_string.h index 235347c..4dc520e 100644 --- a/include/linux/netfilter/xt_string.h +++ b/include/linux/netfilter/xt_string.h @@ -1,7 +1,7 @@ #ifndef _XT_STRING_H #define _XT_STRING_H -#include <linux/types.h> +#include "linux/types.h" #define XT_STRING_MAX_PATTERN_SIZE 128 #define XT_STRING_MAX_ALGO_NAME_SIZE 16 diff --git a/include/linux/netfilter/xt_tcpmss.h b/include/linux/netfilter/xt_tcpmss.h index fbac56b..340a860 100644 --- a/include/linux/netfilter/xt_tcpmss.h +++ b/include/linux/netfilter/xt_tcpmss.h @@ -1,7 +1,7 @@ #ifndef _XT_TCPMSS_MATCH_H #define _XT_TCPMSS_MATCH_H -#include <linux/types.h> +#include "linux/types.h" struct xt_tcpmss_match_info { __u16 mss_min, mss_max; diff --git a/include/linux/netfilter/xt_tcpudp.h b/include/linux/netfilter/xt_tcpudp.h index 38aa7b3..d23becd 100644 --- a/include/linux/netfilter/xt_tcpudp.h +++ b/include/linux/netfilter/xt_tcpudp.h @@ -1,7 +1,7 @@ #ifndef _XT_TCPUDP_H #define _XT_TCPUDP_H -#include <linux/types.h> +#include "linux/types.h" /* TCP matching stuff */ struct xt_tcp { diff --git a/include/linux/netfilter/xt_time.h b/include/linux/netfilter/xt_time.h index a21d5bf..d69c4d9 100644 --- a/include/linux/netfilter/xt_time.h +++ b/include/linux/netfilter/xt_time.h @@ -1,7 +1,7 @@ #ifndef _XT_TIME_H #define _XT_TIME_H 1 -#include <linux/types.h> +#include "linux/types.h" struct xt_time_info { __u32 date_start; diff --git a/include/linux/netfilter/xt_u32.h b/include/linux/netfilter/xt_u32.h index 04d1bfe..d195ef7 100644 --- a/include/linux/netfilter/xt_u32.h +++ b/include/linux/netfilter/xt_u32.h @@ -1,7 +1,7 @@ #ifndef _XT_U32_H #define _XT_U32_H 1 -#include <linux/types.h> +#include "linux/types.h" enum xt_u32_ops { XT_U32_AND, diff --git a/include/linux/netfilter_arp.h b/include/linux/netfilter_arp.h index 92bc6dd..3d207f6 100644 --- a/include/linux/netfilter_arp.h +++ b/include/linux/netfilter_arp.h @@ -5,7 +5,7 @@ * (C)2002 Rusty Russell IBM -- This code is GPL. */ -#include <linux/netfilter.h> +#include "linux/netfilter.h" /* There is no PF_ARP. */ #define NF_ARP 0 diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index bb1ec64..d23d3b6 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h @@ -9,11 +9,11 @@ #ifndef _ARPTABLES_H #define _ARPTABLES_H -#include <linux/types.h> +#include "linux/types.h" -#include <linux/netfilter_arp.h> +#include "linux/netfilter_arp.h" -#include <linux/netfilter/x_tables.h> +#include "linux/netfilter/x_tables.h" #define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN #define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/linux/netfilter_arp/arpt_mangle.h index 250f502..aad5fe0 100644 --- a/include/linux/netfilter_arp/arpt_mangle.h +++ b/include/linux/netfilter_arp/arpt_mangle.h @@ -1,6 +1,6 @@ #ifndef _ARPT_MANGLE_H #define _ARPT_MANGLE_H -#include <linux/netfilter_arp/arp_tables.h> +#include "linux/netfilter_arp/arp_tables.h" #define ARPT_MANGLE_ADDR_LEN_MAX sizeof(struct in_addr) struct arpt_mangle diff --git a/include/linux/netfilter_bridge/ebt_802_3.h b/include/linux/netfilter_bridge/ebt_802_3.h index f37522a..39b1255 100644 --- a/include/linux/netfilter_bridge/ebt_802_3.h +++ b/include/linux/netfilter_bridge/ebt_802_3.h @@ -1,7 +1,7 @@ #ifndef _UAPI__LINUX_BRIDGE_EBT_802_3_H #define _UAPI__LINUX_BRIDGE_EBT_802_3_H -#include <linux/types.h> +#include "linux/types.h" #include <linux/if_ether.h> #define EBT_802_3_SAP 0x01 diff --git a/include/linux/netfilter_bridge/ebt_ip.h b/include/linux/netfilter_bridge/ebt_ip.h index c4bbc41..ee81d67 100644 --- a/include/linux/netfilter_bridge/ebt_ip.h +++ b/include/linux/netfilter_bridge/ebt_ip.h @@ -15,7 +15,7 @@ #ifndef __LINUX_BRIDGE_EBT_IP_H #define __LINUX_BRIDGE_EBT_IP_H -#include <linux/types.h> +#include "linux/types.h" #define EBT_IP_SOURCE 0x01 #define EBT_IP_DEST 0x02 diff --git a/include/linux/netfilter_bridge/ebt_mark_m.h b/include/linux/netfilter_bridge/ebt_mark_m.h index 410f9e5..20083b1 100644 --- a/include/linux/netfilter_bridge/ebt_mark_m.h +++ b/include/linux/netfilter_bridge/ebt_mark_m.h @@ -1,7 +1,7 @@ #ifndef __LINUX_BRIDGE_EBT_MARK_M_H #define __LINUX_BRIDGE_EBT_MARK_M_H -#include <linux/types.h> +#include "linux/types.h" #define EBT_MARK_AND 0x01 #define EBT_MARK_OR 0x02 diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h index 4d7ba3e..53a272e 100644 --- a/include/linux/netfilter_ipv4.h +++ b/include/linux/netfilter_ipv4.h @@ -5,7 +5,7 @@ * (C)1998 Rusty Russell -- This code is GPL. */ -#include <linux/netfilter.h> +#include "linux/netfilter.h" /* only for userspace compatibility */ /* IP Cache bits. */ diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index 38542b4..7c81386 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -15,11 +15,11 @@ #ifndef _IPTABLES_H #define _IPTABLES_H -#include <linux/types.h> +#include "linux/types.h" -#include <linux/netfilter_ipv4.h> +#include "linux/netfilter_ipv4.h" -#include <linux/netfilter/x_tables.h> +#include "linux/netfilter/x_tables.h" #define IPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN #define IPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN @@ -36,7 +36,7 @@ #define IPT_RETURN XT_RETURN /* This group is older than old (iptables < v1.4.0-rc1~89) */ -#include <linux/netfilter/xt_tcpudp.h> +#include "linux/netfilter/xt_tcpudp.h" #define ipt_udp xt_udp #define ipt_tcp xt_tcp #define IPT_TCP_INV_SRCPT XT_TCP_INV_SRCPT diff --git a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h index c6a204c..819628e 100644 --- a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h +++ b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h @@ -1,7 +1,7 @@ #ifndef _IPT_CLUSTERIP_H_target #define _IPT_CLUSTERIP_H_target -#include <linux/types.h> +#include "linux/types.h" enum clusterip_hashmode { CLUSTERIP_HASHMODE_SIP = 0, diff --git a/include/linux/netfilter_ipv4/ipt_ECN.h b/include/linux/netfilter_ipv4/ipt_ECN.h index bb88d53..189b1c5 100644 --- a/include/linux/netfilter_ipv4/ipt_ECN.h +++ b/include/linux/netfilter_ipv4/ipt_ECN.h @@ -9,8 +9,8 @@ #ifndef _IPT_ECN_TARGET_H #define _IPT_ECN_TARGET_H -#include <linux/types.h> -#include <linux/netfilter/xt_DSCP.h> +#include "linux/types.h" +#include "linux/netfilter/xt_DSCP.h" #define IPT_ECN_IP_MASK (~XT_DSCP_MASK) diff --git a/include/linux/netfilter_ipv4/ipt_TTL.h b/include/linux/netfilter_ipv4/ipt_TTL.h index f6ac169..7ca5956 100644 --- a/include/linux/netfilter_ipv4/ipt_TTL.h +++ b/include/linux/netfilter_ipv4/ipt_TTL.h @@ -4,7 +4,7 @@ #ifndef _IPT_TTL_H #define _IPT_TTL_H -#include <linux/types.h> +#include "linux/types.h" enum { IPT_TTL_SET = 0, diff --git a/include/linux/netfilter_ipv4/ipt_addrtype.h b/include/linux/netfilter_ipv4/ipt_addrtype.h index 0da4223..0d347c1 100644 --- a/include/linux/netfilter_ipv4/ipt_addrtype.h +++ b/include/linux/netfilter_ipv4/ipt_addrtype.h @@ -1,7 +1,7 @@ #ifndef _IPT_ADDRTYPE_H #define _IPT_ADDRTYPE_H -#include <linux/types.h> +#include "linux/types.h" enum { IPT_ADDRTYPE_INVERT_SOURCE = 0x0001, diff --git a/include/linux/netfilter_ipv4/ipt_ah.h b/include/linux/netfilter_ipv4/ipt_ah.h index 4e02bb0..3fd0356 100644 --- a/include/linux/netfilter_ipv4/ipt_ah.h +++ b/include/linux/netfilter_ipv4/ipt_ah.h @@ -1,7 +1,7 @@ #ifndef _IPT_AH_H #define _IPT_AH_H -#include <linux/types.h> +#include "linux/types.h" struct ipt_ah { __u32 spis[2]; /* Security Parameter Index */ diff --git a/include/linux/netfilter_ipv4/ipt_realm.h b/include/linux/netfilter_ipv4/ipt_realm.h index b3996ea..94ebc35 100644 --- a/include/linux/netfilter_ipv4/ipt_realm.h +++ b/include/linux/netfilter_ipv4/ipt_realm.h @@ -1,7 +1,7 @@ #ifndef _IPT_REALM_H #define _IPT_REALM_H -#include <linux/netfilter/xt_realm.h> +#include "linux/netfilter/xt_realm.h" #define ipt_realm_info xt_realm_info #endif /* _IPT_REALM_H */ diff --git a/include/linux/netfilter_ipv4/ipt_ttl.h b/include/linux/netfilter_ipv4/ipt_ttl.h index 37bee44..e34e69f 100644 --- a/include/linux/netfilter_ipv4/ipt_ttl.h +++ b/include/linux/netfilter_ipv4/ipt_ttl.h @@ -4,7 +4,7 @@ #ifndef _IPT_TTL_H #define _IPT_TTL_H -#include <linux/types.h> +#include "linux/types.h" enum { IPT_TTL_EQ = 0, /* equals */ diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h index f155b9d..cf74152 100644 --- a/include/linux/netfilter_ipv6.h +++ b/include/linux/netfilter_ipv6.h @@ -8,7 +8,7 @@ * it's amazing what adding a bunch of 6s can do =8^) */ -#include <linux/netfilter.h> +#include "linux/netfilter.h" /* only for userspace compatibility */ /* IP Cache bits. */ diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index 640a1d0..f75f043 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -15,11 +15,11 @@ #ifndef _IP6_TABLES_H #define _IP6_TABLES_H -#include <linux/types.h> +#include "linux/types.h" -#include <linux/netfilter_ipv6.h> +#include "linux/netfilter_ipv6.h" -#include <linux/netfilter/x_tables.h> +#include "linux/netfilter/x_tables.h" #define IP6T_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN #define IP6T_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN @@ -36,7 +36,7 @@ #define IP6T_RETURN XT_RETURN /* Pre-iptables-1.4.0 */ -#include <linux/netfilter/xt_tcpudp.h> +#include "linux/netfilter/xt_tcpudp.h" #define ip6t_tcp xt_tcp #define ip6t_udp xt_udp #define IP6T_TCP_INV_SRCPT XT_TCP_INV_SRCPT diff --git a/include/linux/netfilter_ipv6/ip6t_HL.h b/include/linux/netfilter_ipv6/ip6t_HL.h index ebd8ead..9e4e9a9 100644 --- a/include/linux/netfilter_ipv6/ip6t_HL.h +++ b/include/linux/netfilter_ipv6/ip6t_HL.h @@ -5,7 +5,7 @@ #ifndef _IP6T_HL_H #define _IP6T_HL_H -#include <linux/types.h> +#include "linux/types.h" enum { IP6T_HL_SET = 0, diff --git a/include/linux/netfilter_ipv6/ip6t_NPT.h b/include/linux/netfilter_ipv6/ip6t_NPT.h index f763355..8b7a54c 100644 --- a/include/linux/netfilter_ipv6/ip6t_NPT.h +++ b/include/linux/netfilter_ipv6/ip6t_NPT.h @@ -1,8 +1,8 @@ #ifndef __NETFILTER_IP6T_NPT #define __NETFILTER_IP6T_NPT -#include <linux/types.h> -#include <linux/netfilter.h> +#include "linux/types.h" +#include "linux/netfilter.h" struct ip6t_npt_tginfo { union nf_inet_addr src_pfx; diff --git a/include/linux/netfilter_ipv6/ip6t_REJECT.h b/include/linux/netfilter_ipv6/ip6t_REJECT.h index cd2e940..d2ee6b3 100644 --- a/include/linux/netfilter_ipv6/ip6t_REJECT.h +++ b/include/linux/netfilter_ipv6/ip6t_REJECT.h @@ -1,7 +1,7 @@ #ifndef _IP6T_REJECT_H #define _IP6T_REJECT_H -#include <linux/types.h> +#include "linux/types.h" enum ip6t_reject_with { IP6T_ICMP6_NO_ROUTE, diff --git a/include/linux/netfilter_ipv6/ip6t_ah.h b/include/linux/netfilter_ipv6/ip6t_ah.h index 5da2b65..ad2ba8f 100644 --- a/include/linux/netfilter_ipv6/ip6t_ah.h +++ b/include/linux/netfilter_ipv6/ip6t_ah.h @@ -1,7 +1,7 @@ #ifndef _IP6T_AH_H #define _IP6T_AH_H -#include <linux/types.h> +#include "linux/types.h" struct ip6t_ah { __u32 spis[2]; /* Security Parameter Index */ diff --git a/include/linux/netfilter_ipv6/ip6t_frag.h b/include/linux/netfilter_ipv6/ip6t_frag.h index b47f61b..2f2b9ad 100644 --- a/include/linux/netfilter_ipv6/ip6t_frag.h +++ b/include/linux/netfilter_ipv6/ip6t_frag.h @@ -1,7 +1,7 @@ #ifndef _IP6T_FRAG_H #define _IP6T_FRAG_H -#include <linux/types.h> +#include "linux/types.h" struct ip6t_frag { __u32 ids[2]; /* Security Parameter Index */ diff --git a/include/linux/netfilter_ipv6/ip6t_hl.h b/include/linux/netfilter_ipv6/ip6t_hl.h index 6e76dbc..c5721e8 100644 --- a/include/linux/netfilter_ipv6/ip6t_hl.h +++ b/include/linux/netfilter_ipv6/ip6t_hl.h @@ -5,7 +5,7 @@ #ifndef _IP6T_HL_H #define _IP6T_HL_H -#include <linux/types.h> +#include "linux/types.h" enum { IP6T_HL_EQ = 0, /* equals */ diff --git a/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/include/linux/netfilter_ipv6/ip6t_ipv6header.h index efae3a2..a69fb5c 100644 --- a/include/linux/netfilter_ipv6/ip6t_ipv6header.h +++ b/include/linux/netfilter_ipv6/ip6t_ipv6header.h @@ -8,7 +8,7 @@ on whether they contain certain headers */ #ifndef __IPV6HEADER_H #define __IPV6HEADER_H -#include <linux/types.h> +#include "linux/types.h" struct ip6t_ipv6header_info { __u8 matchflags; diff --git a/include/linux/netfilter_ipv6/ip6t_mh.h b/include/linux/netfilter_ipv6/ip6t_mh.h index a7729a5..57444a5 100644 --- a/include/linux/netfilter_ipv6/ip6t_mh.h +++ b/include/linux/netfilter_ipv6/ip6t_mh.h @@ -1,7 +1,7 @@ #ifndef _IP6T_MH_H #define _IP6T_MH_H -#include <linux/types.h> +#include "linux/types.h" /* MH matching stuff */ struct ip6t_mh { diff --git a/include/linux/netfilter_ipv6/ip6t_opts.h b/include/linux/netfilter_ipv6/ip6t_opts.h index 17d419a..fb5071b 100644 --- a/include/linux/netfilter_ipv6/ip6t_opts.h +++ b/include/linux/netfilter_ipv6/ip6t_opts.h @@ -1,7 +1,7 @@ #ifndef _IP6T_OPTS_H #define _IP6T_OPTS_H -#include <linux/types.h> +#include "linux/types.h" #define IP6T_OPTS_OPTSNR 16 diff --git a/include/linux/netfilter_ipv6/ip6t_rt.h b/include/linux/netfilter_ipv6/ip6t_rt.h index 7605a5f..0b61c4b 100644 --- a/include/linux/netfilter_ipv6/ip6t_rt.h +++ b/include/linux/netfilter_ipv6/ip6t_rt.h @@ -1,7 +1,7 @@ #ifndef _IP6T_RT_H #define _IP6T_RT_H -#include <linux/types.h> +#include "linux/types.h" /*#include <linux/in6.h>*/ #define IP6T_RT_HOPS 16 diff --git a/include/linux/netfilter_ipv6/ip6t_srh.h b/include/linux/netfilter_ipv6/ip6t_srh.h index 3bfe411..fefa7d7 100644 --- a/include/linux/netfilter_ipv6/ip6t_srh.h +++ b/include/linux/netfilter_ipv6/ip6t_srh.h @@ -1,8 +1,8 @@ #ifndef _IP6T_SRH_H #define _IP6T_SRH_H -#include <linux/types.h> -#include <linux/netfilter.h> +#include "linux/types.h" +#include "linux/netfilter.h" /* Values for "mt_flags" field in struct ip6t_srh */ #define IP6T_SRH_NEXTHDR 0x0001 diff --git a/include/xtables.h b/include/xtables.h index 743906b..8e0772c 100644 --- a/include/xtables.h +++ b/include/xtables.h @@ -14,9 +14,9 @@ #include <stdint.h> #include <netinet/in.h> #include <net/if.h> -#include <linux/types.h> -#include <linux/netfilter.h> -#include <linux/netfilter/x_tables.h> +#include "linux/types.h" +#include "linux/netfilter.h" +#include "linux/netfilter/x_tables.h" #ifndef IPPROTO_SCTP #define IPPROTO_SCTP 132 diff --git a/iptables/getethertype.c b/iptables/getethertype.c index 027ef4a..a260412 100644 --- a/iptables/getethertype.c +++ b/iptables/getethertype.c @@ -43,7 +43,7 @@ #include <netinet/ether.h> #include <net/ethernet.h> -#include <ebtables/ethernetdb.h> +#include "ebtables/ethernetdb.h" #define MAXALIASES 35 diff --git a/iptables/ip6tables-standalone.c b/iptables/ip6tables-standalone.c index 35d2d9a..534f3bf 100644 --- a/iptables/ip6tables-standalone.c +++ b/iptables/ip6tables-standalone.c @@ -34,7 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <errno.h> -#include <ip6tables.h> +#include "ip6tables.h" #include "ip6tables-multi.h" int diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c index 6954c25..22a15d6 100644 --- a/iptables/ip6tables.c +++ b/iptables/ip6tables.c @@ -35,8 +35,8 @@ #include <stdarg.h> #include <stdbool.h> #include <limits.h> -#include <ip6tables.h> -#include <xtables.h> +#include "ip6tables.h" +#include "xtables.h" #include <arpa/inet.h> #include <unistd.h> #include <fcntl.h> diff --git a/iptables/iptables-standalone.c b/iptables/iptables-standalone.c index c211fb7..fce1c7a 100644 --- a/iptables/iptables-standalone.c +++ b/iptables/iptables-standalone.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <iptables.h> +#include "iptables.h" #include "iptables-multi.h" int diff --git a/iptables/iptables-xml.c b/iptables/iptables-xml.c index 69c19a6..03f968b 100644 --- a/iptables/iptables-xml.c +++ b/iptables/iptables-xml.c @@ -15,7 +15,7 @@ #include "iptables.h" #include "libiptc/libiptc.h" #include "xtables-multi.h" -#include <xtables.h> +#include "xtables.h" #ifdef DEBUG #define DEBUGP(x, args...) fprintf(stderr, x, ## args) diff --git a/iptables/iptables.c b/iptables/iptables.c index acacf18..82880a0 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -36,8 +36,8 @@ #include <stdarg.h> #include <limits.h> #include <unistd.h> -#include <iptables.h> -#include <xtables.h> +#include "iptables.h" +#include "xtables.h" #include <fcntl.h> #include "xshared.h" diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 4eacc61..a8ac218 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -16,13 +16,13 @@ #include <netdb.h> #include <net/if_arp.h> -#include <xtables.h> -#include <libiptc/libxtc.h> +#include "xtables.h" +#include "libiptc/libxtc.h" #include <net/if_arp.h> #include <netinet/if_ether.h> -#include <linux/netfilter_arp/arp_tables.h> -#include <linux/netfilter/nf_tables.h> +#include "linux/netfilter_arp/arp_tables.h" +#include "linux/netfilter/nf_tables.h" #include "nft-shared.h" #include "nft-arp.h" diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c index 917d802..8711819 100644 --- a/iptables/nft-bridge.c +++ b/iptables/nft-bridge.c @@ -13,10 +13,10 @@ #include <netinet/ether.h> #include <inttypes.h> -#include <xtables.h> -#include <libiptc/libxtc.h> -#include <linux/netfilter/nf_tables.h> -#include <ebtables/ethernetdb.h> +#include "xtables.h" +#include "libiptc/libxtc.h" +#include "linux/netfilter/nf_tables.h" +#include "ebtables/ethernetdb.h" #include "nft-shared.h" #include "nft-bridge.h" diff --git a/iptables/nft-bridge.h b/iptables/nft-bridge.h index 8dcb151..724647d 100644 --- a/iptables/nft-bridge.h +++ b/iptables/nft-bridge.h @@ -3,10 +3,10 @@ #include <netinet/in.h> //#include <linux/netfilter_bridge/ebtables.h> -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter/nf_tables.h> +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter/nf_tables.h" #include <net/ethernet.h> -#include <libiptc/libxtc.h> +#include "libiptc/libxtc.h" /* We use replace->flags, so we can't use the following values: * 0x01 == OPT_COMMAND, 0x02 == OPT_TABLE, 0x100 == OPT_ZERO */ diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c index bddd784..5554e80 100644 --- a/iptables/nft-ipv4.c +++ b/iptables/nft-ipv4.c @@ -19,9 +19,9 @@ #include <netinet/ip.h> #include <netdb.h> -#include <xtables.h> +#include "xtables.h" -#include <linux/netfilter/nf_tables.h> +#include "linux/netfilter/nf_tables.h" #include "nft.h" #include "nft-shared.h" diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c index 79c02e4..6020011 100644 --- a/iptables/nft-ipv6.c +++ b/iptables/nft-ipv6.c @@ -19,9 +19,9 @@ #include <netinet/ip6.h> #include <netdb.h> -#include <xtables.h> +#include "xtables.h" -#include <linux/netfilter/nf_tables.h> +#include "linux/netfilter/nf_tables.h" #include "nft.h" #include "nft-shared.h" diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c index b89a3e7..509cc3e 100644 --- a/iptables/nft-shared.c +++ b/iptables/nft-shared.c @@ -17,10 +17,10 @@ #include <netdb.h> #include <errno.h> -#include <xtables.h> +#include "xtables.h" -#include <linux/netfilter/nf_tables.h> -#include <linux/netfilter/xt_comment.h> +#include "linux/netfilter/nf_tables.h" +#include "linux/netfilter/xt_comment.h" #include <libmnl/libmnl.h> #include <libnftnl/rule.h> diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index 0108b7f..a8257aa 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -6,7 +6,7 @@ #include <libnftnl/rule.h> #include <libnftnl/expr.h> -#include <linux/netfilter_arp/arp_tables.h> +#include "linux/netfilter_arp/arp_tables.h" #include "xshared.h" diff --git a/iptables/nft.c b/iptables/nft.c index 08cbdc8..b7eec9d 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -21,22 +21,22 @@ #include <inttypes.h> #include <assert.h> -#include <xtables.h> -#include <libiptc/libxtc.h> -#include <libiptc/xtcshared.h> +#include "xtables.h" +#include "libiptc/libxtc.h" +#include "libiptc/xtcshared.h" #include <stdlib.h> #include <string.h> -#include <linux/netfilter/x_tables.h> -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> +#include "linux/netfilter/x_tables.h" +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter_ipv6/ip6_tables.h" #include <netinet/ip6.h> #include <linux/netlink.h> -#include <linux/netfilter/nfnetlink.h> -#include <linux/netfilter/nf_tables.h> -#include <linux/netfilter/nf_tables_compat.h> +#include "linux/netfilter/nfnetlink.h" +#include "linux/netfilter/nf_tables.h" +#include "linux/netfilter/nf_tables_compat.h" #include <libmnl/libmnl.h> #include <libnftnl/table.h> @@ -503,7 +503,7 @@ struct builtin_table xtables_ipv4[TABLES_MAX] = { }, }; -#include <linux/netfilter_arp.h> +#include "linux/netfilter_arp.h" struct builtin_table xtables_arp[TABLES_MAX] = { [FILTER] = { @@ -525,7 +525,7 @@ struct builtin_table xtables_arp[TABLES_MAX] = { }, }; -#include <linux/netfilter_bridge.h> +#include "linux/netfilter_bridge.h" struct builtin_table xtables_bridge[TABLES_MAX] = { [FILTER] = { diff --git a/iptables/xshared.c b/iptables/xshared.c index 06db72d..3e51bad 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -14,7 +14,7 @@ #include <sys/time.h> #include <unistd.h> #include <fcntl.h> -#include <xtables.h> +#include "xtables.h" #include <math.h> #include "xshared.h" diff --git a/iptables/xshared.h b/iptables/xshared.h index 01c0eb1..475bbf8 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -6,8 +6,8 @@ #include <stdint.h> #include <netinet/in.h> #include <net/if.h> -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter_ipv6/ip6_tables.h" enum { OPT_NONE = 0, diff --git a/iptables/xtables-arp-standalone.c b/iptables/xtables-arp-standalone.c index 6553d28..cce1790 100644 --- a/iptables/xtables-arp-standalone.c +++ b/iptables/xtables-arp-standalone.c @@ -35,9 +35,9 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <xtables.h> +#include "xtables.h" #include "nft.h" -#include <linux/netfilter_arp/arp_tables.h> +#include "linux/netfilter_arp/arp_tables.h" #include "xtables-multi.h" diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index 4a968f4..227aa9d 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -44,14 +44,14 @@ #include <sys/wait.h> #include <net/if.h> #include <netinet/ether.h> -#include <iptables.h> -#include <xtables.h> +#include "iptables.h" +#include "xtables.h" #include "xshared.h" #include "nft.h" #include "nft-arp.h" -#include <linux/netfilter_arp/arp_tables.h> +#include "linux/netfilter_arp/arp_tables.h" typedef char arpt_chainlabel[32]; diff --git a/iptables/xtables-config-parser.y b/iptables/xtables-config-parser.y index 89bfee7..be603c0 100644 --- a/iptables/xtables-config-parser.y +++ b/iptables/xtables-config-parser.y @@ -21,7 +21,7 @@ #include <libnftnl/chain.h> #include <netinet/in.h> -#include <linux/netfilter.h> +#include "linux/netfilter.h" extern char *yytext; extern int yylineno; diff --git a/iptables/xtables-eb-standalone.c b/iptables/xtables-eb-standalone.c index 914d137..bb25baa 100644 --- a/iptables/xtables-eb-standalone.c +++ b/iptables/xtables-eb-standalone.c @@ -35,8 +35,8 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <xtables.h> -#include <iptables.h> +#include "xtables.h" +#include "iptables.h" #include "nft.h" #include "xtables-multi.h" diff --git a/iptables/xtables-eb-translate.c b/iptables/xtables-eb-translate.c index d274151..a34d453 100644 --- a/iptables/xtables-eb-translate.c +++ b/iptables/xtables-eb-translate.c @@ -7,15 +7,15 @@ #include <string.h> #include <fcntl.h> #include <getopt.h> -#include <iptables.h> -#include <xtables.h> +#include "iptables.h" +#include "xtables.h" #include <netinet/ether.h> -#include <linux/netfilter_bridge.h> -#include <linux/netfilter/nf_tables.h> -#include <ebtables/ethernetdb.h> -#include <libiptc/libxtc.h> +#include "linux/netfilter_bridge.h" +#include "linux/netfilter/nf_tables.h" +#include "ebtables/ethernetdb.h" +#include "libiptc/libxtc.h" #include "xshared.h" #include "xtables-multi.h" diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index bfa66d7..66aab97 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -32,13 +32,13 @@ #include <signal.h> #include <net/if.h> #include <netinet/ether.h> -#include <iptables.h> -#include <xtables.h> +#include "iptables.h" +#include "xtables.h" -#include <linux/netfilter_bridge.h> -#include <linux/netfilter/nf_tables.h> -#include <ebtables/ethernetdb.h> -#include <libiptc/libxtc.h> +#include "linux/netfilter_bridge.h" +#include "linux/netfilter/nf_tables.h" +#include "ebtables/ethernetdb.h" +#include "libiptc/libxtc.h" #include "xshared.h" #include "nft.h" #include "nft-bridge.h" diff --git a/iptables/xtables-standalone.c b/iptables/xtables-standalone.c index 1a28c54..daa81bd 100644 --- a/iptables/xtables-standalone.c +++ b/iptables/xtables-standalone.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <iptables.h> +#include "iptables.h" #include "xtables-multi.h" #include "nft.h" diff --git a/iptables/xtables-translate.c b/iptables/xtables-translate.c index b08ac35..64e4c32 100644 --- a/iptables/xtables-translate.c +++ b/iptables/xtables-translate.c @@ -21,9 +21,9 @@ #include <stdarg.h> #include <limits.h> #include <unistd.h> -#include <iptables.h> -#include <xtables.h> -#include <libiptc/libxtc.h> +#include "iptables.h" +#include "xtables.h" +#include "libiptc/libxtc.h" #include <fcntl.h> #include <getopt.h> #include "xshared.h" diff --git a/iptables/xtables.c b/iptables/xtables.c index 7476c97..429222d 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -36,8 +36,8 @@ #include <stdarg.h> #include <limits.h> #include <unistd.h> -#include <iptables.h> -#include <xtables.h> +#include "iptables.h" +#include "xtables.h" #include <fcntl.h> #include "xshared.h" #include "nft-shared.h" diff --git a/libipq/ipq_create_handle.3 b/libipq/ipq_create_handle.3 index 11ef95c..c4f499e 100644 --- a/libipq/ipq_create_handle.3 +++ b/libipq/ipq_create_handle.3 @@ -20,7 +20,7 @@ .SH NAME ipq_create_handle, ipq_destroy_handle \(em create and destroy libipq handles. .SH SYNOPSIS -.B #include <linux/netfilter.h> +.B #include "linux/netfilter.h" .br .B #include <libipq.h> .sp diff --git a/libipq/ipq_errstr.3 b/libipq/ipq_errstr.3 index c8d67ce..b705bb0 100644 --- a/libipq/ipq_errstr.3 +++ b/libipq/ipq_errstr.3 @@ -20,7 +20,7 @@ .SH NAME ipq_errstr, ipq_perror \(em libipq error handling routines .SH SYNOPSIS -.B #include <linux/netfilter.h> +.B #include "linux/netfilter.h" .br .B #include <libipq.h> .sp diff --git a/libipq/ipq_message_type.3 b/libipq/ipq_message_type.3 index 89d8817..ebee81b 100644 --- a/libipq/ipq_message_type.3 +++ b/libipq/ipq_message_type.3 @@ -20,7 +20,7 @@ .SH NAME ipq_message_type, ipq_get_packet, ipq_getmsgerr \(em query queue messages .SH SYNOPSIS -.B #include <linux/netfilter.h> +.B #include "linux/netfilter.h" .br .B #include <libipq.h> .sp diff --git a/libipq/ipq_read.3 b/libipq/ipq_read.3 index 26ab9f9..9bde67c 100644 --- a/libipq/ipq_read.3 +++ b/libipq/ipq_read.3 @@ -20,7 +20,7 @@ .SH NAME ipq_read \(em read queue messages from ip_queue and read into supplied buffer .SH SYNOPSIS -.B #include <linux/netfilter.h> +.B #include "linux/netfilter.h" .br .B #include <libipq.h> .sp diff --git a/libipq/ipq_set_mode.3 b/libipq/ipq_set_mode.3 index 0edd3c0..cc03287 100644 --- a/libipq/ipq_set_mode.3 +++ b/libipq/ipq_set_mode.3 @@ -20,7 +20,7 @@ .SH NAME ipq_set_mode \(em set the ip_queue queuing mode .SH SYNOPSIS -.B #include <linux/netfilter.h> +.B #include "linux/netfilter.h" .br .B #include <libipq.h> .sp diff --git a/libipq/ipq_set_verdict.3 b/libipq/ipq_set_verdict.3 index 7771ed6..f4923d5 100644 --- a/libipq/ipq_set_verdict.3 +++ b/libipq/ipq_set_verdict.3 @@ -20,7 +20,7 @@ .SH NAME ipq_set_verdict \(em issue verdict and optionally modified packet to kernel .SH SYNOPSIS -.B #include <linux/netfilter.h> +.B #include "linux/netfilter.h" .br .B #include <libipq.h> .sp diff --git a/libipq/libipq.3 b/libipq/libipq.3 index 611fcdf..8929350 100644 --- a/libipq/libipq.3 +++ b/libipq/libipq.3 @@ -20,7 +20,7 @@ .SH NAME libipq \(em iptables userspace packet queuing library. .SH SYNOPSIS -.B #include <linux/netfilter.h> +.B #include "linux/netfilter.h" .br .B #include <libipq.h> .SH DESCRIPTION @@ -166,7 +166,7 @@ packets and issues NF_ACCEPT verdicts on each packet. /* * This code is GPL. */ -#include <linux/netfilter.h> +#include "linux/netfilter.h" #include <libipq.h> #include <stdio.h> diff --git a/libipq/libipq.c b/libipq/libipq.c index fb65971..b269115 100644 --- a/libipq/libipq.c +++ b/libipq/libipq.c @@ -31,9 +31,9 @@ #include <sys/time.h> #include <sys/types.h> -#include <libipq/libipq.h> +#include "libipq/libipq.h" #include <netinet/in.h> -#include <linux/netfilter.h> +#include "linux/netfilter.h" /**************************************************************************** * diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c index a6e7057..d33421c 100644 --- a/libiptc/libiptc.c +++ b/libiptc/libiptc.c @@ -34,8 +34,8 @@ #include <sys/types.h> #include <sys/socket.h> #include <stdbool.h> -#include <xtables.h> -#include <libiptc/xtcshared.h> +#include "xtables.h" +#include "libiptc/xtcshared.h" #include "linux_list.h" diff --git a/libxtables/xtables.c b/libxtables/xtables.c index f3966f1..44e3add 100644 --- a/libxtables/xtables.c +++ b/libxtables/xtables.c @@ -42,11 +42,11 @@ # define PROC_SUPER_MAGIC 0x9fa0 #endif -#include <xtables.h> +#include "xtables.h" #include <limits.h> /* INT_MAX in ip_tables.h/ip6_tables.h */ -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter_ipv6/ip6_tables.h> -#include <libiptc/libxtc.h> +#include "linux/netfilter_ipv4/ip_tables.h" +#include "linux/netfilter_ipv6/ip6_tables.h" +#include "libiptc/libxtc.h" #ifndef NO_SHARED_LIBS #include <dlfcn.h> @@ -2155,7 +2155,7 @@ void get_kernel_version(void) kernel_version = LINUX_VERSION(x, y, z); } -#include <linux/netfilter/nf_tables.h> +#include "linux/netfilter/nf_tables.h" struct xt_xlate { struct { diff --git a/utils/nfnl_osf.c b/utils/nfnl_osf.c index 720e3a3..00c9f13 100644 --- a/utils/nfnl_osf.c +++ b/utils/nfnl_osf.c @@ -37,15 +37,15 @@ #include <netinet/tcp.h> #include <linux/connector.h> -#include <linux/types.h> +#include "linux/types.h" #include <linux/netlink.h> #include <linux/rtnetlink.h> #include <linux/unistd.h> #include <libnfnetlink/libnfnetlink.h> -#include <linux/netfilter/nfnetlink.h> -#include <linux/netfilter/xt_osf.h> +#include "linux/netfilter/nfnetlink.h" +#include "linux/netfilter/xt_osf.h" #define OPTDEL ',' #define OSFPDEL ':' -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html