[Resend] Userspace code related to fixed timeout patch

[Resend] Userspace code related to fixed timeout patch

[Eric Leblond]

[-- Attachment #1.1: Type: text/plain, Size: 503 bytes --]

Hi,

Fixed timeout patch
(http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=3510) has
been applied to Linus git tree but the related changes of userspace
library and tool have not been applied to netfilter.org subversion :

http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=3489
http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=3485

Is it possible to push them to subversion ?

I attach the patches for convenience.

BR,
-- 
Eric Leblond <eric@inl.fr>
INL

[-- Attachment #1.2: libnetfilter_conntrack_fixed_timeout-flag.patch --]
[-- Type: text/x-patch, Size: 590 bytes --]

Index: include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- include/libnetfilter_conntrack/libnetfilter_conntrack.h	(révision 6578)
+++ include/libnetfilter_conntrack/libnetfilter_conntrack.h	(copie de travail)
@@ -191,6 +191,11 @@
 	/* Connection is dying (removed from lists), can not be unset. */
 	IPS_DYING_BIT = 9,
 	IPS_DYING = (1 << IPS_DYING_BIT),
+
+    /* Connection has fixed timeout. */
+	IPS_FIXED_TIMEOUT_BIT = 10,
+	IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),
+
 };
 
 enum {

[-- Attachment #1.3: conntrack_fixed_timeout-flag.patch --]
[-- Type: text/x-patch, Size: 852 bytes --]

Index: src/conntrack.c
===================================================================
--- src/conntrack.c	(révision 6578)
+++ src/conntrack.c	(copie de travail)
@@ -335,13 +335,13 @@
 #define PARSE_MAX 2
 
 static struct parse_parameter {
-	char 	*parameter[5];
+	char 	*parameter[6];
 	size_t  size;
-	unsigned int value[5];
+	unsigned int value[6];
 } parse_array[PARSE_MAX] = {
-	{ {"ASSURED", "SEEN_REPLY", "UNSET", "SRC_NAT", "DST_NAT"}, 5,
+	{ {"ASSURED", "SEEN_REPLY", "UNSET", "SRC_NAT", "DST_NAT","FIXED_TIMEOUT"}, 6,
 	  { IPS_ASSURED, IPS_SEEN_REPLY, 0, 
-	    IPS_SRC_NAT_DONE, IPS_DST_NAT_DONE} },
+	    IPS_SRC_NAT_DONE, IPS_DST_NAT_DONE, IPS_FIXED_TIMEOUT} },
 	{ {"ALL", "NEW", "UPDATES", "DESTROY"}, 4,
 	  {~0U, NF_NETLINK_CONNTRACK_NEW, NF_NETLINK_CONNTRACK_UPDATE, 
 	   NF_NETLINK_CONNTRACK_DESTROY} },

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 191 bytes --]

Re: [Resend] Userspace code related to fixed timeout patch

[Patrick McHardy]

Eric Leblond wrote:
> Hi,
> 
> Fixed timeout patch
> (http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=3510) has
> been applied to Linus git tree but the related changes of userspace
> library and tool have not been applied to netfilter.org subversion :
> 
> http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=3489
> http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=3485
> 
> Is it possible to push them to subversion ?

Both applied, thanks.