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-25 18:57:19 -07:00 · 2020-07-19 09:43:09 -07:00 · 2020-07-18 17:05:51 -07:00 · 2020-07-18 17:01:33 -07:00
5 changed files with 8 additions and 3 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/FAQ.xml
+++ b/docs/FAQ.xml
@@ -2592,7 +2592,7 @@ eth0            External        50mbit:200kb            5.0mbit:100kb:200ms:100m
      <programlisting><emphasis role="bold">ethtool -K eth<emphasis>N</emphasis> tso off gso off</emphasis></programlisting>
    </section>

-    <section>
+    <section id="faq97a">
      <title>(FAQ 97a) I enable Shorewall traffic shaping and now my download
      rate is way below what I specified</title>

--- 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>
--- a/docs/docs-targetname
+++ b/docs/docs-targetname
@@ -1 +1 @@
-5.2.7-Beta1
+5.2.7-RC1
--- a/docs/simple_traffic_shaping.xml
+++ b/docs/simple_traffic_shaping.xml
@@ -366,5 +366,9 @@ COMMENT And place echo requests in band 1 to avoid false line-down reports
      <para>Please note that Shorewall numbers the bands 1-3 whereas PRIO(8)
      refers to them as bands 0-2.</para>
    </caution>
+
+    <para>If you encounter performance problems after enabling simple traffic
+    shaping, check out <ulink url="FAQ.htm#faq97">FAQ 97</ulink> and <ulink
+    url="FAQ.htm#faq97a">FAQ97a</ulink></para>
  </section>
 </article>
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	995a939a37	Add target file(s) 5.2.7-RC1 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2020-07-25 18:57:19 -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
Tom Eastep	bc7082fb2a	Merge branch '5.2.6' # Conflicts: # docs/docs-targetname # docs/images/docs-images-targetname Signed-off-by: Tom Eastep <teastep@shorewall.net>	2020-07-18 17:05:51 -07:00
Tom Eastep	109ae7e038	Link the simple TC article to FAQs 97 and 97a Signed-off-by: Tom Eastep <teastep@shorewall.net>	2020-07-18 17:01:33 -07:00
Tom Eastep	49ba75252e	Add target file(s) 5.2.6.1 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2020-07-12 19:46:23 -07:00
Tom Eastep	c835fead34	Add target file(s) 5.2.6.1 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2020-07-12 19:46:13 -07:00