--- a/package/feeds/custom/luci-app-turboacc/Makefile +++ b/package/feeds/custom/luci-app-turboacc/Makefile @@ -12,8 +12,7 @@ PKG_RELEASE:=2 PKG_LICENSE:=GPLv3.0+ LUCI_TITLE:=LuCI support for Flow Offload / Shortcut-FE -LUCI_DEPENDS:=+pdnsd-alt \ - +PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier \ +LUCI_DEPENDS:=+PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier \ +PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload:kmod-ipt-offload \ +PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca:kmod-tcp-bbr \ +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder --- a/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc +++ b/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc @@ -232,27 +232,6 @@ start(){ sysctl -w net.ipv4.tcp_congestion_control="bbr" else sysctl -w net.ipv4.tcp_congestion_control="cubic" - fi - - [ "${dns_acc}" -eq "1" ] && { - mkdir -p "/tmp/dnsmasq.d" - wget-ssl -q -t "20" -T "5" "https://cdn.jsdelivr.net/gh/googlehosts/hosts@master/hosts-files/dnsmasq.conf" -O "/tmp/dnsmasq.d/dnsmasq-googlehosts.conf" & -} - - if [ "${dns_caching}" -eq "1" ]; then - stop_dnscache - sleep 1 - rm -f "/var/log/dnscache.file" - if [ "${dns_caching_mode}" = "1" ]; then - start_pdnsd - elif [ "${dns_caching_mode}" = "2" ]; then - start_dnsforwarder - fi - change_dns - /usr/share/dnscache/dnscache-while.sh > "/var/log/dnscache.file" 2>&1 & - else - stop_dnscache - revert_dns fi if [ "${restart_utils}" = "true" ]; then @@ -275,11 +254,6 @@ stop(){ rmmod "fast_classifier" 2>"/dev/null" } - [ "${dns_acc}" -eq "0" ] && rm -f "/tmp/dnsmasq.d/dnsmasq-googlehosts.conf" - - stop_dnscache - revert_dns - if [ "${restart_utils}" = "true" ]; then /etc/init.d/dnsmasq restart >/dev/null 2>&1 && echo "DNSMASQ revert" /etc/init.d/firewall restart >/dev/null 2>&1 --- a/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua +++ b/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua @@ -59,33 +59,4 @@ fullcone_nat.rmempty = false fullcone_nat.description = translate("Using FullCone NAT can improve gaming performance effectively") end -dns_acc = s:option(Flag, "dns_acc", translate("DNS Acceleration")) -dns_acc.default = 0 -dns_acc.rmempty = false -dns_acc.description = translate("Using optimized DNS records for GoogleHosts (Don't use under Clash Fake-IP mode)") - -dns_caching = s:option(Flag, "dns_caching", translate("DNS Caching")) -dns_caching.default = 0 -dns_caching.rmempty = false -dns_caching.description = translate("Enable DNS Caching and anti ISP DNS pollution") - -dns_caching_mode = s:option(ListValue, "dns_caching_mode", translate("Resolve DNS Mode"), translate("Only PDNSD and DNSForwarder is supported now")) -dns_caching_mode:value("1", translate("Using PDNSD to query and cache")) -if nixio.fs.access("/usr/bin/dnsforwarder") then -dns_caching_mode:value("2", translate("Using DNSForwarder to query and cache")) -end -dns_caching_mode.default = 1 -dns_caching_mode:depends("dns_caching", 1) - -dns_caching_v4_dns = s:option(Value, "dns_caching_v4_dns", translate("Upsteam IPv4 DNS Server")) -dns_caching_v4_dns.default = "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" -dns_caching_v4_dns.description = translate("Muitiple IPv4 DNS server can saperate with ','") -dns_caching_v4_dns:depends("dns_caching_mode", 1) -dns_caching_v4_dns:depends("dns_caching_mode", 2) - -dns_caching_v6_dns = s:option(Value, "dns_caching_v6_dns", translate("Upsteam IPv6 DNS Server")) -dns_caching_v6_dns.default = "2001:4860:4860::8888,2001:4860:4860::8844,2001:2001::1111,2001:2001::1001,2400:da00::6666,240C::6666,240C::6644" -dns_caching_v6_dns.description = translate("Muitiple IPv6 DNS server can saperate with ','") -dns_caching_v6_dns:depends("dns_caching_mode", 2) - return m --- a/package/feeds/custom/luci-app-turboacc/luasrc/view/turboacc/status.htm +++ b/package/feeds/custom/luci-app-turboacc/luasrc/view/turboacc/status.htm @@ -4,7 +4,6 @@ <%:Flow Offloading%><%:Collecting data...%> <%:BBR CCA%><%:Collecting data...%> <%:FullCone NAT%><%:Collecting data...%> - <%:DNS Caching%><%:Collecting data...%> @@ -12,13 +11,11 @@ var fastpath_state = document.getElementById('_fastpath_state'); var bbr_state = document.getElementById('_bbr_state'); var fullconenat_state = document.getElementById('_fullconenat_state'); - var dnscaching_state = document.getElementById('_dnscaching_state'); XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "turboacc", "status")%>', null, function(x, status) { if ( x && x.status == 200 ) { fastpath_state.innerHTML = status.fastpath_state ? '<%:RUNNING%>' : '<%:NOT RUNNING%>'; bbr_state.innerHTML = status.bbr_state ? '<%:RUNNING%>' : '<%:NOT RUNNING%>'; fullconenat_state.innerHTML = status.fullconenat_state ? '<%:RUNNING%>' : '<%:NOT RUNNING%>'; - dnscaching_state.innerHTML = status.dnscaching_state ? '<%:RUNNING%>' : '<%:NOT RUNNING%>'; } }); //]]>