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

sync (#589)

Browse source
This commit is contained in:
suyuan 2025-01-11 17:40:10 +08:00 committed by GitHub
commit c33f9e5d48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 11 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

@ -834,7 +834,7 @@ function wizard_add()
local sectionname = s[".name"] local sectionname = s[".name"]
if sectionname:match("^omr.*") then if sectionname:match("^omr.*") then
luci.sys.call("uci -q del openvpn." .. sectionname .. ".remote") luci.sys.call("uci -q del openvpn." .. sectionname .. ".remote")
luci.sys.call("uci -q add_list openvpn." .. sectioname .. ".remote=" .. server_ip) luci.sys.call("uci -q add_list openvpn." .. sectionname .. ".remote=" .. server_ip)
end end
end) end)
--luci.sys.call("uci -q del openvpn.omr.remote") --luci.sys.call("uci -q del openvpn.omr.remote")
@ -1267,7 +1267,7 @@ function wizard_add()
local sectionname = s[".name"] local sectionname = s[".name"]
if sectionname:match("^omr.*") then if sectionname:match("^omr.*") then
ucic:set("openvpn",sectionname,"enabled",0) ucic:set("openvpn",sectionname,"enabled",0)
ucic:set("network",sectioname,"proto","none") ucic:set("network",sectionname,"proto","none")
end end
end) end)
ucic:set("openvpn","omr","enabled",1) ucic:set("openvpn","omr","enabled",1)
@ -1276,7 +1276,7 @@ function wizard_add()
local sectionname = s[".name"] local sectionname = s[".name"]
if sectionname:match("^omr.*") then if sectionname:match("^omr.*") then
ucic:set("openvpn",sectionname,"enabled",1) ucic:set("openvpn",sectionname,"enabled",1)
ucic:set("network",sectioname,"proto","none") ucic:set("network",sectionname,"proto","none")
end end
end) end)
--ucic:set("openvpn","omr","enabled",1) --ucic:set("openvpn","omr","enabled",1)

2
mptcp/files/etc/init.d/mptcp
View file

@ -68,7 +68,7 @@ global_multipath_settings() {
[ -z "$mptcp_stale_loss_cnt" ] || sysctl -qew net.mptcp.stale_loss_cnt="$mptcp_stale_loss_cnt" [ -z "$mptcp_stale_loss_cnt" ] || sysctl -qew net.mptcp.stale_loss_cnt="$mptcp_stale_loss_cnt"
[ -z "$mptcp_pm_type" ] || sysctl -qew net.mptcp.pm_type="$mptcp_pm_type" [ -z "$mptcp_pm_type" ] || sysctl -qew net.mptcp.pm_type="$mptcp_pm_type"
[ -z "$mptcp_allow_join_initial_addr_port" ] || sysctl -qew net.mptcp.allow_join_initial_addr_port="$mptcp_allow_initial_addr_port" [ -z "$mptcp_allow_join_initial_addr_port" ] || sysctl -qew net.mptcp.allow_join_initial_addr_port="$mptcp_allow_initial_addr_port"
if [ -n "$mptcp_scheduler" ]; then if [ -n "$mptcp_scheduler" ] && [ -d /usr/share/bpf/scheduler ]; then
for scheduler in $(ls -1 /usr/share/bpf/scheduler/*.o); do for scheduler in $(ls -1 /usr/share/bpf/scheduler/*.o); do
bpftool struct_ops register $scheduler >/dev/null 2>&1 bpftool struct_ops register $scheduler >/dev/null 2>&1
done done

13
openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
View file

@ -120,10 +120,10 @@ if [ -z "$(uci -q get shadowsocks-rust.hi1.keep_alive)" ]; then
uci -q batch <<-EOF > /dev/null uci -q batch <<-EOF > /dev/null
set shadowsocks-rust.hi1.keep_alive=15 set shadowsocks-rust.hi1.keep_alive=15
set shadowsocks-rust.hi1.no_delay=1 set shadowsocks-rust.hi1.no_delay=1
set shadowsocks-rust.hi1.fast_open=1 set shadowsocks-rust.hi1.fast_open=0
set shadowsocks-rust.hi2.keep_alive=15 set shadowsocks-rust.hi2.keep_alive=15
set shadowsocks-rust.hi2.no_delay=1 set shadowsocks-rust.hi2.no_delay=1
set shadowsocks-rust.hi2.fast_open=1 set shadowsocks-rust.hi2.fast_open=0
commit shadowsocks-rust commit shadowsocks-rust
EOF EOF
fi fi
@ -136,5 +136,14 @@ if [ -z "$(uci -q get shadowsocks-rust.dns.forward_address)" ]; then
EOF EOF
fi fi
if [ "$(uci -q get shadowsocks-rust.hi1.fast_open)" = "1" ]; then
uci -q batch <<-EOF > /dev/null
set shadowsocks-rust.hi1.fast_open=0
set shadowsocks-rust.hi2.fast_open=0
commit shadowsocks-rust
EOF
fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

6
shadowsocks-rust/Makefile
View file

@ -2,14 +2,14 @@
# #
# Copyright (C) 2017-2020 Yousong Zhou <yszhou4tech@gmail.com> # Copyright (C) 2017-2020 Yousong Zhou <yszhou4tech@gmail.com>
# Copyright (C) 2021-2023 ImmortalWrt.org # Copyright (C) 2021-2023 ImmortalWrt.org
# Copyright (C) 2023-2024 Yannick Chabanois (Ycarus) for OpenMPTCProuter # Copyright (C) 2023-2025 Yannick Chabanois (Ycarus) for OpenMPTCProuter
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=shadowsocks-rust PKG_NAME:=shadowsocks-rust
PKG_VERSION:=1.21.2 PKG_VERSION:=1.22.0
PKG_HASH:=a2269e896a27a183dfd6d757d130978b46e1ac19f936c4229188d017b7ecf867 PKG_HASH:=2857372667b66aa7f8ef2d27a8a19209cbf3e5da2e6d1d1d493411d72d173861
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

4
shadowsocks-rust/files/shadowsocks-rust.config
View file

@ -5,7 +5,7 @@ config ss_redir hi1
option mode 'tcp_and_udp' option mode 'tcp_and_udp'
option timeout '1000' option timeout '1000'
option keep_alive '15' option keep_alive '15'
option fast_open 1 option fast_open 0
option verbose 0 option verbose 0
option syslog 1 option syslog 1
option reuse_port 0 option reuse_port 0
@ -20,7 +20,7 @@ config ss_redir hi2
option mode 'tcp_and_udp' option mode 'tcp_and_udp'
option timeout '1000' option timeout '1000'
option keep_alive '15' option keep_alive '15'
option fast_open 1 option fast_open 0
option verbose 0 option verbose 0
option syslog 1 option syslog 1
option reuse_port 0 option reuse_port 0