From ca9c6bd48ad2e62cf63d0c0174670c0d5b1facc6 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 16 Mar 2020 04:25:53 +0800 Subject: [PATCH] luci-app-flowoffload: remove outdated options --- .../luasrc/model/cbi/flowoffload.lua | 21 ------------------ .../po/zh_Hans/flowoffload.po | 22 +------------------ .../root/etc/config/flowoffload | 3 --- .../root/etc/init.d/flowoffload | 13 ----------- 4 files changed, 1 insertion(+), 58 deletions(-) diff --git a/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua b/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua index cef1088041..50739560ce 100644 --- a/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua +++ b/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua @@ -15,32 +15,11 @@ s = m:section(TypedSection, "flow") s.addremove = false s.anonymous = true -flow = s:option(Flag, "flow_offloading", translate("Enable")) -flow.default = 0 -flow.rmempty = false -flow.description = translate("Enable software flow offloading for connections. (decrease cpu load / increase routing throughput)") - -hw = s:option(Flag, "flow_offloading_hw", translate("HWNAT")) -hw.default = 0 -hw.rmempty = true -hw.description = translate("Enable Hardware NAT (depends on hw capability like MTK 762x)") -hw:depends("flow_offloading", 1) - -fc = s:option(Flag, "fullcone_nat", translate("Fullcone NAT")) -fc.default = 1 -fc.rmempty = true -fc.description = translate("Enable Fullcone NAT") - bbr = s:option(Flag, "bbr", translate("Enable BBR")) bbr.default = 0 bbr.rmempty = false bbr.description = translate("Bottleneck Bandwidth and Round-trip propagation time (BBR)") -aaaa = s:option(Flag, "filter_aaaa", translate("Filter AAAA")) -aaaa.default = 0 -aaaa.rmempty = false -aaaa.description = translate("Dnsmasq rejects IPv6 parsing and optimizes domestic complex dual-stack network") - dns = s:option(Flag, "dns", translate("DNS Acceleration")) dns.default = 0 dns.rmempty = false diff --git a/package/lean/luci-app-flowoffload/po/zh_Hans/flowoffload.po b/package/lean/luci-app-flowoffload/po/zh_Hans/flowoffload.po index 7d7fb4ad38..bbaca03d85 100644 --- a/package/lean/luci-app-flowoffload/po/zh_Hans/flowoffload.po +++ b/package/lean/luci-app-flowoffload/po/zh_Hans/flowoffload.po @@ -16,20 +16,11 @@ msgstr "开源 Linux Flow Offload 驱动 (支持 Fast Path 或者 HWNAT)" msgid "Enable" msgstr "启用" -msgid "Enable software flow offloading for connections. (decrease cpu load / increase routing throughput)" -msgstr "开启 Flow Offloading 转发加速. (降低CPU占用 / 增强路由转发性能，和多WAN或者QOS功能可能会冲突)" - -msgid "Enable Hardware NAT (depends on hw capability like MTK 762x)" -msgstr "启用硬件HWNAT加速（依赖特定的硬件，例如 MTK 762x 系列）" - -msgid "Enable Fullcone NAT" -msgstr "启用 Fullcone NAT" - msgid "Enable BBR" msgstr "启用 BBR" msgid "Bottleneck Bandwidth and Round-trip propagation time (BBR)" -msgstr "BBR拥塞控制算法可以加强TCP应用表现，但会降低路由器本机上的WIFI吞吐性能" +msgstr "使用BBR拥塞控制算法可以加强TCP应用表现" msgid "DNS Acceleration" msgstr "DNS 加速" @@ -61,17 +52,6 @@ msgstr "支持多个上游DNS服务器，用','分隔（注意用英文逗号). msgid "Muitiple IPV6 DNS server can saperate with ','" msgstr "支持dnsforwarder解析多个上游IPV6 DNS服务器，用','分隔（注意用英文逗号).请填写您最快的DNS服务器" -msgid "Enable dnsmasq killqqad" -msgstr "启用dnsmasq去广告" - -msgid "dnsmasq killqqad" -msgstr "dnsmasq去广告" - msgid "AdGuardHome's login username/passwd: AdGuardHome, web console addr: IP:3001" msgstr "AdGuardHome 网页控制台地址：IP:3001 登录账号/密码：AdGuardHome" -msgid "Filter AAAA" -msgstr "忽略域名的IPv6地址" - -msgid "Dnsmasq rejects IPv6 parsing and optimizes domestic complex dual-stack network" -msgstr "dnsmasq不返回ipv6解析结果，优化国内复杂双栈网络" diff --git a/package/lean/luci-app-flowoffload/root/etc/config/flowoffload b/package/lean/luci-app-flowoffload/root/etc/config/flowoffload index 17266fcf2c..7c68a68ff1 100644 --- a/package/lean/luci-app-flowoffload/root/etc/config/flowoffload +++ b/package/lean/luci-app-flowoffload/root/etc/config/flowoffload @@ -1,8 +1,5 @@ config flow - option flow_offloading '0' - option flow_offloading_hw '0' - option fullcone_nat '1' option bbr '0' option dns '0' option dnscache_enable '1' diff --git a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload index 4bc557f1eb..fa824e1fe7 100755 --- a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload +++ b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload @@ -218,13 +218,6 @@ start(){ dns=$(uci get flowoffload.@flow[0].dns 2>/dev/null) dnscache_enable=$(uci get flowoffload.@flow[0].dnscache_enable 2>/dev/null) bbr=$(uci get flowoffload.@flow[0].bbr 2>/dev/null) - aaaa=$(uci get flowoffload.@flow[0].filter_aaaa 2>/dev/null) - if [ $aaaa -eq 1 ]; then - sed -i '/filter-aaaa/d' /etc/dnsmasq.conf - echo "filter-aaaa" >> /etc/dnsmasq.conf - else - sed -i '/filter-aaaa/d' /etc/dnsmasq.conf - fi if [ $dns -eq 1 ]; then stop_dnscache @@ -252,10 +245,6 @@ start(){ sysctl -w net.ipv4.tcp_congestion_control=cubic fi - uci set firewall.@defaults[0].flow_offloading=$(uci get flowoffload.@flow[0].flow_offloading) - uci set firewall.@defaults[0].flow_offloading_hw=$(uci get flowoffload.@flow[0].flow_offloading_hw) - uci set firewall.@defaults[0].fullcone=$(uci get flowoffload.@flow[0].fullcone_nat) - uci commit firewall if [ "$DNSMASQ_RESTART" = N ]; then /etc/init.d/dnsmasq restart && echo "DNSMASQ change" /etc/init.d/firewall restart @@ -266,8 +255,6 @@ stop(){ dns=$(uci get firewall.@defaults[0].dns 2>/dev/null) stop_dnscache revert_dns - uci set firewall.@defaults[0].flow_offloading=$(uci get flowoffload.@flow[0].flow_offloading) - uci set firewall.@defaults[0].flow_offloading_hw=$(uci get flowoffload.@flow[0].flow_offloading_hw) uci commit firewall if [ "$DNSMASQ_RESTART" = N ]; then /etc/init.d/dnsmasq restart && echo "DNSMASQ revert"