diff --git a/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch b/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch index 78a2079819..205d67cc13 100644 --- a/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch +++ b/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch @@ -11,10 +11,10 @@ invalid Renew: ZiMing Mo --- root/etc/config/firewall | 1 + - root/usr/share/firewall4/templates/ruleset.uc | 13 +++++- + root/usr/share/firewall4/templates/ruleset.uc | 11 +++++- .../firewall4/templates/zone-fullcone.uc | 4 ++ root/usr/share/ucode/fw4.uc | 38 ++++++++++++++++++- - 4 files changed, 53 insertions(+), 3 deletions(-) + 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 root/usr/share/firewall4/templates/zone-fullcone.uc --- a/root/etc/config/firewall @@ -57,8 +57,7 @@ Renew: ZiMing Mo {% endfor %} {% endfor %} {% endif %} --{% if (zone.masq6): %} -+{% if (zone.masq6 && !fw4.default_option("fullcone")): %} + {% if (zone.masq6): %} {% for (let saddrs in zone.masq6_src_subnets): %} {% for (let daddrs in zone.masq6_dest_subnets): %} {%+ include("zone-masq.uc", { fw4, zone, family: 6, saddrs, daddrs }) %} @@ -76,9 +75,9 @@ Renew: ZiMing Mo +++ b/root/usr/share/firewall4/templates/zone-fullcone.uc @@ -0,0 +1,4 @@ +{# /usr/share/firewall4/templates/zone-fullcone.uc #} -+ fullcone comment "!fw4: Handle {{ ++ meta nfproto ipv4 fullcone comment "!fw4: Handle {{ + zone.name -+}} IPv4/IPv6 fullcone NAT traffic" ++}} IPv4 fullcone NAT traffic" --- a/root/usr/share/ucode/fw4.uc +++ b/root/usr/share/ucode/fw4.uc @@ -1,3 +1,5 @@