bugfixes

Author: stangri

files/etc/init.d/https-dns-proxy

@@ -9,7 +9,7 @@ STOP=15
 # shellcheck disable=SC2034
 USE_PROCD=1
 
-[ -n "${IPKG_INSTROOT}" ] && return 0
+[ -n "${IPKG_INSTROOT}" ] && exit 0
 
 if type extra_command 1>/dev/null 2>&1; then
 	extra_command 'version' 'Show version information'
@@ -185,7 +185,7 @@ append_boot() {
 	IFS=" ,"
 	for i in $_loctmp; do
 		if { [ -z "$force_ipv6" ] && is_ipv4 "$i"; } || \
-			{ [ -z "$force_ipv6" ] && is_ipv6 "$i"; }; then
+			{ [ -n "$force_ipv6" ] && is_ipv6 "$i"; }; then
 			[ -z "$_newtmp" ] && _newtmp="$i" || _newtmp="${_newtmp},${i}"
 		fi
 	done
@@ -283,12 +283,12 @@ start_instance() {
 	procd_set_param respawn
 	procd_open_data
 	json_add_object mdns
-		procd_add_mdns_service "$packageName" 'udp' "$port" "DNS over HTTPS proxy"
+		procd_add_mdns_service "$packageName" 'udp' "$listen_port" "DNS over HTTPS proxy"
 	json_close_object
 	if [ -n "$force_dns" ]; then
 		json_add_array firewall
-		for iface in ${force_dns_src_interface/,/ }; do
-			for p in ${force_dns_port/,/ }; do
+		for iface in ${force_dns_src_interface//,/ }; do
+			for p in ${force_dns_port//,/ }; do
 				if is_port_listening "$p"; then
 					json_add_object ''
 					json_add_string type 'redirect'
@@ -385,7 +385,7 @@ service_triggers() {
 	local wan wan6 i
 	if [ -n "$hdp_boot_flag" ]; then
 		output "Setting trigger (on_boot) "
-		procd_add_raw_trigger "interface.*.up" 5000 "/etc/init.d/${packageName}" restart 'on_interface_up' && output_okn || output_failn
+		procd_add_raw_trigger "interface.*.up" 5000 "/etc/init.d/${packageName}" reload 'on_interface_up' && output_okn || output_failn
 	else
 		. "${IPKG_INSTROOT}/lib/functions/network.sh"
 		network_flush_cache
@@ -397,7 +397,7 @@ service_triggers() {
 		fi
 		output "Setting trigger${wan6:+s} for $wan ${wan6:+$wan6 }"
 		for i in $wan $wan6; do
-			procd_add_interface_trigger "interface.*" "$i" "/etc/init.d/${packageName}" restart 'on_interface_trigger' && output_ok || output_fail
+			procd_add_interface_trigger "interface.*" "$i" "/etc/init.d/${packageName}" reload 'on_interface_trigger' && output_ok || output_fail
 		done
 		output '\n'
 		procd_add_config_trigger "config.change" "$packageName" "/etc/init.d/${packageName}" reload 'on_config_change'
@@ -406,7 +406,7 @@ service_triggers() {
 
 service_started() { [ -n "$force_dns" ] && procd_set_config_changed firewall; }
 service_stopped() { [ -n "$force_dns" ] && procd_set_config_changed firewall; }
-restart() { procd_send_signal "$packageName"; rc_procd start_service "$*"; }
+restart() { reload "$@"; }
 
 dnsmasq_instance_append_force_dns_port() {
 	local cfg="$1" instance_port