[PATCH] realm match inversion fixes

[PATCH] realm match inversion fixes

[Phil Oester]

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

Below is a combination of Harald's suggested fix for bugzilla
297, plus my addition which fixes the case of ! being used
before the value.  

Phil



[-- Attachment #2: patch-realm2 --]
[-- Type: text/plain, Size: 1732 bytes --]

diff -ru ipt-orig/extensions/libipt_realm.c ipt-new/extensions/libipt_realm.c
--- ipt-orig/extensions/libipt_realm.c	2004-12-28 05:11:59.000000000 -0800
+++ ipt-new/extensions/libipt_realm.c	2005-02-12 14:32:24.000000000 -0800
@@ -49,7 +49,7 @@
 	switch (c) {
 		char *end;
 	case '1':
-		check_inverse(argv[optind], &invert, &optind, 0);
+		check_inverse(argv[optind-1], &invert, &optind, 0);
 		optarg = argv[optind-1];
 		realminfo->id = strtoul(optarg, &end, 0);
 		if (*end == '/') {
@@ -70,12 +70,9 @@
 }
 
 static void
-print_realm(unsigned long id, unsigned long mask, int invert, int numeric)
+print_realm(unsigned long id, unsigned long mask)
 {
-	if (invert)
-		printf("! ");
-
-	if(mask != 0xffffffff)
+	if (mask != 0xffffffff)
 		printf("0x%lx/0x%lx ", id, mask);
 	else
 		printf("0x%lx ", id);
@@ -87,10 +84,13 @@
       const struct ipt_entry_match *match,
       int numeric)
 {
+	struct ipt_realm_info *ri = (struct ipt_realm_info *) match->data;
+
+	if (ri->invert)
+		printf("! ");
+
 	printf("REALM match ");
-	print_realm(((struct ipt_realm_info *)match->data)->id,
-		   ((struct ipt_realm_info *)match->data)->mask,
-		   ((struct ipt_realm_info *)match->data)->invert, numeric);
+	print_realm(ri->id, ri->mask);
 }
 
 
@@ -98,10 +98,13 @@
 static void
 save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 {
+	struct ipt_realm_info *ri = (struct ipt_realm_info *) match->data;
+
+	if (ri->invert)
+		printf("! ");
+
 	printf("--realm ");
-	print_realm(((struct ipt_realm_info *)match->data)->id,
-		   ((struct ipt_realm_info *)match->data)->mask,
-		   ((struct ipt_realm_info *)match->data)->invert, 0);
+	print_realm(ri->id, ri->mask);
 }
 
 /* Final check; must have specified --mark. */

Re: [PATCH] realm match inversion fixes

[Harald Welte]

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

On Sat, Feb 12, 2005 at 02:39:08PM -0800, Phil Oester wrote:
> Below is a combination of Harald's suggested fix for bugzilla
> 297, plus my addition which fixes the case of ! being used
> before the value.  

thanks, already applied to svn

-- 
- Harald Welte <laforge@netfilter.org>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

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