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

https-dns-proxy: only restart firewall when needed

Browse source 
* only restart firewall when needed

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin 2023-12-11 13:18:21 +00:00
parent 90300e54ef
commit 8b6635bae9
3 changed files with 8 additions and 7 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:=2023-10-25 PKG_VERSION:=2023-10-25
PKG_RELEASE:=4 PKG_RELEASE:=5
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/

11
net/https-dns-proxy/files/etc/init.d/https-dns-proxy
View file

@ -31,6 +31,7 @@ readonly canaryDomainsiCloud='mask.icloud.com mask-h2.icloud.com'
on_boot_trigger= on_boot_trigger=
dnsmasq_restart() { [ -x /etc/init.d/dnsmasq ] || return 1; /etc/init.d/dnsmasq restart >/dev/null 2>&1; } dnsmasq_restart() { [ -x /etc/init.d/dnsmasq ] || return 1; /etc/init.d/dnsmasq restart >/dev/null 2>&1; }
is_fw4_restart_needed() { [ "$(uci_get "$packageName" 'config' 'force_dns' '1')" = '1' ]; }
is_mac_address() { expr "$1" : '[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]$' >/dev/null; } is_mac_address() { expr "$1" : '[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]:[0-9A-F][0-9A-F]$' >/dev/null; }
is_ipv4() { expr "$1" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' >/dev/null; } is_ipv4() { expr "$1" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' >/dev/null; }
is_ipv6() { ! is_mac_address "$1" && str_contains "$1" ":"; } is_ipv6() { ! is_mac_address "$1" && str_contains "$1" ":"; }
@ -168,7 +169,7 @@ start_instance() {
json_add_object mdns json_add_object mdns
procd_add_mdns_service "$packageName" 'udp' "$port" "DNS over HTTPS proxy" procd_add_mdns_service "$packageName" 'udp' "$port" "DNS over HTTPS proxy"
json_close_object json_close_object
if [ "$force_dns" -ne 0 ]; then if [ "$force_dns" -ne '0' ]; then
json_add_array firewall json_add_array firewall
for iface in $procd_fw_src_interfaces; do for iface in $procd_fw_src_interfaces; do
for p in $force_dns_port; do for p in $force_dns_port; do
@ -218,7 +219,7 @@ start_instance() {
fi fi
output_ok output_ok
port="$((port+1))" port="$((port+1))"
force_dns=0 force_dns='0'
else else
output_fail output_fail
fi fi
@ -318,8 +319,8 @@ service_triggers() {
procd_add_config_trigger "config.change" "$packageName" "/etc/init.d/${packageName}" reload 'on_config_change' procd_add_config_trigger "config.change" "$packageName" "/etc/init.d/${packageName}" reload 'on_config_change'
} }
service_started() { procd_set_config_changed firewall; } service_started() { is_fw4_restart_needed && procd_set_config_changed firewall; }
service_stopped() { procd_set_config_changed firewall; } service_stopped() { is_fw4_restart_needed && procd_set_config_changed firewall; }
restart() { procd_send_signal "$packageName"; rc_procd start_service "$*"; } restart() { procd_send_signal "$packageName"; rc_procd start_service "$*"; }
dnsmasq_doh_server() { dnsmasq_doh_server() {
@ -339,7 +340,7 @@ dnsmasq_doh_server() {
uci_add_list_if_new 'dhcp' "$cfg" 'doh_server' "${address}#${port}" uci_add_list_if_new 'dhcp' "$cfg" 'doh_server' "${address}#${port}"
;; ;;
remove) remove)
for i in $(uci -q get "dhcp.$cfg.doh_server"); do for i in $(uci_get 'dhcp' "$cfg" 'doh_server'); do
uci_remove_list 'dhcp' "$cfg" 'server' "$i" uci_remove_list 'dhcp' "$cfg" 'server' "$i"
uci_remove_list 'dhcp' "$cfg" 'doh_server' "$i" uci_remove_list 'dhcp' "$cfg" 'doh_server' "$i"
done done

2
net/https-dns-proxy/patches/020-src-options.c-add-version.patch
View file

@ -5,7 +5,7 @@
return SW_VERSION; return SW_VERSION;
#else #else
- return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year - return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year
+ return "2023-10-25-4"; // update date sometimes, like 1-2 times a year + return "2023-10-25-5"; // update date sometimes, like 1-2 times a year
#endif #endif
} }