From abc46bdad1943b2e5a19b35e5fbc53a40e9cfc07 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Apr 2021 14:07:16 +0200 Subject: [PATCH 1/6] Fix gateway down issue --- omr-tracker/files/bin/omr-tracker | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index 9d56f9bf7..8ba1dcf18 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -376,7 +376,7 @@ while true; do OMR_TRACKER_STATUS="OK" fi 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 +388,12 @@ while true; do OMR_TRACKER_STATUS="OK" break fi - elif [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]); then + elif [ "$serverip_ping" != false ]; 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 From 28a9bbdd0e2f422c776dc43081568e749d7f033f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Apr 2021 14:07:38 +0200 Subject: [PATCH 2/6] Rename wan to public ip --- .../luasrc/view/openmptcprouter/wanstatus.htm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) { From 1ad75740543800d6ca17ff02bf0aada6c053f9ad Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Apr 2021 15:46:18 +0200 Subject: [PATCH 3/6] Fix omr-bypass --- luci-app-omr-bypass/root/etc/init.d/omr-bypass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 9828e5a93e693dcfd8a99a6fe58e0a0d77478736 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Apr 2021 15:46:50 +0200 Subject: [PATCH 4/6] Restart omr-bypass only if not init script running --- mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f8620c79a..4abf98d77 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 From 0ef658447dfe5f7c5fecdfa604ae4021e082b9fd Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Apr 2021 15:57:35 +0200 Subject: [PATCH 5/6] Try again to really fix omr-tracker --- omr-tracker/files/bin/omr-tracker | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index 8ba1dcf18..bd8bf7d3d 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -375,6 +375,9 @@ 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" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then serverip_ping=false @@ -388,10 +391,6 @@ while true; do OMR_TRACKER_STATUS="OK" break fi - elif [ "$serverip_ping" != false ]; then - OMR_TRACKER_STATUS_MSG="" - OMR_TRACKER_STATUS="OK" - break fi [ "$OMR_TRACKER_STATUS" = "OK" ] && break elif ! $(exit $status); then @@ -476,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 @@ -489,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 From 9a120ae50208c268109504315c071efdd09d09b6 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Apr 2021 16:42:40 +0200 Subject: [PATCH 6/6] Replace WAN by public in status page --- .../po/templates/openmptcprouter.pot | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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