Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

https-dns-proxy: init script refactoring

Browse source 
* consolidate dnsmasq config manipulation into one function
* more elegant code for PROCD data processing (Thanks @jow-!)

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin 2022-02-06 05:58:03 +00:00
parent ca0549109d
commit 88265c4fb9
2 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/https-dns-proxy/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=https-dns-proxy PKG_NAME:=https-dns-proxy
PKG_VERSION:=2021-11-22 PKG_VERSION:=2021-11-22
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/

48
net/https-dns-proxy/files/https-dns-proxy.init
View file

@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright 2019-2020 Stan Grishin (stangri@melmac.ca) # Copyright 2019-2022 Stan Grishin (stangri@melmac.ca)
# shellcheck disable=SC1091,SC2039,SC3043,SC3060 # shellcheck disable=SC1091,SC2039,SC3043,SC3060
PKG_VERSION='dev-test' PKG_VERSION='dev-test'
@ -176,13 +176,13 @@ start_instance() {
config_get listen_port "$cfg" 'listen_port' "$port" config_get listen_port "$cfg" 'listen_port' "$port"
if [ "$dnsmasqConfig" = '*' ]; then if [ "$dnsmasqConfig" = '*' ]; then
config_load 'dhcp' config_load 'dhcp'
config_foreach dnsmasq_add_doh_server 'dnsmasq' "${listen_addr}" "${listen_port}" config_foreach dnsmasq_doh_server 'dnsmasq' 'add' "${listen_addr}" "${listen_port}"
elif [ -n "$dnsmasqConfig" ]; then elif [ -n "$dnsmasqConfig" ]; then
for i in $dnsmasqConfig; do for i in $dnsmasqConfig; do
if [ -n "$(uci -q get "dhcp.@dnsmasq[$i]")" ]; then if [ -n "$(uci -q get "dhcp.@dnsmasq[$i]")" ]; then
dnsmasq_add_doh_server "@dnsmasq[$i]" "${listen_addr}" "${listen_port}" dnsmasq_doh_server "@dnsmasq[$i]" 'add' "${listen_addr}" "${listen_port}"
elif [ -n "$(uci -q get "dhcp.${i}")" ]; then elif [ -n "$(uci -q get "dhcp.${i}")" ]; then
dnsmasq_add_doh_server "${i}" "${listen_addr}" "${listen_port}" dnsmasq_doh_server "${i}" 'add' "${listen_addr}" "${listen_port}"
fi fi
done done
fi fi
@ -240,13 +240,23 @@ service_triggers() {
service_started() { procd_set_config_changed firewall; } service_started() { procd_set_config_changed firewall; }
service_stopped() { procd_set_config_changed firewall; } service_stopped() { procd_set_config_changed firewall; }
dnsmasq_add_doh_server() { dnsmasq_doh_server() {
local cfg="$1" address="$2" port="$3" local cfg="$1" param="$2" address="${3:-127.0.0.1}" port="$4" i
case $address in case "$param" in
0.0.0.0|::ffff:0.0.0.0) address='127.0.0.1';; add)
::) address='::1';; case $address in
0.0.0.0|::ffff:0.0.0.0) address='127.0.0.1';;
::) address='::1';;
esac
uci_add_list_if_new "dhcp.${cfg}.server" "${address}#${port}"
;;
remove)
eval "$(ubus call service list "{ 'verbose': true, 'name': '$packageName' }" | jsonfilter -F '# ' -e 'TUPLES=@[*].instances[*].command[4,6]')"
for i in $TUPLES; do
uci -q del_list "dhcp.${cfg}.server=${i}"
done
;;
esac esac
uci_add_list_if_new "dhcp.${cfg}.server" "${address}#${port}"
} }
dnsmasq_create_server_backup() { dnsmasq_create_server_backup() {
@ -275,15 +285,8 @@ dnsmasq_create_server_backup() {
return 0 return 0
} }
_dnsmasq_delete_instance() {
local address port i="$2"
address="$(jsonfilter -s "$ubusJson" -e "@['$packageName'].instances['$i'].command[4]")"
port="$(jsonfilter -s "$ubusJson" -e "@['$packageName'].instances['$i'].command[6]")"
uci -q del_list "dhcp.${cfg}.server=${address}#${port}"
}
dnsmasq_restore_server_backup() { dnsmasq_restore_server_backup() {
local cfg="$1" i ubusJson local cfg="$1" i
uci -q get "dhcp.${cfg}" >/dev/null || return 0 uci -q get "dhcp.${cfg}" >/dev/null || return 0
if uci -q get "dhcp.${cfg}.doh_backup_noresolv" >/dev/null; then if uci -q get "dhcp.${cfg}.doh_backup_noresolv" >/dev/null; then
if [ "$(uci -q get "dhcp.${cfg}.doh_backup_noresolv")" = "0" ]; then if [ "$(uci -q get "dhcp.${cfg}.doh_backup_noresolv")" = "0" ]; then
@ -294,16 +297,11 @@ dnsmasq_restore_server_backup() {
uci -q del "dhcp.${cfg}.doh_backup_noresolv" uci -q del "dhcp.${cfg}.doh_backup_noresolv"
fi fi
if uci -q get "dhcp.${cfg}.doh_backup_server" >/dev/null; then if uci -q get "dhcp.${cfg}.doh_backup_server" >/dev/null; then
. /usr/share/libubox/jshn.sh dnsmasq_doh_server "$cfg" 'remove'
ubusJson="$(ubus call service list "{ 'verbose': true, 'name': '$packageName' }")"
json_init
json_load "$ubusJson"
json_select "$packageName"
json_for_each_item _dnsmasq_delete_instance 'instances'
for i in $(uci -q get "dhcp.${cfg}.doh_backup_server"); do for i in $(uci -q get "dhcp.${cfg}.doh_backup_server"); do
uci_add_list_if_new "dhcp.${cfg}.server" "$i" uci_add_list_if_new "dhcp.${cfg}.server" "$i"
done done
uci -q del "dhcp.${cfg}.doh_backup_server" uci -q del "dhcp.${cfg}.doh_backup_server"
fi fi
} }