From 26b49f5bbb1060daa22a7fc0e156f60b0e2334b8 Mon Sep 17 00:00:00 2001
From: itdoginfo <koalav42@gmail.com>
Date: Tue, 15 Apr 2025 00:15:28 +0300
Subject: [PATCH] Check fix

---
 README.md                      |  3 +++
 podkop/files/etc/init.d/podkop | 24 ------------------------
 podkop/files/usr/bin/podkop    |  8 ++------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 35488d5..7e13c27 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,9 @@ Luci: Services/podkop
 - [ ] Сделать галку запрещающую подкопу редачить dhcp. Допилить в исключение вместе с пустыми полями proxy и vpn (нужно wiki)
 - [ ] Рестарт сервиса без рестарта dnsmasq
 - [ ] `ash: can't kill pid 9848: No such process` при обновлении
+- [ ] Luci: Добавить валидацию "Proxy Configuration URL". Если пустое, то ошибка. Как с интерфейсом.
+- [ ] После выключения и включения может быть: `Dnsmasq save config error: server=127.0.0.42`
+- [ ] Не грузится диагностика полностью при одной нерабочей комманде. Подумать как это можно дебажить легко. https://t.me/itdogchat/142500/378956
 
 Низкий приоритет
 - [ ] Галочка, которая режет доступ к doh серверам
diff --git a/podkop/files/etc/init.d/podkop b/podkop/files/etc/init.d/podkop
index 4879b77..c82f5d6 100755
--- a/podkop/files/etc/init.d/podkop
+++ b/podkop/files/etc/init.d/podkop
@@ -11,30 +11,6 @@ RESOLV_CONF="/etc/resolv.conf"
 start_service() {
     echo "Start podkop"
 
-    sing_box_version=$(sing-box version | head -n 1 | awk '{print $3}')
-    required_version="1.11.1"
-
-    if [ "$(echo -e "$sing_box_version\n$required_version" | sort -V | head -n 1)" != "$required_version" ]; then
-        echo "The version of sing-box ($sing_box_version) is lower than the minimum version. Update sing-box: opkg update && opkg remove sing-box && opkg install sing-box"
-        exit 1
-    fi
-
-    if opkg list-installed | grep -q iptables-mod-extra; then
-        echo "Conflicting package detected: iptables-mod-extra"
-    fi
-
-    if opkg list-installed | grep -q kmod-ipt-nat; then
-        echo "Conflicting package detected: kmod-ipt-nat"
-    fi
-
-    if grep -qE 'doh_backup_noresolv|doh_backup_server|doh_server' /etc/config/dhcp; then
-        printf "\033[31;1mDetected https-dns-proxy. Disable or uninstall it for correct functionality.\033[0m\n"
-    fi
-
-    if { ! grep -q "search lan" "$RESOLV_CONF" || ! grep -q "nameserver 127.0.0.1" "$RESOLV_CONF"; } && ! grep -q "search tail" "$RESOLV_CONF"; then
-        echo "/etc/resolv.conf does not contain 'search lan' or 'nameserver 127.0.0.1' entries"
-    fi
-    
 	procd_open_instance
 	procd_set_param command /bin/sh -c "/usr/bin/podkop start"
 	procd_set_param stdout 1
diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop
index 3bd0526..4bd39d3 100755
--- a/podkop/files/usr/bin/podkop
+++ b/podkop/files/usr/bin/podkop
@@ -61,16 +61,12 @@ start() {
         log "[critical] Conflicting package detected: iptables-mod-extra"
     fi
 
-    if opkg list-installed | grep -q kmod-ipt-nat; then
-        log "[critical] Conflicting package detected: kmod-ipt-nat"
-    fi
-
     if grep -qE 'doh_backup_noresolv|doh_backup_server|doh_server' /etc/config/dhcp; then
         log "[critical] Detected https-dns-proxy. Disable or uninstall it for correct functionality."
     fi
 
-    if { ! grep -q "search lan" "$RESOLV_CONF" || ! grep -q "nameserver 127.0.0.1" "$RESOLV_CONF"; } && ! grep -q "search tail" "$RESOLV_CONF"; then
-        log "[critical] /etc/resolv.conf does not contain 'search lan' or 'nameserver 127.0.0.1' entries"
+    if grep -E "^nameserver\s+([0-9]{1,3}\.){3}[0-9]{1,3}" "$RESOLV_CONF" | grep -vqE "127\.0\.0\.1|0\.0\.0\.0"; then
+        log "[critical] /etc/resolv.conf contains an external nameserver"
     fi
 
     migration