Home » Mailing list archives » linux-netdev » 2009 » March » 9

[RFC 3/4] net: netfilter conntrack - add per-net functionality for SCTP protocol

Previous thread: [RFC 4/4] net: netfilter conntrack - add per-net functionality for UDPLITE protocol by Cyrill Gorcunov on Monday, March 9, 2009 - 11:16 am. (1 message)

Next thread: [RFC 2/4] net: netfilter conntrack - add per-net functionality for DCCP protocol by Cyrill Gorcunov on Monday, March 9, 2009 - 11:16 am. (10 messages)
[view original message]
From: Cyrill Gorcunov
Subject: [RFC 3/4] net: netfilter conntrack - add per-net functionality for SCTP protocol
Date: Monday, March 9, 2009 - 11:16 am

Module specific data moved into per-net site and being allocated/freed
during net namespace creation/deletion.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
 net/netfilter/nf_conntrack_proto_sctp.c |  179 ++++++++++++++++++++++++--------
 1 file changed, 139 insertions(+), 40 deletions(-)

Index: linux-2.6.git/net/netfilter/nf_conntrack_proto_sctp.c
===================================================================
--- linux-2.6.git.orig/net/netfilter/nf_conntrack_proto_sctp.c
+++ linux-2.6.git/net/netfilter/nf_conntrack_proto_sctp.c
@@ -21,6 +21,9 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
+
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_l4proto.h>
 #include <net/netfilter/nf_conntrack_ecache.h>
@@ -49,16 +52,6 @@ static const char *const sctp_conntrack_
 #define HOURS * 60 MINS
 #define DAYS  * 24 HOURS
 
-static unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX] __read_mostly = {
-	[SCTP_CONNTRACK_CLOSED]			= 10 SECS,
-	[SCTP_CONNTRACK_COOKIE_WAIT]		= 3 SECS,
-	[SCTP_CONNTRACK_COOKIE_ECHOED]		= 3 SECS,
-	[SCTP_CONNTRACK_ESTABLISHED]		= 5 DAYS,
-	[SCTP_CONNTRACK_SHUTDOWN_SENT]		= 300 SECS / 1000,
-	[SCTP_CONNTRACK_SHUTDOWN_RECD]		= 300 SECS / 1000,
-	[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT]	= 3 SECS,
-};
-
 #define sNO SCTP_CONNTRACK_NONE
 #define	sCL SCTP_CONNTRACK_CLOSED
 #define	sCW SCTP_CONNTRACK_COOKIE_WAIT
@@ -130,6 +123,25 @@ static const u8 sctp_conntracks[2][9][SC
 	}
 };
 
+/* this module per-net specifics */
+static int sctp_net_id;
+struct sctp_net {
+	unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX];
+#ifdef CONFIG_SYSCTL
+	struct ctl_table_header *sysctl_header;
+	struct ctl_table *sysctl_table;
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+	struct ctl_table_header *compat_sysctl_header;
+	struct ctl_table *compat_sysctl_table;
+#endif
+#endif
+};
+
+static inline struct sctp_net *sctp_pernet(struct net *net)
+{
+	return ...
[ message continues ]
[view original message]
From: Daniel Lezcano
Subject: Re: [RFC 3/4] net: netfilter conntrack - add per-net functionality for SCTP protocol
Date: Tuesday, March 10, 2009 - 3:21 am

--


[ message continues ]
Previous thread: [RFC 4/4] net: netfilter conntrack - add per-net functionality for UDPLITE protocol by Cyrill Gorcunov on Monday, March 9, 2009 - 11:16 am. (1 message)

Next thread: [RFC 2/4] net: netfilter conntrack - add per-net functionality for DCCP protocol by Cyrill Gorcunov on Monday, March 9, 2009 - 11:16 am. (10 messages)