mirror of
https://github.com/m13253/dns-over-https.git
synced 2026-03-30 16:25:39 +00:00
871604f577
* Add upstream selector, there are two selector now:
- random selector
- weight random selector
random selector will choose upstream at random; weight random selector will choose upstream at random with weight
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Rewrite config and config file example, prepare for weight round robbin selector
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Replace bad implement of weight random selector with weight round robbin selector, the algorithm is nginx weight round robbin like
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Use new config module
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Disable deprecated DualStack set
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Fix typo
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Optimize upstreamSelector judge
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Fix typo
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Add config timeout unit tips
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Set wrr http client timeout to replace http request timeout
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Add weight value range
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Add a line ending for .gitignore
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Optimize config file style
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Modify Weight type to int32
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Add upstreamError
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Rewrite Selector interface and wrr implement
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Use http module predefined constant to judge req.response.StatusCode
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Use Selector.ReportUpstreamError to report upstream error for evaluation loop in real time
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Make client selector field private
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Replace config file url to URL
Add miss space for 'weight= 50'
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Rewrite Selector.ReportUpstreamError to Selector.ReportUpstreamStatus, report upstream ok in real time
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Fix checkIETFResponse: if upstream OK, won't increase weight
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Fix typo
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Rewrite wrr evaluation, concurrent check upstream and reduce interval to 15s
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Add lvs wrr selector config
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Add DebugReporter interface, when client verbose is true and the selector implements it, will report all upstream weights every 15s
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Rename WeightRoundRobinSelector to NginxWRRSelector
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Add LVSSelector
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
* Remove useless log
Signed-off-by: Sherlock Holo <sherlockya@gmail.com>
120 lines
3.4 KiB
Plaintext
120 lines
3.4 KiB
Plaintext
# DNS listen port
|
|
listen = [
|
|
"127.0.0.1:53",
|
|
"127.0.0.1:5380",
|
|
"[::1]:53",
|
|
"[::1]:5380",
|
|
]
|
|
|
|
# HTTP path for upstream resolver
|
|
|
|
# CloudFlare's resolver for Tor, available only with Tor
|
|
# Remember to disable ECS below when using Tor!
|
|
# Blog: https://blog.cloudflare.com/welcome-hidden-resolver/
|
|
#"https://dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion/dns-query",
|
|
|
|
|
|
[upstream]
|
|
|
|
# available selector: random or weighted_round_robin or lvs_weighted_round_robin
|
|
upstream_selector = "random"
|
|
|
|
# weight should in (0, 100], if upstream_selector is random, weight will be ignored
|
|
|
|
# Google's productive resolver, good ECS, bad DNSSEC
|
|
[[upstream.upstream_google]]
|
|
url = "https://dns.google.com/resolve"
|
|
weight = 50
|
|
|
|
# CloudFlare's resolver, bad ECS, good DNSSEC
|
|
[[upstream.upstream_google]]
|
|
url = "https://cloudflare-dns.com/dns-query"
|
|
weight = 50
|
|
|
|
# CloudFlare's resolver, bad ECS, good DNSSEC
|
|
[[upstream.upstream_google]]
|
|
url = "https://1.1.1.1/dns-query"
|
|
weight = 50
|
|
|
|
# Google's experimental resolver, good ECS, good DNSSEC
|
|
[[upstream.upstream_ietf]]
|
|
url = "https://dns.google.com/experimental"
|
|
weight = 50
|
|
|
|
# CloudFlare's resolver, bad ECS, good DNSSEC
|
|
[[upstream.upstream_ietf]]
|
|
url = "https://cloudflare-dns.com/dns-query"
|
|
weight = 50
|
|
|
|
# CloudFlare's resolver, bad ECS, good DNSSEC
|
|
[[upstream.upstream_ietf]]
|
|
url = "https://1.1.1.1/dns-query"
|
|
weight = 50
|
|
|
|
|
|
[others]
|
|
# Bootstrap DNS server to resolve the address of the upstream resolver
|
|
# If multiple servers are specified, a random one will be chosen each time.
|
|
# If empty, use the system DNS settings.
|
|
# If you want to preload IP addresses in /etc/hosts instead of using a
|
|
# bootstrap server, please make this list empty.
|
|
bootstrap = [
|
|
|
|
# Google's resolver, bad ECS, good DNSSEC
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53",
|
|
|
|
# CloudFlare's resolver, bad ECS, good DNSSEC
|
|
#"1.1.1.1:53",
|
|
#"1.0.0.1:53",
|
|
|
|
]
|
|
|
|
# The domain names here are directly passed to bootstrap servers listed above,
|
|
# allowing captive portal detection and systems without RTC to work.
|
|
# Only effective if at least one bootstrap server is configured.
|
|
passthrough = [
|
|
"captive.apple.com",
|
|
"connectivitycheck.gstatic.com",
|
|
"detectportal.firefox.com",
|
|
"msftconnecttest.com",
|
|
"nmcheck.gnome.org",
|
|
|
|
"pool.ntp.org",
|
|
"time.apple.com",
|
|
"time.asia.apple.com",
|
|
"time.euro.apple.com",
|
|
"time.nist.gov",
|
|
"time.windows.com",
|
|
]
|
|
|
|
# Timeout for upstream request in seconds
|
|
timeout = 30
|
|
|
|
# Disable HTTP Cookies
|
|
#
|
|
# Cookies may be useful if your upstream resolver is protected by some
|
|
# anti-DDoS services to identify clients.
|
|
# Note that DNS Cookies (an DNS protocol extension to DNS) also has the ability
|
|
# to track uesrs and is not controlled by doh-client.
|
|
no_cookies = true
|
|
|
|
# Disable EDNS0-Client-Subnet (ECS)
|
|
#
|
|
# DNS-over-HTTPS supports EDNS0-Client-Subnet protocol, which submits part of
|
|
# the client's IP address (/24 for IPv4, /56 for IPv6 by default) to the
|
|
# upstream server. This is useful for GeoDNS and CDNs to work, and is exactly
|
|
# the same configuration as most public DNS servers.
|
|
no_ecs = false
|
|
|
|
# Disable IPv6 when querying upstream
|
|
#
|
|
# Only enable this if you really have trouble connecting.
|
|
# Doh-client uses both IPv4 and IPv6 by default and should not have problems
|
|
# with an IPv4-only environment.
|
|
# Note that DNS listening and bootstrapping is not controlled by this option.
|
|
no_ipv6 = false
|
|
|
|
# Enable logging
|
|
verbose = false
|