From 44e405b8d1bfe8e8a62ac82dab5b8030ce797456 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 13 Mar 2020 00:40:27 +0800 Subject: [PATCH] luci-app-flowoffload: remove outdated settings --- .../luasrc/model/cbi/flowoffload.lua | 5 ----- .../luci-app-flowoffload/po/zh-cn/flowoffload.po | 13 +------------ .../root/etc/config/flowoffload | 1 - .../root/etc/init.d/flowoffload | 3 --- 4 files changed, 1 insertion(+), 21 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 d42fc86cfb..9698d70ac7 100644 --- a/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua +++ b/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua @@ -31,11 +31,6 @@ 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-cn/flowoffload.po b/package/lean/luci-app-flowoffload/po/zh-cn/flowoffload.po index b2f0826bbc..e2d37c8a1a 100644 --- a/package/lean/luci-app-flowoffload/po/zh-cn/flowoffload.po +++ b/package/lean/luci-app-flowoffload/po/zh-cn/flowoffload.po @@ -26,7 +26,7 @@ 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 加速" @@ -58,17 +58,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 01e0bb0649..1a4f0b4647 100644 --- a/package/lean/luci-app-flowoffload/root/etc/config/flowoffload +++ b/package/lean/luci-app-flowoffload/root/etc/config/flowoffload @@ -3,7 +3,6 @@ config flow option flow_offloading '0' option flow_offloading_hw '0' option bbr '0' - option filter_aaaa '1' option dns '0' option dnscache_enable '1' option dns_server '114.114.114.114,114.114.115.115,223.5.5.5,223.6.6.6,180.76.76.76,119.29.29.29,119.28.28.28,1.2.4.8,210.2.4.8' 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 69fef5d486..2cd336d5b7 100755 --- a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload +++ b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload @@ -250,9 +250,6 @@ start_service(){ uci set firewall.@defaults[0].flow_offloading_hw=$(uci get flowoffload.@flow[0].flow_offloading_hw) uci commit firewall - uci set dhcp.@dnsmasq[0].filter_aaaa=$(uci get flowoffload.@flow[0].filter_aaaa) - uci commit dhcp - if [ "$DNSMASQ_RESTART" = N ]; then /etc/init.d/dnsmasq restart && echo "DNSMASQ change" /etc/init.d/firewall restart