luci app flow: support kernel 4.19

This commit is contained in:
coolsnowwolf 2018-12-29 01:23:47 +08:00
parent c9d19c9bf1
commit 540fbef2f0
3 changed files with 14 additions and 11 deletions

View File

@ -6,10 +6,10 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for Flow Offload
LUCI_DEPENDS:=+kmod-ipt-offload +pdnsd-alt +kmod-tcp-bbr @LINUX_4_14
LUCI_DEPENDS:=+kmod-ipt-offload +pdnsd-alt +kmod-tcp-bbr @LINUX_4_14 @LINUX_4_19
LUCI_PKGARCH:=all
PKG_VERSION:=1.0
PKG_RELEASE:=11
PKG_RELEASE:=12
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -3,10 +3,13 @@
START=60
USE_PROCD=1
PDNSD_BIN="/var/sbin/dnscache"
DNSMASQ_RESTART=N
DNS_SERVER="114.114.114.114,114.114.115.115"
start_pdnsd() {
pdnsd_genconfig() {
DNS_SERVER=$(uci get flowoffload.@flow[0].dns_server 2>/dev/null)
[ -d /var/etc ] || mkdir -p /var/etc
@ -125,7 +128,6 @@ EOF
[ -d /var/sbin ] || mkdir -p /var/sbin
[ -f /var/sbin/dnscache ] || cp -a /usr/sbin/pdnsd /var/sbin/dnscache
/var/sbin/dnscache -c /var/etc/dnscache.conf -d
echo "Start DNS Cache"
}
@ -149,11 +151,16 @@ revert_dns() {
uci commit dhcp
}
start(){
start_service(){
dns=$(uci get flowoffload.@flow[0].dns 2>/dev/null)
bbr=$(uci get flowoffload.@flow[0].bbr 2>/dev/null)
if [ $dns -eq 1 ]; then
start_pdnsd
pdnsd_genconfig
procd_open_instance
procd_set_param command "$PDNSD_BIN" -c /var/etc/dnscache.conf
procd_set_param respawn
procd_set_param stderr 1
procd_close_instance
change_dns
fi
if [ $bbr -eq 1 ]; then
@ -170,9 +177,8 @@ start(){
fi
}
stop(){
stop_service(){
dns=$(uci get firewall.@defaults[0].dns 2>/dev/null)
stop_pdnsd
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)

View File

@ -10,7 +10,4 @@ uci -q batch <<-EOF >/dev/null
commit ucitrack
EOF
sed -i '/dnscache-watchdog.sh/d' /etc/crontabs/root
echo '*/60 * * * * /usr/share/dnscache-watchdog.sh' >> /etc/crontabs/root
exit 0