298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-turboacc: fix issues #7840 (#7842)

Browse Source
This commit is contained in:
Ailick 2021-09-11 15:38:02 +08:00 committed by GitHub
parent 8eef4cee14
commit 3a2042824a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-turboacc/Makefile
View File

@ -32,7 +32,7 @@ LUCI_DEPENDS:=+pdnsd-alt \
define Package/$(PKG_NAME)/config
config PACKAGE_$(PKG_NAME)_INCLUDE_OFFLOADING
bool "Include Flow Offload"
depends on PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE=n
depends on (PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE=n && PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE_DRV=n)
default y if i386||x86_64||TARGET_ramips
config PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE_DRV

7
package/lean/luci-app-turboacc/root/etc/init.d/turboacc
View File

@ -232,7 +232,7 @@ start(){
[ "${sw_flow}" -ne "1" ] && [ "${sfe_flow}" -eq "1" ] && {
[ "$(have_ecm_init)" = "0" ] && {
/etc/init.d/shortcut-fe enabled && /etc/init.d/shortcut-fe disable
/etc/init.d/shortcut-fe enabled || /etc/init.d/shortcut-fe enable
/etc/init.d/shortcut-fe start
}
}
@ -278,7 +278,10 @@ stop(){
uci commit firewall
[ "${sfe_flow}" -ne "1" ] && {
[ "$(have_ecm_init)" = "0" ] && /etc/init.d/shortcut-fe stop 2>"/dev/null"
[ -e "/etc/init.d/shortcut-fe" ] && [ "$(have_ecm_init)" = "0" ] && {
/etc/init.d/shortcut-fe stop 2>"/dev/null"
/etc/init.d/shortcut-fe enabled && /etc/init.d/shortcut-fe disable
}
}
stop_dnscache

3
package/lean/shortcut-fe/shortcut-fe/Makefile
View File

@ -16,7 +16,6 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=shortcut-fe
PKG_RELEASE:=2
PKG_CONFIG_DEPENDS := CONFIG_IPV6
include $(INCLUDE_DIR)/package.mk
@ -24,7 +23,7 @@ define KernelPackage/shortcut-fe
SECTION:=kernel
CATEGORY:=Kernel modules
SUBMENU:=Network Support
DEPENDS:=
DEPENDS:=@IPV6
TITLE:=Kernel driver for SFE
FILES:=$(PKG_BUILD_DIR)/shortcut-fe.ko $(if $(CONFIG_IPV6),$(PKG_BUILD_DIR)/shortcut-fe-ipv6.ko,)
KCONFIG:=CONFIG_NF_CONNTRACK_EVENTS=y \

14
package/lean/shortcut-fe/shortcut-fe/files/etc/init.d/shortcut-fe
View File

@ -23,18 +23,12 @@ have_cm() {
echo 0
}
#load shortcut-fe and connection manager
load_sfe() {
[ -d "/sys/module/shortcut_fe" ] || insmod shortcut-fe
[ -d "/sys/module/shortcut_fe_ipv6" ] || insmod shortcut-fe-ipv6
}
#load shortcut-fe connection manager
load_sfe_cm() {
local kernel_version=$(uname -r)
#no ecm :
#shortcut-fe-drv.ko is not needed because other connection manager is not enabled
[ -d "/sys/module/shortcut_fe_drv" ] && rmmod shortcut_fe_drv
[ -d "/sys/module/shortcut_fe" ] || insmod /lib/modules/$kernel_version/shortcut-fe.ko
[ -d "/sys/module/shortcut_fe_ipv6" ] || insmod /lib/modules/$kernel_version/shortcut-fe-ipv6.ko
[ -e "/lib/modules/$kernel_version/shortcut-fe-cm.ko" ] && {
[ -d /sys/module/shortcut_fe_cm ] || insmod /lib/modules/$kernel_version/shortcut-fe-cm.ko
@ -45,7 +39,7 @@ load_sfe_cm() {
}
start() {
[ "$(have_cm)" = "0" ] && load_sfe && load_sfe_cm
[ "$(have_cm)" = "0" ] && load_sfe
}
stop() {