Add ?FORMAT 2 to Shorewall6 tcpri file

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Merge branch 'master' of ssh://gitlab.com/shorewall/code
2020-07-31 12:23:17 -07:00 · 2020-07-26 09:53:16 -07:00 · 2020-07-19 09:43:09 -07:00
2 changed files with 2 additions and 1 deletions
--- a/Shorewall6/configfiles/tcpri
+++ b/Shorewall6/configfiles/tcpri
@@ -6,5 +6,6 @@
 # See https://shorewall.org/simple_traffic_shaping.htm for additional
 # information.
 #
+?FORMAT 2
 ###############################################################################
 #BAND	PROTO	DPORT	SPORT	ADDRESS		INTERFACE	HELPER
--- a/docs/SharedConfig.xml
+++ b/docs/SharedConfig.xml
@@ -1150,7 +1150,7 @@ TCPMSS(pmtu,none) { PROTO=tcp }
      <programlisting>#TYPE			ZONE		GATEWAY			GATEWAY_ZONE
 ipsecnat {ZONE=net,  GATEWAY=$ALL, GATEWAY_ZONE=vpn }
 ipsecnat {ZONE=loc,  GATEWAY=$ALL, GATEWAY_ZONE=vpn }
-</programlisting>
+ipsecnat {ZONE=wlan, GATEWAY=$ALL, GATEWAY_ZONE=vpn }</programlisting>
    </section>

    <section>
Author	SHA1	Message	Date
Tom Eastep	070efee47a	Add ?FORMAT 2 to Shorewall6 tcpri file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2020-07-31 12:23:17 -07:00
Tom Eastep	d03146491b	Merge branch 'master' of ssh://gitlab.com/shorewall/code	2020-07-26 09:53:16 -07:00
Tom Eastep	ca19feae69	Correct tunnels file in Shared Config Article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2020-07-19 09:43:09 -07:00