diff options
| author | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2020-02-02 13:08:46 +1000 |
|---|---|---|
| committer | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2020-03-12 19:03:06 +1000 |
| commit | 3d9b512685068514c3cd09346acbfd7d8c4f3ac1 (patch) | |
| tree | dfe7b87bab336930d2c3dfb82b41a762b6a89828 /net/https-dns-proxy/files/https-dns-proxy.init | |
| parent | 093aa472c88df3cd990e0fcdc199e0b4d0687b51 (diff) | |
https-dns-proxy: Update for reverted commit
* Reapplied daf538d8c63a2be72e32f87276ca06db7dc7df5e
* Updated README
* Replaced the ipv4_resolvers option with a ipv6_resolvers_only option
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Diffstat (limited to 'net/https-dns-proxy/files/https-dns-proxy.init')
| -rwxr-xr-x | net/https-dns-proxy/files/https-dns-proxy.init | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/net/https-dns-proxy/files/https-dns-proxy.init b/net/https-dns-proxy/files/https-dns-proxy.init index 91c9f1ae0..8dd509edb 100755 --- a/net/https-dns-proxy/files/https-dns-proxy.init +++ b/net/https-dns-proxy/files/https-dns-proxy.init @@ -46,13 +46,17 @@ start_instance() { append_parm "$cfg" 'proxy_server' '-t' append_parm "$cfg" 'logfile' '-l' append_bool "$cfg" 'use_http1' '-x' - append_bool "$cfg" 'ipv4_resolvers' '-4' config_get verbosity "$cfg" 'verbosity' "0" for i in $(seq 1 $verbosity); do xappend "-v" done + config_get_bool ipv6_resolvers_only "$cfg" 'ipv6_resolvers_only' '0' + if [ "$ipv6_resolvers_only" == 0 ]; then + xappend "-4" + fi + procd_open_instance # shellcheck disable=SC2086 procd_set_param command ${PROG} ${param} @@ -64,22 +68,12 @@ start_instance() { config_get listen_addr "$cfg" 'listen_addr' '127.0.0.1' config_get listen_port "$cfg" 'listen_port' "$p" - # Don't add the any address to dnsmasq - case $listen_addr in - 0.0.0.0|::ffff:0.0.0.0) - listen_addr='127.0.0.1' - ;; - ::) - listen_addr='::1' - ;; - esac - if [ "$dnsmasqConfig" = "*" ]; then config_load 'dhcp' - config_foreach dnsmasq_add_doh_server 'dnsmasq' "${listen_addr}#${listen_port}" + config_foreach dnsmasq_add_doh_server 'dnsmasq' "${listen_addr}" "${listen_port}" elif [ -n "$dnsmasqConfig" ]; then for i in $dnsmasqConfig; do - dnsmasq_add_doh_server "@dnsmasq[${i}]" "${listen_addr}#${listen_port}" + dnsmasq_add_doh_server "@dnsmasq[${i}]" "${listen_addr}" "${listen_port}" done fi p="$((p+1))" @@ -117,9 +111,20 @@ service_triggers() { } dnsmasq_add_doh_server() { - local cfg="$1" value="$2" - uci -q del_list dhcp."$cfg".server="$value" - uci -q add_list dhcp."$cfg".server="$value" + local cfg="$1" address="$2" port="$3" + + # Don't add the any address to dnsmasq + case $address in + 0.0.0.0|::ffff:0.0.0.0) + address='127.0.0.1' + ;; + ::) + address='::1' + ;; + esac + + uci -q del_list dhcp."$cfg".server="$address#$port" + uci -q add_list dhcp."$cfg".server="$address#$port" } dnsmasq_create_server_backup() { |