Skip to content

Commit 77a4a85

Browse files
committed
update patch
1 parent c893cca commit 77a4a85

2 files changed

Lines changed: 14 additions & 60 deletions

File tree

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
1-
From ff0f5e454d80e392f2985071ad9c0a3fd2fa01c6 Mon Sep 17 00:00:00 2001
1+
From 4cd5c39d1dfef115e81e148ceb5f821cf8a30aa7 Mon Sep 17 00:00:00 2001
22
From: sbwml <admin@cooluc.com>
33
Date: Wed, 18 Dec 2024 23:38:26 +0800
44
Subject: [PATCH 7/7] luci-app-firewall: add fullcone6 option for nftables
55
based fullcone
66

77
Signed-off-by: sbwml <admin@cooluc.com>
88
---
9-
.../resources/view/firewall/zones.js | 19 +++++++++++++++++++
10-
1 file changed, 19 insertions(+)
9+
.../resources/view/firewall/zones.js | 18 ++++++++++++++++++
10+
1 file changed, 18 insertions(+)
1111

1212
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
13-
index df2f6d69a8..0a1646594d 100644
13+
index df2f6d6..45351b3 100644
1414
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
1515
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
16-
@@ -75,6 +75,25 @@ return view.extend({
16+
@@ -74,6 +74,24 @@ return view.extend({
17+
o.write = function(section_id, value) {
1718
uci.set('firewall', section_id, 'fullcone', value === '0' ? null : '1');
1819
uci.set('firewall', section_id, 'brcmfullcone', value === '2' ? '1' : null);
19-
};
20+
+
21+
+ if (value === '0') {
22+
+ uci.set('firewall', '@zone[1]', 'fullcone6', '0');
23+
+ }
24+
+ };
2025
+
2126
+ /* nft-fullcone 6 */
2227
+ o = s.option(form.RichListValue, "fullcone6", _("Full Cone NAT6"));
@@ -25,20 +30,14 @@ index df2f6d69a8..0a1646594d 100644
2530
+ o.optional = false;
2631
+ o.depends('fullcone_type', '1');
2732
+ o.load = function (section_id) {
28-
+ var fullcone6 = uci.get('firewall', section_id, 'fullcone6');
29-
+ if (fullcone6 === '1') {
30-
+ return '1';
31-
+ } else {
32-
+ return '0';
33-
+ }
33+
+ var fullcone6 = uci.get('firewall', '@zone[1]', 'fullcone6');
34+
+ return (fullcone6 === '1') ? '1' : '0';
3435
+ };
3536
+ o.write = function(section_id, value) {
36-
+ uci.set('firewall', section_id, 'fullcone6', value === '1' ? '1' : '0');
3737
+ uci.set('firewall', '@zone[1]', 'fullcone6', value === '1' ? '1' : '0');
38-
+ };
38+
};
3939
}
4040

41-
if (L.hasSystemFeature('ipv6')) {
4241
--
4342
2.43.5
4443

PATCH/pkgs/firewall/luci/0008-luci-app-firewall-add-sfe-v2-option.patch

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)