From 0dd12e548595a34ddb7a940b3425ebacc6726cf2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 16 Mar 2021 09:30:31 +0100 Subject: [PATCH] Add mlvpn configuration to server --- .../files/etc/init.d/openmptcprouter-vps | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index f218d2d81..51cfe728c 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -128,7 +128,7 @@ _set_openvpn_vps() { current_key="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.client_key')" current_port="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.port')" current_cipher="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.cipher')" - if [ "$curent_key" != "$key" ]; then + if [ "$current_key" != "$key" ]; then uci -q set openmptcprouter.${servername}.get_config="1" fi if [ "$current_port" != "$port" ] || [ "$current_cipher" != "$cipher" ]; then @@ -140,6 +140,32 @@ _set_openvpn_vps() { fi } +_set_mlvpn_vps() { + local enabled port key + enabled="$(uci -q get mlvpn.general.enable)" + [ "$enabled" != "1" ] && echo "MLVPN disabled" && return + timeout="$(uci -q get mlvpn.general.timeout)" + reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)" + loss_tolerence="$(uci -q get mlvpn.general.loss_tolerence)" + password="$(uci -q get mlvpn.general.password)" + cleartext_data="$(uci -q get mlvpn.general.cleartext_data)" + local current_timeout current_reorder_buffer_size current_loss_tolerence current_password current_cleartext_data + [ -z "$vps_config" ] && vps_config=$(_get_json "config") + [ -z "$vps_config" ] && return + current_timeout="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.timeout')" + current_reorder_buffer_size="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.reorder_buffer_size')" + current_loss_tolerence="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.loss_tolerence')" + current_password="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.key')" + current_cleartext_data="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.cleartext_data')" + if [ "$current_timeout" != "$timeout" ] || [ "$current_reorder_buffer_size" != "$reorder_buffer_size" ] || [ "$current_loss_tolerence" != "$loss_tolerence" ] || [ "$current_password" != "$password" ] || [ "$current_cleartext_data" != "$cleartext_data" ]; then + local settings + settings='{"timeout": '$timeout', "reorder_buffer_size": "'$reorder_buffer_size'", "loss_tolerence": "'$loss_tolerence'", "password": "'$password'", "cleartext_data": "'$cleartext_data'"}' + echo $(_set_json "mlvpn" "$settings") + else + echo 1 + fi +} + _set_wireguard_vps() { local enabled port key ipskey="" @@ -1729,6 +1755,7 @@ _config_service() { _set_v2ray_server_vps [ -z "$(_set_glorytun_vps)" ] && error=1 [ -z "$(_set_openvpn_vps)" ] && error=1 + [ -z "$(_set_mlvpn_vps)" ] && error=1 _set_vps_firewall _set_wireguard_vps fi