firewall: backport patch for mss clamping in both directions

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile
index 3f1a202baf8fd81afd8cdd10719ed7106598d9fc..88817b66dd785db314bb0ff462c0bfe9e16afbc8 100644 (file)
--- a/package/network/config/firewall/Makefile
+++ b/package/network/config/firewall/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewall
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewall

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/firewall3.git
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/firewall3.git

diff --git a/package/network/config/firewall/patches/0001-zones-apply-tcp-mss-clamping-also-on-ingress-path.patch b/package/network/config/firewall/patches/0001-zones-apply-tcp-mss-clamping-also-on-ingress-path.patch
new file mode 100644 (file)
index 0000000..9e23dfd
--- /dev/null
+++ b/package/network/config/firewall/patches/0001-zones-apply-tcp-mss-clamping-also-on-ingress-path.patch
@@ -0,0 +1,33 @@
+From 4a7df7d8c4e40fd2ce0d9f125755249dee17a8bd Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <yszhou4tech@gmail.com>
+Date: Fri, 24 Jul 2020 12:52:59 +0800
+Subject: [PATCH] zones: apply tcp mss clamping also on ingress path
+
+Fixes FS#3231
+
+Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
+Acked-by: Jo-Philipp Wich <jo@mein.io>
+(cherry picked from commit e9b90dfac2225927c035f6a76277b850c282dc9a)
+---
+ zones.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/zones.c b/zones.c
+index 01fb706..3d54a76 100644
+--- a/zones.c
++++ b/zones.c
+@@ -552,6 +552,14 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
+                       fw3_ipt_rule_target(r, "TCPMSS");
+                       fw3_ipt_rule_addarg(r, false, "--clamp-mss-to-pmtu", NULL);
+                       fw3_ipt_rule_replace(r, "FORWARD");
++
++                      r = fw3_ipt_rule_create(handle, &tcp, dev, NULL, sub, NULL);
++                      fw3_ipt_rule_addarg(r, false, "--tcp-flags", "SYN,RST");
++                      fw3_ipt_rule_addarg(r, false, "SYN", NULL);
++                      fw3_ipt_rule_comment(r, "Zone %s MTU fixing", zone->name);
++                      fw3_ipt_rule_target(r, "TCPMSS");
++                      fw3_ipt_rule_addarg(r, false, "--clamp-mss-to-pmtu", NULL);
++                      fw3_ipt_rule_replace(r, "FORWARD");
+               }
+       }
+       else if (handle->table == FW3_TABLE_RAW)