diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
index e2b669ff9..60faa85e6 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -97,7 +97,7 @@ _bypass_domain() {
fi
fi
if [ "$(uci -q get dhcp.@dnsmasq[0].ipset | grep /$domain/)" = "" ]; then
- uci -q add_list dhcp.@dnsmasq[0].ipset="/$domain/omr_dst_bypass_$intfuci,omr6_dst_bypass_$intf"
+ uci -q add_list dhcp.@dnsmasq[0].ipset="/$domain/omr_dst_bypass_$intf,omr6_dst_bypass_$intf"
else
dnsmasqipset=$(uci -q get dhcp.@dnsmasq[0].ipset | sed 's/ /\n/g')
for dnsipset in $dnsmasqipset; do
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index d7069e493..d0eaafee4 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -261,7 +261,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
}
if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
{
- statusMessage += '<%:No server IP address, No WAN IP address%>' + '
';
+ statusMessage += '<%:No server IP address, No public IP address%>' + '
';
}
if (mArray.openmptcprouter.service_addr !== "" && (mArray.openmptcprouter.wan_addr !== "" || mArray.openmptcprouter.wan_addr6 !== "") && mArray.openmptcprouter.vps_status == "DOWN")
{
@@ -287,7 +287,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
statusMessage += '<%:Can\'t get public IP address from V2Ray%>' + '
';
} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.external_check == true)
{
- statusMessage += '<%:No WAN IP address detected in less than 1 second%>' + '
';
+ statusMessage += '<%:No public IP address detected in less than 1 second%>' + '
';
}
if (mArray.openmptcprouter.vps_admin == false)
{
diff --git a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot
index aab168303..4fd263377 100644
--- a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot
+++ b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot
@@ -618,10 +618,6 @@ msgstr ""
msgid "No Server ping response after 1 second"
msgstr ""
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:290
-msgid "No WAN IP address detected in less than 1 second"
-msgstr ""
-
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:648
msgid "No WAN with multipath enabled:"
msgstr ""
@@ -648,8 +644,12 @@ msgstr ""
msgid "No output"
msgstr ""
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:290
+msgid "No public IP address detected in less than 1 second"
+msgstr ""
+
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:264
-msgid "No server IP address, No WAN IP address"
+msgid "No server IP address, No public IP address"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:277
diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index 27854144e..f4ad9a26b 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -1344,7 +1344,7 @@ if [ -n "$(logread | tail -n 2 | grep 'Ring expansion failed')" ]; then
echo 1 > /sys/bus/pci/rescan
fi
-if [ "$(iptables-save | grep omr-bypass)" = "" ]; then
+if [ "$(iptables-save | grep omr-bypass)" = "" ] && [ "$(pgrep omr-bypass)" = "" ]; then
_log "Can't find omr-bypass rules, restart omr-bypass..."
/etc/init.d/omr-bypass
fi
diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index 9d56f9bf7..bd8bf7d3d 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -375,8 +375,11 @@ while true; do
OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK"
fi
+ else
+ OMR_TRACKER_STATUS_MSG=""
+ OMR_TRACKER_STATUS="OK"
fi
- if [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]) && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
+ if [ "$serverip_ping" != false ] && [ "$OMR_TRACKER_STATUS" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
serverip_ping=false
config_load openmptcprouter
config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP
@@ -388,11 +391,8 @@ while true; do
OMR_TRACKER_STATUS="OK"
break
fi
- elif [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]); then
- OMR_TRACKER_STATUS_MSG=""
- OMR_TRACKER_STATUS="OK"
- break
fi
+ [ "$OMR_TRACKER_STATUS" = "OK" ] && break
elif ! $(exit $status); then
OMR_TRACKER_STATUS_MSG="gateway down"
fi
@@ -475,8 +475,11 @@ while true; do
OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK"
fi
+ else
+ OMR_TRACKER_STATUS_MSG=""
+ OMR_TRACKER_STATUS="OK"
fi
- if [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]) && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
+ if [ "$serverip_ping" != false ] && [ "$OMR_TRACKER_STATUS" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
serverip_ping=false
config_load openmptcprouter
config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP
@@ -488,11 +491,8 @@ while true; do
OMR_TRACKER_STATUS="OK"
break
fi
- elif [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]); then
- OMR_TRACKER_STATUS_MSG=""
- OMR_TRACKER_STATUS="OK"
- break
fi
+ [ "$OMR_TRACKER_STATUS" = "OK" ] && break
elif ! $(exit $status); then
OMR_TRACKER_STATUS_MSG="gateway down"
fi