netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org, hadi@cyberus.ca
Subject: [PATCH 4/6] extensions: remove unwanted/add needed includes for IPv6 exts
Date: Sat, 21 Feb 2009 04:18:02 +0100	[thread overview]
Message-ID: <1235186284-31661-5-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1235186284-31661-1-git-send-email-jengelh@medozas.de>

Most touched files do not use anything from ip6_tables.h, so
remove that #include. multiport instead, does need it (ip6t_entry).

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/libip6t_HL.c         |    3 +--
 extensions/libip6t_LOG.c        |    1 -
 extensions/libip6t_REJECT.c     |    1 -
 extensions/libip6t_hl.c         |    1 -
 extensions/libip6t_ipv6header.c |    1 -
 extensions/libip6t_mh.c         |    1 -
 extensions/libip6t_policy.c     |    3 +--
 extensions/libxt_multiport.c    |    1 +
 8 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index ee117f1..12d8e72 100644
--- a/extensions/libip6t_HL.c
+++ b/extensions/libip6t_HL.c
@@ -5,13 +5,12 @@
  * This program is distributed under the terms of GNU GPL
  */
 
+#include <getopt.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <getopt.h>
 #include <xtables.h>
 
-#include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_HL.h>
 
 #define IP6T_HL_USED	1
diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index c6bf2a7..390cb97 100644
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -6,7 +6,6 @@
 #include <syslog.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_LOG.h>
 
 #ifndef IP6T_LOG_UID	/* Old kernel */
diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index 94013ec..527f595 100644
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -10,7 +10,6 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_REJECT.h>
 
 struct reject_names {
diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
index 2280e03..9252c3d 100644
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -12,7 +12,6 @@
 #include <getopt.h>
 #include <xtables.h>
 
-#include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_hl.h>
 
 static void hl_help(void)
diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 296bd5f..479b313 100644
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -13,7 +13,6 @@ on whether they contain certain headers */
 #include <netdb.h>
 #include <sys/types.h>
 
-#include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
 
 /* This maybe required 
diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index f476c93..9711f76 100644
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <xtables.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_mh.h>
 
 struct mh_name {
diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c
index 70f320f..0016da2 100644
--- a/extensions/libip6t_policy.c
+++ b/extensions/libip6t_policy.c
@@ -11,8 +11,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <xtables.h>
-#include <ip6tables.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <libiptc/libip6tc.h>
 #include <linux/netfilter_ipv6/ip6t_policy.h>
 
 /*
diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index 8141441..5700f8a 100644
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -8,6 +8,7 @@
 #include <xtables.h>
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
+#include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter/xt_multiport.h>
 
 /* Function which prints out usage message. */
-- 
1.6.1.3


  parent reply	other threads:[~2009-02-21  3:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-21  3:17 [pull] request for 20090220 Jan Engelhardt
2009-02-21  3:17 ` [PATCH 1/6] doc: resynchronize manpage with in-code help Jan Engelhardt
2009-02-21  3:18 ` [PATCH 2/6] libxtables: inline and remove unused OPTION_OFFSET macro Jan Engelhardt
2009-02-21  3:18 ` [PATCH 3/6] libxtables: prefix exit_error to xtables_error Jan Engelhardt
2009-02-21  7:37   ` Jesper Dangaard Brouer
2009-02-21 14:46     ` Jan Engelhardt
2009-02-23 16:46   ` Patrick McHardy
2009-02-23 16:53     ` Jan Engelhardt
2009-02-23 16:56       ` Patrick McHardy
2009-02-23 17:28         ` Jan Engelhardt
2009-02-27 19:16           ` Jan Engelhardt
2009-02-21  3:18 ` Jan Engelhardt [this message]
2009-02-21  3:18 ` [PATCH 5/6] extensions: remove unwanted/add needed includes for IPv4 exts Jan Engelhardt
2009-02-21  3:18 ` [PATCH 6/6] libxt_policy: use bounded strtoui Jan Engelhardt
2009-02-21 12:54 ` [pull] request for 20090220 jamal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1235186284-31661-5-git-send-email-jengelh@medozas.de \
    --to=jengelh@medozas.de \
    --cc=hadi@cyberus.ca \
    --cc=kaber@trash.net \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).