Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-07 20:16:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Improve dnsmasq configuration logic for DNS handling

Browse Source
This commit is contained in:
Andrey Petelin
2025-09-07 18:11:46 +05:00
parent e5be9c3fd1
commit d70a04b144
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
podkop/files/usr/bin/podkop
View File

@@ -436,10 +436,7 @@ dnsmasq_add_resolver() {
uci -q delete dhcp.@dnsmasq[0].podkop_server uci -q delete dhcp.@dnsmasq[0].podkop_server
for server in $(uci get dhcp.@dnsmasq[0].server 2>/dev/null); do for server in $(uci get dhcp.@dnsmasq[0].server 2>/dev/null); do
if [[ "$server" == "127.0.0.42" ]]; then if ! [ "$server" == "$SB_DNS_INBOUND_ADDRESS" ]; then
log "Dnsmasq save config error: server=127.0.0.42 is already configured. Skip editing DHCP"
return
else
uci add_list dhcp.@dnsmasq[0].podkop_server="$server" uci add_list dhcp.@dnsmasq[0].podkop_server="$server"
fi fi
done done
@@ -448,47 +445,62 @@ dnsmasq_add_resolver() {
save_dnsmasq_config "dhcp.@dnsmasq[0].cachesize" "dhcp.@dnsmasq[0].podkop_cachesize" save_dnsmasq_config "dhcp.@dnsmasq[0].cachesize" "dhcp.@dnsmasq[0].podkop_cachesize"
log "Configure dnsmasq for sing-box" log "Configure dnsmasq for sing-box"
uci -q delete dhcp.@dnsmasq[0].server
uci add_list dhcp.@dnsmasq[0].server="$SB_DNS_INBOUND_ADDRESS"
uci set dhcp.@dnsmasq[0].noresolv="1" uci set dhcp.@dnsmasq[0].noresolv="1"
uci set dhcp.@dnsmasq[0].cachesize="0" uci set dhcp.@dnsmasq[0].cachesize="0"
uci -q delete dhcp.@dnsmasq[0].server
uci add_list dhcp.@dnsmasq[0].server="127.0.0.42"
uci commit dhcp uci commit dhcp
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart
} }
dnsmasq_restore() { dnsmasq_restore() {
log "Removing configuration for dnsmasq" log "Restoring the dnsmasq configuration"
local cachesize noresolv server local cachesize noresolv current_servers backup_servers found_in_backup
cachesize=$(uci get dhcp.@dnsmasq[0].podkop_cachesize 2>/dev/null) cachesize=$(uci get dhcp.@dnsmasq[0].podkop_cachesize 2>/dev/null)
if [[ "$cachesize" == "unset" ]]; then if [[ "$cachesize" == "unset" ]]; then
log "dnsmasq revert: cachesize is unset" log "Cachesize is unset" "debug"
uci -q delete dhcp.@dnsmasq[0].cachesize uci -q delete dhcp.@dnsmasq[0].cachesize
else else
uci set dhcp.@dnsmasq[0].cachesize="$cachesize" uci set dhcp.@dnsmasq[0].cachesize="$cachesize"
fi fi
uci delete dhcp.@dnsmasq[0].podkop_cachesize
noresolv=$(uci get dhcp.@dnsmasq[0].podkop_noresolv 2>/dev/null) noresolv=$(uci get dhcp.@dnsmasq[0].podkop_noresolv 2>/dev/null)
if [[ "$noresolv" == "unset" ]]; then if [[ "$noresolv" == "unset" ]]; then
log "dnsmasq revert: noresolv is unset" log "Noresolv is unset" "debug"
uci -q delete dhcp.@dnsmasq[0].noresolv uci -q delete dhcp.@dnsmasq[0].noresolv
else else
uci set dhcp.@dnsmasq[0].noresolv="$noresolv" uci set dhcp.@dnsmasq[0].noresolv="$noresolv"
fi fi
server=$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)
if [[ "$server" == "127.0.0.42" ]]; then
uci -q delete dhcp.@dnsmasq[0].server 2>/dev/null
for server in $(uci get dhcp.@dnsmasq[0].podkop_server 2>/dev/null); do
uci add_list dhcp.@dnsmasq[0].server="$server"
done
uci delete dhcp.@dnsmasq[0].podkop_server 2>/dev/null
fi
uci delete dhcp.@dnsmasq[0].podkop_cachesize
uci delete dhcp.@dnsmasq[0].podkop_noresolv uci delete dhcp.@dnsmasq[0].podkop_noresolv
current_servers=$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)
backup_servers=$(uci get dhcp.@dnsmasq[0].podkop_server 2>/dev/null)
uci -q delete dhcp.@dnsmasq[0].server 2>/dev/null
for server in $current_servers; do
[ "$server" = "$SB_DNS_INBOUND_ADDRESS" ] && continue
found_in_backup=0
for backup_server in $backup_servers; do
if [ "$server" = "$backup_server" ]; then
found_in_backup=1
break
fi
done
[ "$found_in_backup" -eq 1 ] && continue
uci add_list dhcp.@dnsmasq[0].server="$server"
done
backup_servers=$(uci get dhcp.@dnsmasq[0].podkop_server 2>/dev/null)
for server in $backup_servers; do
uci add_list dhcp.@dnsmasq[0].server="$server"
done
uci delete dhcp.@dnsmasq[0].podkop_server 2>/dev/null
uci commit dhcp uci commit dhcp
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart