Skip to contentSkip to conversation

goto update so that iptables-save and iptables -L work correctly

PATCH Applied Jonas Berlin 2 participants 2 messages Apr 13, 2005 – Apr 15, 2005 netfilter

lore
Share & tools
lore

Jonas Berlin

author
#0 lore raw

PATCH 1/1 goto update so that iptables-save and iptables -L work correctly

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The attached file is meant to go into patch-o-matic-ng/goto/

In iptables -L it will show as [goto] in the match extension part (the rightmost column). If you think it should be displayed somehow else, I'm open to suggestions.

- --
- - xkr47
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCXGjCxyF48ZTvn+4RAkWoAKCFDRH2lnUBGZZp8oP9ia0Ny1OOhACguSX5 KysCbKB06AmW+eX9bj8Hlvc=
=U7VR
-----END PGP SIGNATURE-----

iptables-save.c +1 -1
diff --exclude-from=/tmp/srcdiff.excludes.C7Vgtq -Np -ur orig-iptables-1.3.1/iptables-save.c iptables-1.3.1/iptables-save.c
@@ -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);
iptables.c +3 -0
diff --exclude-from=/tmp/srcdiff.excludes.C7Vgtq -Np -ur orig-iptables-1.3.1/iptables.c iptables-1.3.1/iptables.c
@@ -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) {
Applied
#1 lore raw
Quoted 5 lines · Jonas Berlin

The attached file is meant to go into patch-o-matic-ng/goto/

In iptables -L it will show as [goto] in the match extension part (the rightmost column). If you think it should be displayed somehow else, I'm open to suggestions.

thanks, applied (appended to goto/iptables.patch)

Signature · 5 lines
- Harald Welte <[email protected]>                 http://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