[PATCH] realm: fix inversion

[PATCH] realm: fix inversion

[Simon Lodal]

Make '--realm ! id' work as advertised.
Make save() output inversion correctly so it can be parsed back in, and 
work with iptables-restore and iptables-save.


Simon Lodal



diff -ruN iptables-1.2.11.orig/extensions/libipt_realm.c 
iptables-1.2.11.realm_inversion/extensions/libipt_realm.c
--- iptables-1.2.11.orig/extensions/libipt_realm.c	Wed Sep 22 03:14:48 2004
+++ iptables-1.2.11.realm_inversion/extensions/libipt_realm.c	Wed Sep 22 
01:37:06 2004
@@ -49,7 +49,8 @@
  	switch (c) {
  		char *end;
  	case '1':
-		check_inverse(optarg, &invert, &optind, 0);
+		if (check_inverse(optarg, &invert, &optind, 0))
+			optarg = argv[optind-1];
  		realminfo->id = strtoul(optarg, &end, 0);
  		if (*end == '/') {
  			realminfo->mask = strtoul(end+1, &end, 0);
@@ -72,7 +73,7 @@
  print_realm(unsigned long id, unsigned long mask, int invert, int numeric)
  {
  	if (invert)
-		fputc('!', stdout);
+		printf("! ");

  	if(mask != 0xffffffff)
  		printf("0x%lx/0x%lx ", id, mask);

Re: [PATCH] realm: fix inversion

[Patrick McHardy]

Simon Lodal wrote:

>
> Make '--realm ! id' work as advertised.
> Make save() output inversion correctly so it can be parsed back in, 
> and work with iptables-restore and iptables-save.


Applied, thanks.

>
>
> Simon Lodal

Re: [PATCH] realm: fix inversion

[Simon Lodal]

Hmm ... just realized that inversion is generally a mess. Is there any 
kind of consensus on how to handle it, now/future?

There are 3 ways to specify inversion:

! --ip 1.2.3.4
--ip !1.2.3.4
--ip ! 1.2.3.4

None of them are both 1) documented and 2) working. Especially 
iptables-save and iptables-restore rarely works with inversion.

You should probably remove my patch in favor of a better solution for 
all modules.


Simon


Patrick McHardy skrev:
> Simon Lodal wrote:
> 
>>
>> Make '--realm ! id' work as advertised.
>> Make save() output inversion correctly so it can be parsed back in, 
>> and work with iptables-restore and iptables-save.
> 
> 
> 
> Applied, thanks.