sync (#576)

suyuan168 · Dec 2, 2024 · e434be1 · e434be1
2 parents ce8d79e + 02ba2a9
commit e434be1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git 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

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
@@ -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