[netfilter-cvslog] r3710 - in trunk/patch-o-matic-ng/nf_conntrack/linux-2.6: include/linux/netfilter net/netfilter

laforge at netfilter.org laforge at netfilter.org
Tue Feb 15 04:25:14 CET 2005


Author: laforge at netfilter.org
Date: 2005-02-15 04:25:14 +0100 (Tue, 15 Feb 2005)
New Revision: 3710

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
Log:
[NETFILTER]: Adrian Bunk's cleanup patches

Adrian Bunk's cleanup patch, updated for after all the Rusty patches.
The ip_nat_protocol_register/unregister EXPORT_SYMBOLs() stay, as they
are used by future patches.
Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (modified)
Signed-off-by: David S. Miller <davem at davemloft.net>


Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h	2005-02-15 03:21:29 UTC (rev 3709)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h	2005-02-15 03:25:14 UTC (rev 3710)
@@ -38,8 +38,6 @@
 extern int nf_conntrack_helper_register(struct nf_conntrack_helper *);
 extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *);
 
-extern struct nf_conntrack_helper *nf_ct_find_helper(const struct nf_conntrack_tuple *tuple);
-
 /* Allocate space for an expectation: this is mandatory before calling
    nf_conntrack_expect_related. */
 extern struct nf_conntrack_expect *nf_conntrack_expect_alloc(void);

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-15 03:21:29 UTC (rev 3709)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-15 03:25:14 UTC (rev 3710)
@@ -124,7 +124,7 @@
 	return nf_ct_protos[l3proto][protocol];
 }
 
-inline void 
+void 
 nf_ct_put(struct nf_conn *ct)
 {
 	NF_CT_ASSERT(ct);
@@ -671,7 +671,7 @@
 	return nf_ct_tuple_mask_cmp(rtuple, &i->tuple, &i->mask);
 }
 
-struct nf_conntrack_helper *
+static struct nf_conntrack_helper *
 nf_ct_find_helper(const struct nf_conntrack_tuple *tuple)
 {
 	return LIST_FIND(&helpers, helper_cmp,

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c	2005-02-15 03:21:29 UTC (rev 3709)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c	2005-02-15 03:25:14 UTC (rev 3710)
@@ -38,7 +38,6 @@
 static char ftp_buffer[65536];
 
 static DECLARE_LOCK(nf_ftp_lock);
-struct module *nf_conntrack_ftp = THIS_MODULE;
 
 #define MAX_PORTS 8
 static int ports[MAX_PORTS];
@@ -653,7 +652,7 @@
 			ftp[i][j].mask.dst.protonum = 0xFFFF;
 			ftp[i][j].max_expected = 1;
 			ftp[i][j].timeout = 5 * 60;	/* 5 Minutes */
-			ftp[i][j].me = nf_conntrack_ftp;
+			ftp[i][j].me = THIS_MODULE;
 			ftp[i][j].help = help;
 			tmpname = &ftp_names[i][j][0];
 			if (ports[i] == FTP_PORT)

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c	2005-02-15 03:21:29 UTC (rev 3709)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c	2005-02-15 03:25:14 UTC (rev 3710)
@@ -63,13 +63,13 @@
 #define HOURS * 60 MINS
 #define DAYS  * 24 HOURS
 
-unsigned long nf_ct_sctp_timeout_closed            =  10 SECS;
-unsigned long nf_ct_sctp_timeout_cookie_wait       =   3 SECS;
-unsigned long nf_ct_sctp_timeout_cookie_echoed     =   3 SECS;
-unsigned long nf_ct_sctp_timeout_established       =   5 DAYS;
-unsigned long nf_ct_sctp_timeout_shutdown_sent     = 300 SECS / 1000;
-unsigned long nf_ct_sctp_timeout_shutdown_recd     = 300 SECS / 1000;
-unsigned long nf_ct_sctp_timeout_shutdown_ack_sent =   3 SECS;
+static unsigned long nf_ct_sctp_timeout_closed            =  10 SECS;
+static unsigned long nf_ct_sctp_timeout_cookie_wait       =   3 SECS;
+static unsigned long nf_ct_sctp_timeout_cookie_echoed     =   3 SECS;
+static unsigned long nf_ct_sctp_timeout_established       =   5 DAYS;
+static unsigned long nf_ct_sctp_timeout_shutdown_sent     = 300 SECS / 1000;
+static unsigned long nf_ct_sctp_timeout_shutdown_recd     = 300 SECS / 1000;
+static unsigned long nf_ct_sctp_timeout_shutdown_ack_sent =   3 SECS;
 
 static unsigned long * sctp_timeouts[]
 = { NULL,                                  /* SCTP_CONNTRACK_NONE  */

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c	2005-02-15 03:21:29 UTC (rev 3709)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c	2005-02-15 03:25:14 UTC (rev 3710)
@@ -799,7 +799,6 @@
 EXPORT_SYMBOL(nf_ct_protos);
 EXPORT_SYMBOL(nf_ct_find_proto);
 EXPORT_SYMBOL(nf_ct_l3protos);
-EXPORT_SYMBOL(nf_ct_find_helper);
 EXPORT_SYMBOL(nf_conntrack_expect_alloc);
 EXPORT_SYMBOL(nf_conntrack_expect_free);
 EXPORT_SYMBOL(nf_conntrack_expect_related);




More information about the netfilter-cvslog mailing list