mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-24 14:54:24 +00:00
Code Issues Releases Wiki Activity

sync (#464)

Browse source
This commit is contained in:
suyuan 2024-04-05 01:40:09 +08:00 committed by GitHub
commit 8b39c1f193
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -428,7 +428,8 @@ function wizard_add()
local uploadspeed = luci.http.formvalue("cbid.sqm.%s.upload" % intf) or "0" local uploadspeed = luci.http.formvalue("cbid.sqm.%s.upload" % intf) or "0"
local testspeed = luci.http.formvalue("cbid.sqm.%s.testspeed" % intf) or "0" local testspeed = luci.http.formvalue("cbid.sqm.%s.testspeed" % intf) or "0"
if not ucic:get("qos",intf) ~= "" then local qos_settings = ucic:get("qos",intf) or ""
if qos_settings == "" then
ucic:set("qos",intf,"interface") ucic:set("qos",intf,"interface")
ucic:set("qos",intf,"classgroup","Default") ucic:set("qos",intf,"classgroup","Default")
ucic:set("qos",intf,"enabled","0") ucic:set("qos",intf,"enabled","0")
@ -436,7 +437,8 @@ function wizard_add()
ucic:set("qos",intf,"download","100000") ucic:set("qos",intf,"download","100000")
end end
if not ucic:get("sqm",intf) ~= "" then local sqm_settings = ucic:get("sqm",intf) or ""
if sqm_settings == "" then
local defif = get_device(intf) local defif = get_device(intf)
if defif == "" then if defif == "" then
defif = ucic:get("network",intf,"device") or "" defif = ucic:get("network",intf,"device") or ""

4
ndpi-netfilter2/Makefile
View file

@ -12,8 +12,8 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ndpi-netfilter2 PKG_NAME:=ndpi-netfilter2
PKG_RELEASE:=4 PKG_RELEASE:=4
#PKG_REV:=3deea541af037b663b1b83a055b80d9a06a0afd2 #PKG_REV:=3deea541af037b663b1b83a055b80d9a06a0afd2
#PKG_REV:=5cf35a64c8296b69099d3bd4c8cb9222f3174901 PKG_REV:=5cf35a64c8296b69099d3bd4c8cb9222f3174901
PKG_REV:=761993583265cf9a022be1ad2d701e446bb91d42 #PKG_REV:=761993583265cf9a022be1ad2d701e446bb91d42
PKG_VERSION:=4-$(PKG_REV) PKG_VERSION:=4-$(PKG_REV)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

2
openmptcprouter-full/Makefile
View file

@ -85,7 +85,7 @@ MY_DEPENDS := \
luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 \ luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 \
!(LINUX_5_4):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core LINUX_5_4:v2ray-config !LINUX_5_4:v2ray-config-nft syslogd \ !(LINUX_5_4):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core LINUX_5_4:v2ray-config !LINUX_5_4:v2ray-config-nft syslogd \
(TARGET_x86||TARGET_x86_64):kmod-mlx4-core \ (TARGET_x86||TARGET_x86_64):kmod-mlx4-core \
!(TARGET_ipq40xx||TARGET_ramips||KERNEL_6_6||TARGET_mvebu||TARGET_ipq806x||TARGET_mediatek):iptables-mod-ndpi !(TARGET_ipq40xx||TARGET_ramips||KERNEL_6_6||TARGET_mvebu||TARGET_ipq806x||TARGET_mediatek):kmod-ipt-ndpi libip4tc libip6tc \ !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6):iptables-mod-ndpi !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6):kmod-ipt-ndpi libip4tc libip6tc \
xray-core LINUX_5_4:xray-config !LINUX_5_4:xray-config-nft (LINUX_5_4&&(TARGET_x86_64||aarch64)):kmod-tcp-bbr2 kmod-ovpn-dco-v2 \ xray-core LINUX_5_4:xray-config !LINUX_5_4:xray-config-nft (LINUX_5_4&&(TARGET_x86_64||aarch64)):kmod-tcp-bbr2 kmod-ovpn-dco-v2 \
shadowsocks-rust-sslocal shadowsocks-rust-ssservice LINUX_5_4:shadowsocks-rust-config !LINUX_5_4:shadowsocks-rust-config-nft luci-app-shadowsocks-rust \ shadowsocks-rust-sslocal shadowsocks-rust-ssservice LINUX_5_4:shadowsocks-rust-config !LINUX_5_4:shadowsocks-rust-config-nft luci-app-shadowsocks-rust \
luci-proto-external omr-schedule jq luci-app-ddns luci-proto-external omr-schedule jq luci-app-ddns