diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index d3cb34a89..cd1b585b9 100755
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -381,7 +381,7 @@
<% if nixio.fs.access("/usr/sbin/mlvpn") then %>selected="selected"<% end %>>MLVPN <% end %>
<% if nixio.fs.access("/usr/sbin/ubond") then %>selected="selected"<% end %>>UBOND <% end %>
<% if nixio.fs.access("/etc/init.d/openvpn") then %>selected="selected"<% end %>>OpenVPN <% end %>
- <% if nixio.fs.access("/etc/init.d/openvpnbonding") then %>selected="selected"<% end %>>OpenVPN Bonding <% end %>
+
selected="selected"<% end %>>None
<%
end
@@ -535,7 +535,7 @@
<%:Interfaces settings%>
- <%:You must disable DHCP on your modems and set IP in different networks.%>
+
<%
for _, iface in ipairs(net:get_networks()) do
local ifname = iface:name()
diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index 50337a094..ad12bdf13 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -6,10 +6,10 @@ basename="$(basename $0)"
if [ -f /usr/sbin/iptables-legacy ]; then
IPTABLES="/usr/sbin/iptables-legacy"
- IPTABLESAVE="/usr/sbin/iptables-legacy-save"
+ IPTABLESSAVE="/usr/sbin/iptables-legacy-save"
else
IPTABLES="/usr/sbin/iptables"
- IPTABLESAVE="/usr/sbin/iptables-save"
+ IPTABLESSAVE="/usr/sbin/iptables-save"
fi
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:)"