[PATCH] Another save/restore buglet

[PATCH] Another save/restore buglet

[Tom Eastep]

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

This time, it's the CONNMARK extention that is producing saved output
that won't restore.

gateway:/etc/test# iptables-save > save
gateway:/etc/test# iptables-restore < save
iptables-restore v1.3.1: Bad MASK value `ff'
Error occurred at line: 24
Try `iptables-restore -h' or 'iptables-restore --help' for more information.
gateway:/etc/test#

Patch attached.

-Tom
-- 
Tom Eastep    \ Nothing is foolproof to a sufficiently talented fool
Shoreline,     \ http://shorewall.net
Washington USA  \ teastep@shorewall.net
PGP Public Key   \ https://lists.shorewall.net/teastep.pgp.key

[-- Attachment #2: CONNMARK.diff --]
[-- Type: text/x-patch, Size: 289 bytes --]

--- libipt_CONNMARK.c~	2005-05-04 13:44:08.000000000 -0700
+++ libipt_CONNMARK.c	2005-05-18 16:01:07.000000000 -0700
@@ -165,7 +165,7 @@
 print_mask(const char *text, unsigned long mask)
 {
 	if (mask != ~0UL)
-		printf("%s%lx", text, mask);
+		printf("%s0x%lx", text, mask);
 }
 #endif
 

Re: [PATCH] Another save/restore buglet

[Pawel Sikora]

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

On Thursday 19 of May 2005 01:10, Tom Eastep wrote:
> This time, it's the CONNMARK extention that is producing saved output
> that won't restore.
>
> gateway:/etc/test# iptables-save > save
> gateway:/etc/test# iptables-restore < save
> iptables-restore v1.3.1: Bad MASK value `ff'
> Error occurred at line: 24
> Try `iptables-restore -h' or 'iptables-restore --help' for more
> information. gateway:/etc/test#
>
> Patch attached.

You've missed the 64-bit variant ;-)

-- 
The only thing necessary for the triumph of evil
  is for good men to do nothing.
                                           - Edmund Burke

[-- Attachment #2: libipt_CONNMARK.c.diff --]
[-- Type: text/x-diff, Size: 519 bytes --]

Index: libipt_CONNMARK.c
===================================================================
--- libipt_CONNMARK.c	(revision 5883)
+++ libipt_CONNMARK.c	(working copy)
@@ -150,7 +150,7 @@
 print_mask(const char *text, unsigned long long mask)
 {
 	if (mask != ~0ULL)
-		printf("%s%llx", text, mask);
+		printf("%s0x%llx", text, mask);
 }
 
 #else
@@ -165,7 +165,7 @@
 print_mask(const char *text, unsigned long mask)
 {
 	if (mask != ~0UL)
-		printf("%s%lx", text, mask);
+		printf("%s0x%lx", text, mask);
 }
 #endif
 

Re: [PATCH] Another save/restore buglet

[Patrick McHardy]

Pawel Sikora wrote:
> On Thursday 19 of May 2005 01:10, Tom Eastep wrote:
>>
>>Patch attached.
> 
> You've missed the 64-bit variant ;-)

Applied, thanks everyone.