[iptables] src: use NFPROTO_ constants

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Tue Nov 18 12:28:54 CET 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=03d99486d8283552705b58dc55b6085dffc38792
commit 03d99486d8283552705b58dc55b6085dffc38792
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Nov 18 12:27:54 2008 +0100
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Tue Nov 18 12:27:54 2008 +0100

    src: use NFPROTO_ constants
    
    Resync netfilter.h from the latest kernel and make use of the new
    NFPROTO_ constants that have been introduced.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit c354105d3578e3dd1ec825a57005fe60c095f7cb
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Nov 18 12:26:26 2008 +0100
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Tue Nov 18 12:26:26 2008 +0100

    src: reuse the global modprobe_program variable
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  03d99486d8283552705b58dc55b6085dffc38792 (commit)
       via  c354105d3578e3dd1ec825a57005fe60c095f7cb (commit)
      from  928c4879e3a0da9dac6159c4d0f64a868e27f6e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03d99486d8283552705b58dc55b6085dffc38792
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Nov 18 12:27:54 2008 +0100

    src: use NFPROTO_ constants
    
    Resync netfilter.h from the latest kernel and make use of the new
    NFPROTO_ constants that have been introduced.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit c354105d3578e3dd1ec825a57005fe60c095f7cb
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Nov 18 12:26:26 2008 +0100

    src: reuse the global modprobe_program variable
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

-----------------------------------------------------------------------

 extensions/libip6t_HL.c         |    2 +-
 extensions/libip6t_LOG.c        |    2 +-
 extensions/libip6t_REJECT.c     |    2 +-
 extensions/libip6t_ah.c         |    2 +-
 extensions/libip6t_dst.c        |    2 +-
 extensions/libip6t_eui64.c      |    2 +-
 extensions/libip6t_frag.c       |    2 +-
 extensions/libip6t_hbh.c        |    2 +-
 extensions/libip6t_hl.c         |    2 +-
 extensions/libip6t_icmp6.c      |    2 +-
 extensions/libip6t_ipv6header.c |    2 +-
 extensions/libip6t_mh.c         |    2 +-
 extensions/libip6t_policy.c     |    2 +-
 extensions/libip6t_rt.c         |    2 +-
 extensions/libipt_CLUSTERIP.c   |    2 +-
 extensions/libipt_DNAT.c        |    2 +-
 extensions/libipt_ECN.c         |    2 +-
 extensions/libipt_LOG.c         |    2 +-
 extensions/libipt_MASQUERADE.c  |    2 +-
 extensions/libipt_MIRROR.c      |    2 +-
 extensions/libipt_NETMAP.c      |    2 +-
 extensions/libipt_REDIRECT.c    |    2 +-
 extensions/libipt_REJECT.c      |    2 +-
 extensions/libipt_SAME.c        |    2 +-
 extensions/libipt_SET.c         |    2 +-
 extensions/libipt_SNAT.c        |    2 +-
 extensions/libipt_TTL.c         |    2 +-
 extensions/libipt_ULOG.c        |    2 +-
 extensions/libipt_addrtype.c    |    4 ++--
 extensions/libipt_ah.c          |    2 +-
 extensions/libipt_ecn.c         |    2 +-
 extensions/libipt_icmp.c        |    2 +-
 extensions/libipt_policy.c      |    2 +-
 extensions/libipt_realm.c       |    2 +-
 extensions/libipt_set.c         |    2 +-
 extensions/libipt_ttl.c         |    2 +-
 extensions/libipt_unclean.c     |    2 +-
 extensions/libxt_CONNMARK.c     |    8 ++++----
 extensions/libxt_CONNSECMARK.c  |    4 ++--
 extensions/libxt_DSCP.c         |    4 ++--
 extensions/libxt_MARK.c         |    6 +++---
 extensions/libxt_NFLOG.c        |    4 ++--
 extensions/libxt_NFQUEUE.c      |    4 ++--
 extensions/libxt_NOTRACK.c      |    4 ++--
 extensions/libxt_TCPMSS.c       |    4 ++--
 extensions/libxt_TCPOPTSTRIP.c  |    4 ++--
 extensions/libxt_TOS.c          |    6 +++---
 extensions/libxt_TPROXY.c       |    2 +-
 extensions/libxt_comment.c      |    4 ++--
 extensions/libxt_connbytes.c    |    4 ++--
 extensions/libxt_connlimit.c    |   10 +++++-----
 extensions/libxt_connmark.c     |    8 ++++----
 extensions/libxt_conntrack.c    |   18 +++++++++---------
 extensions/libxt_dccp.c         |    4 ++--
 extensions/libxt_dscp.c         |    4 ++--
 extensions/libxt_esp.c          |    4 ++--
 extensions/libxt_hashlimit.c    |    8 ++++----
 extensions/libxt_helper.c       |    4 ++--
 extensions/libxt_iprange.c      |    6 +++---
 extensions/libxt_mac.c          |    4 ++--
 extensions/libxt_multiport.c    |    8 ++++----
 extensions/libxt_owner.c        |    8 ++++----
 extensions/libxt_physdev.c      |    4 ++--
 extensions/libxt_recent.c       |    4 ++--
 extensions/libxt_sctp.c         |    4 ++--
 extensions/libxt_socket.c       |    2 +-
 extensions/libxt_state.c        |    4 ++--
 extensions/libxt_tcp.c          |    4 ++--
 extensions/libxt_tcpmss.c       |    4 ++--
 extensions/libxt_tos.c          |    6 +++---
 extensions/libxt_udp.c          |    4 ++--
 include/linux/netfilter.h       |   10 ++++++++++
 include/xtables.h.in            |    2 ++
 ip6tables-restore.c             |   10 ++++------
 ip6tables.c                     |    2 +-
 iptables-restore.c              |    9 ++++-----
 iptables.c                      |    2 +-
 libipq/ipq_create_handle.3      |    2 +-
 libipq/libipq.3                 |    2 +-
 libipq/libipq.c                 |    4 ++--
 80 files changed, 154 insertions(+), 145 deletions(-)
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 0daae5f..01bccf7 100644
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -56,8 +56,7 @@ static void print_usage(const char *name, const char *version)
 	exit(1);
 }
 
