forked from sbwml/r4s_build_script
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
- Loading branch information
Showing
6 changed files
with
117 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
openwrt/patch/firewall4/0002-luci-app-firewall-add-shortcut-fe-option.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| From e62768ea9de7fcf554bce7ba8ed2e1f301863006 Mon Sep 17 00:00:00 2001 | ||
| From: sbwml <admin@cooluc.com> | ||
| Date: Wed, 4 Sep 2024 12:34:17 +0800 | ||
| Subject: [PATCH 2/4] luci-app-firewall: add shortcut-fe option | ||
|
|
||
| Signed-off-by: sbwml <admin@cooluc.com> | ||
| --- | ||
| .../resources/view/firewall/zones.js | 34 +++++++++++++++++++ | ||
| 1 file changed, 34 insertions(+) | ||
|
|
||
| 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 | ||
| index ac720831ef..f7c64e4379 100644 | ||
| --- 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 | ||
| @@ -100,6 +100,21 @@ return view.extend({ | ||
| o.depends('flow_offloading', '1'); | ||
| } | ||
|
|
||
| + /* Shortcut-FE flow offload support */ | ||
| + if (L.hasSystemFeature('shortcutfe')) { | ||
| + o = s.option(form.Flag, 'shortcut_fe', | ||
| + _('Shortcut-FE flow offloading'), | ||
| + _('Shortcut-FE based offloading for routing/NAT')); | ||
| + o.optional = true; | ||
| + | ||
| + o = s.option(form.ListValue, 'shortcut_fe_module', | ||
| + _('Connection Manager'), | ||
| + _('Set up the Shortcut-FE engine connection manager')); | ||
| + o.value('shortcut-fe-cm', _('shortcut-fe-cm')); | ||
| + o.value('fast-classifier', _('fast-classifier')); | ||
| + o.default = 'shortcut-fe-cm'; | ||
| + o.depends('shortcut_fe', '1'); | ||
| + } | ||
|
|
||
| s = m.section(form.GridSection, 'zone', _('Zones')); | ||
| s.addremove = true; | ||
| @@ -393,6 +408,25 @@ return view.extend({ | ||
| o.filter = out.filter; | ||
| o.cfgvalue = out.cfgvalue; | ||
|
|
||
| + setTimeout(function() { | ||
| + const checkboxes = document.querySelectorAll('.cbi-checkbox input[type="checkbox"]'); | ||
| + checkboxes.forEach((checkbox) => { | ||
| + const widgetId = checkbox.getAttribute('data-widget-id'); | ||
| + if ((widgetId.includes('flow_offloading') && !widgetId.includes('flow_offloading_hw')) || widgetId.includes('shortcut_fe')) { | ||
| + checkbox.addEventListener('change', function() { | ||
| + if (this.checked) { | ||
| + checkboxes.forEach((cb) => { | ||
| + if (cb !== this && (cb.getAttribute('data-widget-id').includes('flow_offloading') || | ||
| + cb.getAttribute('data-widget-id').includes('shortcut_fe'))) { | ||
| + cb.checked = false; | ||
| + } | ||
| + }); | ||
| + } | ||
| + }); | ||
| + } | ||
| + }); | ||
| + }, 500); | ||
| + | ||
| return m.render(); | ||
| } | ||
| }); | ||
| -- | ||
| 2.43.5 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 0 additions & 34 deletions
34
openwrt/patch/firewall4/02-luci-app-firewall_add_shortcut-fe.patch
This file was deleted.
Oops, something went wrong.
7 changes: 1 addition & 6 deletions
7
openwrt/patch/openssl/quic/0044-QUIC-Update-metadata-version.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,5 @@ | ||
| --- a/VERSION.dat | ||
| +++ b/VERSION.dat | ||
| @@ -2,6 +2,6 @@ MAJOR=3 | ||
| MINOR=0 | ||
| PATCH=14 | ||
| PRE_RELEASE_TAG= | ||
| @@ -5,1 +5,1 @@ | ||
| -BUILD_METADATA= | ||
| +BUILD_METADATA=quic | ||
| RELEASE_DATE="4 Jun 2024" | ||
| SHLIB_VERSION=3 |