Re: [PATCH] Cleanup ttl match option parsing

[Phil Oester <kernel@linuxace.com>]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

On Mon, Aug 23, 2004 at 08:54:39PM +0200, Patrick McHardy wrote:
> Phil Oester wrote:
> 
> >The below patch allows the ttl match to be used with other matches
> >without assuming it 'owns' all options.  For example, this command
> >currently causes the '...TTL option twice error':
> >
> >iptables -A foo -d 1.2.3.4 -m ttl --ttl-eq 1 -m state --state NEW -j ACCEPT
> >
> >But works with the below patch.
> >
> >This fixes bugzilla #183
> > 
> >
> I get rejects with this patch, please send it again as attachment.

Indeed -- appologies.

Attached

Phil

[-- Attachment #2: patch-ttl --]
[-- Type: text/plain, Size: 1011 bytes --]

diff -ru ipt-orig/extensions/libipt_ttl.c ipt-new/extensions/libipt_ttl.c
--- ipt-orig/extensions/libipt_ttl.c	2002-05-29 09:08:16.000000000 -0400
+++ ipt-new/extensions/libipt_ttl.c	2004-08-23 15:55:07.886209960 -0400
@@ -40,10 +40,6 @@
 	check_inverse(optarg, &invert, &optind, 0);
 	value = atoi(argv[optind-1]);
 
-	if (*flags) 
-		exit_error(PARAMETER_PROBLEM, 
-				"Can't specify TTL option twice");
-
 	if (!optarg)
 		exit_error(PARAMETER_PROBLEM,
 				"ttl: You must specify a value");
@@ -56,8 +52,6 @@
 
 			/* is 0 allowed? */
 			info->ttl = value;
-			*flags = 1;
-
 			break;
 		case '3':
 			if (invert) 
@@ -66,8 +60,6 @@
 
 			info->mode = IPT_TTL_LT;
 			info->ttl = value;
-			*flags = 1;
-
 			break;
 		case '4':
 			if (invert)
@@ -76,14 +68,17 @@
 
 			info->mode = IPT_TTL_GT;
 			info->ttl = value;
-			*flags = 1;
-
 			break;
 		default:
 			return 0;
 
 	}
 
+	if (*flags) 
+		exit_error(PARAMETER_PROBLEM, 
+				"Can't specify TTL option twice");
+	*flags = 1;
+
 	return 1;
 }