[netfilter-cvslog] r3865 - trunk/patch-o-matic-ng/goto

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-15 11:37:08 +0200 (Fri, 15 Apr 2005)
New Revision: 3865

Modified:
   trunk/patch-o-matic-ng/goto/iptables.patch
Log:
fix iptables-save/restore (Jonas Berlin)


Modified: trunk/patch-o-matic-ng/goto/iptables.patch
===================================================================
--- trunk/patch-o-matic-ng/goto/iptables.patch	2005-04-15 09:35:50 UTC (rev 3864)
+++ trunk/patch-o-matic-ng/goto/iptables.patch	2005-04-15 09:37:08 UTC (rev 3865)
@@ -87,3 +87,28 @@
  .TP
  .BR "-i, --in-interface " "[!] \fIname\fP"
  Name of an interface via which a packet was received (only for
+diff --exclude-from=/tmp/srcdiff.excludes.C7Vgtq -Np -ur orig-iptables-1.3.1/iptables-save.c iptables-1.3.1/iptables-save.c
+--- orig-iptables-1.3.1/iptables-save.c	2005-03-27 10:08:39.000000000 +0300
++++ iptables-1.3.1/iptables-save.c	2005-03-27 10:03:35.000000000 +0300
+@@ -197,7 +197,7 @@ static void print_rule(const struct ipt_
+ 	/* Print target name */	
+ 	target_name = iptc_get_target(e, h);
+ 	if (target_name && (*target_name != '\0'))
+-		printf("-j %s ", target_name);
++		printf("-%c %s ", e->ip.flags & IPT_F_GOTO ? 'g' : 'j', target_name);
+ 
+ 	/* Print targinfo part */
+ 	t = ipt_get_target((struct ipt_entry *)e);
+diff --exclude-from=/tmp/srcdiff.excludes.C7Vgtq -Np -ur orig-iptables-1.3.1/iptables.c iptables-1.3.1/iptables.c
+--- orig-iptables-1.3.1/iptables.c	2005-03-27 10:25:03.000000000 +0300
++++ iptables-1.3.1/iptables.c	2005-03-27 09:56:35.000000000 +0300
+@@ -1398,6 +1398,9 @@ print_firewall(const struct ipt_entry *f
+ 	if (format & FMT_NOTABLE)
+ 		fputs("  ", stdout);
+ 
++	if(fw->ip.flags & IPT_F_GOTO)
++		printf("[goto] ");
++
+ 	IPT_MATCH_ITERATE(fw, print_match, &fw->ip, format & FMT_NUMERIC);
+ 
+ 	if (target) {