From 1c41df07c4c9e96ce3628a0e5ca5d8d0ddd57647 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 29 Sep 2022 20:42:01 +0200 Subject: [PATCH] Fix mptcp version and openmptcprouter-vps script --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index df34db4d3..db37d8045 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -757,7 +757,8 @@ _set_mptcp_vps() { scheduler="$(uci -q get network.globals.mptcp_scheduler)" syn_retries="$(uci -q get network.globals.mptcp_syn_retries)" congestion="$(uci -q get network.globals.congestion)" - mptcp_version="0" + mptcp_version="$(uci -q get network.globals.mptcp_version)" + [ -z "$mptcp_version" ] && mptcp_version="0" [ ! -f /proc/sys/net/mptcp/mptcp_enabled ] && mptcp_version="1" [ -z "$congestion" ] && congestion="bbr" if [ "$mptcp_enabled_current" != "$mptcp_enabled" ] || [ "$checksum_current" != "$checksum" ] || ([ "$path_manager_current" != "" ] && [ "$path_manager_current" != "$path_manager" ]) || ([ "$scheduler_current" != "" ] && [ "$scheduler_current" != "$scheduler" ]) || ([ "$syn_retries_current" != "" ] && [ "$syn_retries_current" != "$syn_retries" ]) || [ "$congestion_control_current" != "$congestion" ] || [ "$mptcp_version_current" != "$mptcp_version" ]; then @@ -1863,7 +1864,7 @@ _get_token() { _config_service() { servername=$1 vps_config="" - servertoken=$(_get_token $servername) + tokenserver=$(_get_token $servername) server="$(echo $tokenserver | cut -f1 -d:)" serverport="$(echo $tokenserver | cut -f2 -d:)" token="$(echo $tokenserver | cut -f3 -d:)"