From ab3c5fbdaebe131b2fccd15c8bbb066297795082 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 31 Mar 2021 19:57:36 +0200 Subject: [PATCH 1/2] Doesn't remove parameters if empty --- .../htdocs/luci-static/resources/view/services/glorytun-tcp.js | 1 + .../htdocs/luci-static/resources/view/services/glorytun-udp.js | 2 +- .../htdocs/luci-static/resources/view/services/mlvpn.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js b/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js index 4b336e339..d5e20158e 100644 --- a/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js +++ b/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js @@ -32,6 +32,7 @@ return L.view.extend({ s.tab('advanced', _('Advanced Settings')); o = s.taboption('general', form.Flag, 'enable', _('Enabled')); + o.rmempty = false; o = s.taboption('general',form.Value, 'label', _('Label')); o.rmempty = true; diff --git a/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js b/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js index b14b4fb4a..b9e0681fb 100644 --- a/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js +++ b/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js @@ -40,11 +40,11 @@ return L.view.extend({ s.tab('advanced', _('Advanced Settings')); o = s.taboption('general', form.Flag, 'enable', _('Enabled')); + o.rmempty = false; o = s.taboption('general',form.Value, 'label', _('Label')); o.rmempty = true; - o = s.taboption('general', form.ListValue, 'mode', _('Mode')); o.value('to',_('Client')); o.value('from',_('Server')); diff --git a/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js b/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js index 014232d7a..e7259c44a 100644 --- a/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js +++ b/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js @@ -74,6 +74,7 @@ return L.view.extend({ o = s.taboption('advanced', form.Flag, 'cleartext_data', _('Disable encryption')); o.default = o.disabled; + o.rmempty = false; o = s.taboption('advanced', form.Value, 'loss_tolerance', _('Loss tolerance')); o.default = '50'; From 5fd2bd2fd36698de873da0cd7db26302ccdaf3d1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 31 Mar 2021 19:57:58 +0200 Subject: [PATCH 2/2] Check only shadowsocks --- omr-tracker/files/bin/omr-tracker-ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss index a7a3639c7..28f54b41a 100755 --- a/omr-tracker/files/bin/omr-tracker-ss +++ b/omr-tracker/files/bin/omr-tracker-ss @@ -91,7 +91,7 @@ while true; do _log "Shadowsocks ${server} is down (can't contact via http ${nocontact})" uci -q set openmptcprouter.omr.ss_${server}="down" uci -q commit openmptcprouter.omr - [ "$(uci show openmptcprouter.omr | grep ss | grep up)" = "" ] && /etc/init.d/shadowsocks-libev rules_down 2> /dev/null + [ "$(uci show openmptcprouter.omr | grep ss_ | grep up)" = "" ] && /etc/init.d/shadowsocks-libev rules_down 2> /dev/null _get_ip server_ping=false serverip="$(uci -q get shadowsocks-libev.${server}.server)"