From 12d8537d90523bcff48a9a871d445a984e329f69 Mon Sep 17 00:00:00 2001
From: Andrey Petelin <am.petelin@gmail.com>
Date: Fri, 23 Jan 2026 15:59:26 +0500
Subject: [PATCH 1/3] fix: only print colored timestamp and message when stdout
 is a terminal

---
 podkop/files/usr/lib/logging.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/podkop/files/usr/lib/logging.sh b/podkop/files/usr/lib/logging.sh
index 6a3ad6c..3a529ad 100644
--- a/podkop/files/usr/lib/logging.sh
+++ b/podkop/files/usr/lib/logging.sh
@@ -18,7 +18,9 @@ nolog() {
     local timestamp
     timestamp=$(date +"%Y-%m-%d %H:%M:%S")
 
-    echo -e "${COLOR_CYAN}[$timestamp]${COLOR_RESET} ${COLOR_GREEN}$message${COLOR_RESET}"
+    if [ -t 1 ]; then
+        echo -e "${COLOR_CYAN}[$timestamp]${COLOR_RESET} ${COLOR_GREEN}$message${COLOR_RESET}"
+    fi
 }
 
 echolog() {

From b44274d7f283ce47f2d65a77facd7ff28437d0e8 Mon Sep 17 00:00:00 2001
From: Andrey Petelin <am.petelin@gmail.com>
Date: Fri, 23 Jan 2026 16:00:34 +0500
Subject: [PATCH 2/3] fix: mask selector_proxy_links in podkop redaction to
 hide sensitive proxy selectors

---
 podkop/files/usr/bin/podkop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop
index f4fee50..399c9d3 100755
--- a/podkop/files/usr/bin/podkop
+++ b/podkop/files/usr/bin/podkop
@@ -1831,6 +1831,7 @@ show_config() {
     sed -e 's/\(option proxy_string\).*/\1 '\''MASKED'\''/g' \
         -e '/option outbound_json/,/^}/c\	option outbound_json '\''MASKED'\''' \
         -e 's/\(list urltest_proxy_links\).*/\1 '\''MASKED'\''/g' \
+        -e 's/\(list selector_proxy_links\).*/\1 '\''MASKED'\''/g' \
         -e "s@\\(option dns_server '[^/]*\\)/[^']*'@\\1/MASKED'@g" \
         -e "s@\\(option domain_resolver_dns_server '[^/]*\\)/[^']*'@\\1/MASKED'@g" \
         -e 's/\(option yacd_secret_key\).*/\1 '\''MASKED'\''/g' \

From d854caa4ccff0fffaefb676720fbad7ebf2314dc Mon Sep 17 00:00:00 2001
From: Andrey Petelin <am.petelin@gmail.com>
Date: Fri, 23 Jan 2026 17:42:05 +0500
Subject: [PATCH 3/3] fix: Disable dnsmasq noresolv when restoring or using
 default resolvfile; ensure resolvfile is applied

---
 podkop/files/usr/bin/podkop | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop
index 399c9d3..fafaa79 100755
--- a/podkop/files/usr/bin/podkop
+++ b/podkop/files/usr/bin/podkop
@@ -253,7 +253,7 @@ br_netfilter_disable() {
 route_table_rule_mark() {
     grep -q "105 $RT_TABLE_NAME" /etc/iproute2/rt_tables || echo "105 $RT_TABLE_NAME" >> /etc/iproute2/rt_tables
 
-    if ! ip route list table "$RT_TABLE_NAME" 2>/dev/null | grep -q "local default dev lo scope host"; then
+    if ! ip route list table "$RT_TABLE_NAME" 2> /dev/null | grep -q "local default dev lo scope host"; then
         log "Added route for tproxy" "debug"
         ip route add local 0.0.0.0/0 dev lo table "$RT_TABLE_NAME"
     else
@@ -400,7 +400,6 @@ dnsmasq_restore() {
     log "Restoring noresolv" "debug"
     noresolv="$(uci_get "dhcp" "@dnsmasq[0]" "podkop_noresolv")"
     if [ -z "$noresolv" ]; then
-        uci_remove "dhcp" "@dnsmasq[0]" "noresolv"
         uci_set "dhcp" "@dnsmasq[0]" "noresolv" 0
     else
         uci_set "dhcp" "@dnsmasq[0]" "noresolv" "$noresolv"
@@ -419,6 +418,10 @@ dnsmasq_restore() {
     elif file_exists "$resolvfile"; then
         log "Backup DNS servers not found, using default resolvfile" "debug"
         uci_set "dhcp" "@dnsmasq[0]" "resolvfile" "$resolvfile"
+        if [ -n "$noresolv" ] && [ "$noresolv" -eq 1 ]; then
+            log "Disabling noresolv option to use system resolvfile" "debug"
+            uci_set "dhcp" "@dnsmasq[0]" "noresolv" 0
+        fi
     else
         log "Backup DNS servers and default resolvfile not found, possible resolving issues" "warn"
     fi