[PATCH] Amanda conntrack/nat module update

[netfilter@interlinx.bc.ca]

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

Hello Harald and friends,

Please find attached an update patch to patch-o-matic for my Amanda
protocol conntrack/nat helper.  This patch corrects a minor error in
the Config.in indentation as well as, and more importantly, lengthens
the timeout for the master Amanda connection from the default UDP
stream timeout (normally 180 seconds) to 300 seconds.

This is required, because the Amanda server can tell the client to go
off and do some work (i.e. estimate the size of backups at various
incremental levels) and while the client is doing the work, no
communication will occur.  It is not uncommon for a client to take in
excess of 180 seconds to do the estimates.  Indeed, on my network
here, the value of 300 seconds is sufficient while 180 is not.

Additionally, this value can be tuned at module load time with a
module parameter, "master_timeout".

I would be most appreciative if you could apply this patch to
patch-o-matic at your earliest convenience.

In case anyone is interested, this patch implements a solution to my
question in this (incorrectly subjected) mailing list posting:

http://lists.netfilter.org/pipermail/netfilter-devel/2002-October/009676.html

Thanx,
b.

-- 
Brian J. Murrell

[-- Attachment #1.2: amanda-pom.patch --]
[-- Type: text/plain, Size: 3595 bytes --]

Index: extra/amanda-conntrack-nat.patch
===================================================================
RCS file: /cvspublic/netfilter/patch-o-matic/extra/amanda-conntrack-nat.patch,v
retrieving revision 1.1
diff -u -r1.1 amanda-conntrack-nat.patch
--- extra/amanda-conntrack-nat.patch	15 Sep 2002 11:37:15 -0000	1.1
+++ extra/amanda-conntrack-nat.patch	1 Nov 2002 23:21:06 -0000
@@ -34,10 +34,10 @@
 diff -uNr linux-2.4.18-6mdk-pom-clean/net/ipv4/netfilter/ip_conntrack_amanda.c linux-2.4.18-6mdkuml-48um-pom/net/ipv4/netfilter/ip_conntrack_amanda.c
 --- linux-2.4.18-6mdk-pom-clean/net/ipv4/netfilter/ip_conntrack_amanda.c	1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.4.18-6mdkuml-48um-pom/net/ipv4/netfilter/ip_conntrack_amanda.c	2002-08-16 04:24:25.000000000 -0400
-@@ -0,0 +1,219 @@
-+/* Amanda extension for IP connection tracking, Version 0.1
+@@ -0,0 +1,233 @@
++/* Amanda extension for IP connection tracking, Version 0.2
 + * (C) 2002 by Brian J. Murrell <netfilter@interlinx.bc.ca>
-+ * based on HW's ip_conntrack_irc.c	as well as other modules
++ * based on HW's ip_conntrack_irc.c as well as other modules
 + *
 + *      This program is free software; you can redistribute it and/or
 + *      modify it under the terms of the GNU General Public License
@@ -45,7 +45,13 @@
 + *      2 of the License, or (at your option) any later version.
 + *
 + *	Module load syntax:
-+ * 	insmod ip_conntrack_amanda.o
++ * 	insmod ip_conntrack_amanda.o [master_timeout=n]
++ *	
++ *	Where master_timeout is the timeout (in seconds) of the master
++ *	connection (port 10080).  This defaults to 5 minutes but if
++ *	your clients take longer than 5 minutes to do their work
++ *	before getting back to the Amanda server, you can increase
++ *	this value.
 + *
 + */
 +
@@ -59,9 +65,13 @@
 +#include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 +#include <linux/netfilter_ipv4/ip_conntrack_amanda.h>
 +
++static unsigned int master_timeout = 300;
++
 +MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");
 +MODULE_DESCRIPTION("Amanda connection tracking module");
 +MODULE_LICENSE("GPL");
++MODULE_PARM(master_timeout, "i");
++MODULE_PARM_DESC(master_timeout, "timeout for the master connection");
 +
 +DECLARE_LOCK(ip_amanda_lock);
 +struct module *ip_conntrack_amanda = THIS_MODULE;
@@ -97,6 +107,10 @@
 +	/* Can't track connections formed before we registered */
 +	if (!info)
 +		return NF_ACCEPT;
++
++	/* increase the UDP timeout of the master connection as replies from
++	 * Amanda clients to the server can be quite delayed */
++	ip_ct_refresh(ct, master_timeout * HZ);
 +
 +	/* If packet is coming from Amanda server */
 +	if (dir == IP_CT_DIR_ORIGINAL)
Index: extra/amanda-conntrack-nat.patch.config.in-2
===================================================================
RCS file: /cvspublic/netfilter/patch-o-matic/extra/amanda-conntrack-nat.patch.config.in-2,v
retrieving revision 1.1
diff -u -r1.1 amanda-conntrack-nat.patch.config.in-2
--- extra/amanda-conntrack-nat.patch.config.in-2	15 Sep 2002 11:37:15 -0000	1.1
+++ extra/amanda-conntrack-nat.patch.config.in-2	1 Nov 2002 23:21:06 -0000
@@ -1,6 +1,6 @@
       dep_tristate '    REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
       if [ "$CONFIG_IP_NF_AMANDA" = "m" ]; then
-       define_tristate CONFIG_IP_NF_NAT_AMANDA m
+        define_tristate CONFIG_IP_NF_NAT_AMANDA m
       else
         if [ "$CONFIG_IP_NF_AMANDA" = "y" ]; then
           define_tristate CONFIG_IP_NF_NAT_AMANDA $CONFIG_IP_NF_NAT

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]