Skip to contentSkip to conversation

Userspace code related to fixed timeout patch

PATCH RESEND In review Eric Leblond 2 participants 2 messages Jul 1, 2006 – Jul 3, 2006 netfilter

lore
Share & tools
lore

Eric Leblond

author
#0 lore raw

PATCH RESEND 1/1 Userspace code related to fixed timeout patch

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,

Signature · 2 lines
Eric Leblond <[email protected]>
INL
libnetfilter_conntrack/libnetfilter_conntrack.h +5 -0
Index: include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
@@ -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 {
conntrack.c +4 -4
Index: src/conntrack.c
===================================================================
@@ -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} },
#1 lore raw
Quoted 11 lines · Eric Leblond

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.