-static struct ip6tc_handle *create_handle(const char *tablename,
-                                    const char *modprobe)
+static struct ip6tc_handle *create_handle(const char *tablename)
 {
 	struct ip6tc_handle *handle;
 
@@ -65,7 +64,7 @@ static struct ip6tc_handle *create_handle(const char *tablename,
 
 	if (!handle) {
 		/* try to insmod the module if iptc_init failed */
-		load_xtables_ko(modprobe, 0);
+		load_xtables_ko(modprobe_program, 0);
 		handle = ip6tc_init(tablename);
 	}
 
@@ -124,7 +123,6 @@ int main(int argc, char *argv[])
 	int c;
 	char curtable[IP6T_TABLE_MAXNAMELEN + 1];
 	FILE *in;
-	const char *modprobe = NULL;
 	int in_table = 0, testing = 0;
 
 	program_name = "ip6tables-restore";
@@ -166,7 +164,7 @@ int main(int argc, char *argv[])
 				noflush = 1;
 				break;
 			case 'M':
-				modprobe = optarg;
+				modprobe_program = optarg;
 				break;
 		}
 	}
@@ -225,7 +223,7 @@ int main(int argc, char *argv[])
 			if (handle)
 				ip6tc_free(handle);
 
-			handle = create_handle(table, modprobe);
+			handle = create_handle(table);
 			if (noflush == 0) {
 				DEBUGP("Cleaning all chains of table '%s'\n",
 					table);
diff --git a/iptables-restore.c b/iptables-restore.c
index 12e558d..4ea9306 100644
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -55,7 +55,7 @@ static void print_usage(const char *name, const char *version)
 	exit(1);
 }
 
-static struct iptc_handle *create_handle(const char *tablename, const char *modprobe)
+static struct iptc_handle *create_handle(const char *tablename)
 {
 	struct iptc_handle *handle;
 
@@ -63,7 +63,7 @@ static struct iptc_handle *create_handle(const char *tablename, const char *modp
 
 	if (!handle) {
 		/* try to insmod the module if iptc_init failed */
-		load_xtables_ko(modprobe, 0);
+		load_xtables_ko(modprobe_program, 0);
 		handle = iptc_init(tablename);
 	}
 
@@ -124,7 +124,6 @@ main(int argc, char *argv[])
 	int c;
 	char curtable[IPT_TABLE_MAXNAMELEN + 1];
 	FILE *in;
-	const char *modprobe = NULL;
 	int in_table = 0, testing = 0;
 	const char *tablename = NULL;
 
@@ -167,7 +166,7 @@ main(int argc, char *argv[])
 				noflush = 1;
 				break;
 			case 'M':
-				modprobe = optarg;
+				modprobe_program = optarg;
 				break;
 			case 'T':
 				tablename = optarg;
@@ -231,7 +230,7 @@ main(int argc, char *argv[])
 			if (handle)
 				iptc_free(handle);
 
-			handle = create_handle(table, modprobe);
+			handle = create_handle(table);
 			if (noflush == 0) {
 				DEBUGP("Cleaning all chains of table '%s'\n",
 					table);



More information about the netfilter-cvslog mailing list