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

Merge pull request #354 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-09-07 21:53:07 +08:00 • committed by GitHub
commit f5c2886c90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
luci-app-mptcp/luasrc/model/cbi/mptcp.lua
View file

@ -60,7 +60,11 @@ end
o = s:option(ListValue, "congestion", translate("Congestion Control"),translate("Default is cubic")) o = s:option(ListValue, "congestion", translate("Congestion Control"),translate("Default is cubic"))
local availablecong = sys.exec("sysctl -n net.ipv4.tcp_available_congestion_control | xargs -n1 | sort | xargs") local availablecong = sys.exec("sysctl -n net.ipv4.tcp_available_congestion_control | xargs -n1 | sort | xargs")
for cong in string.gmatch(availablecong, "[^%s]+") do for cong in string.gmatch(availablecong, "[^%s]+") do
o:value(cong, translate(cong)) if cong == "bbr" and string.match(availablecong, "bbr1") then
o:value(cong, "bbr3")
else
o:value(cong, cong)
end
end end
-- if tonumber(uname.release:sub(1,4)) >= 5.15 then -- if tonumber(uname.release:sub(1,4)) >= 5.15 then

19
mptcp/files/etc/uci-defaults/mptcp-defaults
View file

@ -4,11 +4,11 @@ if [ "$(uci -q get network.globals.mptcp_path_manager)" = "" ]; then
set network.globals.multipath='enable' set network.globals.multipath='enable'
set network.globals.mptcp_path_manager='fullmesh' set network.globals.mptcp_path_manager='fullmesh'
set network.globals.mptcp_scheduler='blest' set network.globals.mptcp_scheduler='blest'
set network.globals.congestion='bbr2' set network.globals.congestion='bbr'
set network.globals.mptcp_checksum=0 set network.globals.mptcp_checksum=0
set network.globals.mptcp_debug=0 set network.globals.mptcp_debug=0
set network.globals.mptcp_syn_retries=4 set network.globals.mptcp_syn_retries=4
set network.globals.mptcp_subflows=3 set network.globals.mptcp_subflows=8
set network.globals.mptcp_add_addr_accepted=1 set network.globals.mptcp_add_addr_accepted=1
set network.globals.mptcp_add_addr_timeout=120 set network.globals.mptcp_add_addr_timeout=120
set network.globals.mptcp_pm_type=0 set network.globals.mptcp_pm_type=0
@ -18,12 +18,13 @@ if [ "$(uci -q get network.globals.mptcp_path_manager)" = "" ]; then
commit network commit network
EOF EOF
fi fi
#if [ "$(uci -q get network.globals.congestion)" != "bbr" ]; then # BBRv2 is replaced by BBRv3
# uci -q batch <<-EOF >/dev/null if [ "$(uci -q get network.globals.congestion)" = "bbr2" ]; then
# set network.globals.congestion=bbr uci -q batch <<-EOF >/dev/null
# commit network set network.globals.congestion='bbr'
# EOF commit network
#fi EOF
fi
if [ "$(uci -q get network.globals.mptcp_syn_retries)" = "1" ]; then if [ "$(uci -q get network.globals.mptcp_syn_retries)" = "1" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set network.globals.mptcp_syn_retries=4 set network.globals.mptcp_syn_retries=4
@ -62,7 +63,7 @@ if [ "$(uci -q show network.globals | grep mptcp_fullmesh)" = "" ]; then
fi fi
if [ "$(uci -q get network.globals.mptcp_subflows)" = "" ]; then if [ "$(uci -q get network.globals.mptcp_subflows)" = "" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set network.globals.mptcp_subflows=3 set network.globals.mptcp_subflows=8
set network.globals.mptcp_add_addr_accepted=1 set network.globals.mptcp_add_addr_accepted=1
set network.globals.mptcp_add_addr_timeout=120 set network.globals.mptcp_add_addr_timeout=120
commit network commit network