From 416af94918ed4820e1f265fa93723a7de20ed9a4 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 2 Dec 2024 10:19:51 +0100 Subject: [PATCH 1/2] In OMR-Tracker, Post-Tracking, 003-up script always check connection state even if no status changes --- omr-tracker/files/usr/share/omr/post-tracking.d/003-up | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omr-tracker/files/usr/share/omr/post-tracking.d/003-up b/omr-tracker/files/usr/share/omr/post-tracking.d/003-up index 52e349f16..21be40f3d 100755 --- a/omr-tracker/files/usr/share/omr/post-tracking.d/003-up +++ b/omr-tracker/files/usr/share/omr/post-tracking.d/003-up @@ -11,9 +11,9 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then exit 0 fi -if [ "$OMR_TRACKER_INTERFACE" != "omrvpn" ] && [ "$OMR_TRACKER_INTERFACE" != "omr6in4" ] && [ "$OMR_TRACKER_PREV_STATUS" = "$OMR_TRACKER_STATUS" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && [ "$OMR_TRACKER_PREV_DEVICE_IP" = "$OMR_TRACKER_DEVICE_IP" ] && [ "$OMR_TRACKER_PREV_DEVICE_IP6" = "$OMR_TRACKER_DEVICE_IP6" ] && (([ -n "$OMR_TRACKER_DEVICE_GATEWAY" ] && [ -n "$(ip r show table 991337)" ]) || ([ -n "$OMR_TRACKER_DEVICE_GATEWAY6" ] && [ -n "$(ip -6 r show table 6991337)" ])); then - exit 0 -fi +#if [ "$OMR_TRACKER_INTERFACE" != "omrvpn" ] && [ "$OMR_TRACKER_INTERFACE" != "omr6in4" ] && [ "$OMR_TRACKER_PREV_STATUS" = "$OMR_TRACKER_STATUS" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && [ "$OMR_TRACKER_PREV_DEVICE_IP" = "$OMR_TRACKER_DEVICE_IP" ] && [ "$OMR_TRACKER_PREV_DEVICE_IP6" = "$OMR_TRACKER_DEVICE_IP6" ] && (([ -n "$OMR_TRACKER_DEVICE_GATEWAY" ] && [ -n "$(ip r show table 991337)" ]) || ([ -n "$OMR_TRACKER_DEVICE_GATEWAY6" ] && [ -n "$(ip -6 r show table 6991337)" ])); then +# exit 0 +#fi SETROUTE=false From 02ba2a9e8bb6f131517a22adc25a8183577c131b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 2 Dec 2024 10:20:51 +0100 Subject: [PATCH 2/2] Add Captive Portal URLs check in available OMR-ByPass services --- omr-bypass/files/etc/uci-defaults/41_omr-bypass | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/omr-bypass/files/etc/uci-defaults/41_omr-bypass b/omr-bypass/files/etc/uci-defaults/41_omr-bypass index aa4f1f077..b23bb3082 100755 --- a/omr-bypass/files/etc/uci-defaults/41_omr-bypass +++ b/omr-bypass/files/etc/uci-defaults/41_omr-bypass @@ -153,6 +153,19 @@ if [ "$(uci -q get omr-bypass.sky)" = "" ]; then commit omr-bypass EOF fi +if [ "$(uci -q get omr-bypass.captive_portal)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set omr-bypass.captive_portal=proto + add_list omr-bypass.captive_portal.url='captive.apple.com' + add_list omr-bypass.captive_portal.url='connectivitycheck.gstatic.com' + add_list omr-bypass.captive_portal.url='clients3.google.com' + add_list omr-bypass.captive_portal.url='www.msftconnecttest.com' + add_list omr-bypass.captive_portal.url='www.msftncsi.com' + add_list omr-bypass.captive_portal.url='nmcheck.gnome.org' + add_list omr-bypass.captive_portal.url='networkcheck.kde.org' + commit omr-bypass + EOF +fi #if [ "$(uci -q get omr-bypass.global)" = "" ]; then # uci -q batch <<-EOF >/dev/null # set omr-bypass.global=global