mirror of
https://github.com/m13253/dns-over-https.git
synced 2026-03-30 20:45:38 +00:00
* 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>
99 lines
2.9 KiB
Go
99 lines
2.9 KiB
Go
/*
|
|
DNS-over-HTTPS
|
|
Copyright (C) 2017-2018 Star Brilliant <m13253@hotmail.com>
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a
|
|
copy of this software and associated documentation files (the "Software"),
|
|
to deal in the Software without restriction, including without limitation
|
|
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
and/or sell copies of the Software, and to permit persons to whom the
|
|
Software is furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
package config
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/BurntSushi/toml"
|
|
)
|
|
|
|
const (
|
|
Random = "random"
|
|
WeightedRoundRobin = "weighted_round_robin"
|
|
)
|
|
|
|
type upstreamDetail struct {
|
|
URL string `toml:"url"`
|
|
Weight int32 `toml:"weight"`
|
|
}
|
|
|
|
type upstream struct {
|
|
UpstreamGoogle []upstreamDetail `toml:"upstream_google"`
|
|
UpstreamIETF []upstreamDetail `toml:"upstream_ietf"`
|
|
UpstreamSelector string `toml:"upstream_selector"` // usable: random or weighted_random
|
|
}
|
|
|
|
type others struct {
|
|
Bootstrap []string `toml:"bootstrap"`
|
|
Passthrough []string `toml:"passthrough"`
|
|
Timeout uint `toml:"timeout"`
|
|
NoCookies bool `toml:"no_cookies"`
|
|
NoECS bool `toml:"no_ecs"`
|
|
NoIPv6 bool `toml:"no_ipv6"`
|
|
Verbose bool `toml:"verbose"`
|
|
DebugHTTPHeaders []string `toml:"debug_http_headers"`
|
|
}
|
|
|
|
type Config struct {
|
|
Listen []string `toml:"listen"`
|
|
Upstream upstream `toml:"upstream"`
|
|
Other others `toml:"others"`
|
|
}
|
|
|
|
func LoadConfig(path string) (*Config, error) {
|
|
conf := &Config{}
|
|
metaData, err := toml.DecodeFile(path, conf)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, key := range metaData.Undecoded() {
|
|
return nil, &configError{fmt.Sprintf("unknown option %q", key.String())}
|
|
}
|
|
|
|
if len(conf.Listen) == 0 {
|
|
conf.Listen = []string{"127.0.0.1:53", "[::1]:53"}
|
|
}
|
|
if len(conf.Upstream.UpstreamGoogle) == 0 && len(conf.Upstream.UpstreamIETF) == 0 {
|
|
conf.Upstream.UpstreamGoogle = []upstreamDetail{{URL: "https://dns.google.com/resolve", Weight: 50}}
|
|
}
|
|
if conf.Other.Timeout == 0 {
|
|
conf.Other.Timeout = 10
|
|
}
|
|
|
|
if conf.Upstream.UpstreamSelector == "" {
|
|
conf.Upstream.UpstreamSelector = Random
|
|
}
|
|
|
|
return conf, nil
|
|
}
|
|
|
|
type configError struct {
|
|
err string
|
|
}
|
|
|
|
func (e *configError) Error() string {
|
|
return e.err
|
|
}
|