hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-27 08:09:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ARES-899: Fixes DoH client as system resolver. Fixes #91

Browse Source
This commit is contained in:
Austin Cherry
2020-04-04 15:49:36 -05:00
parent 6d63f84a75
commit f18209af7d
4 changed files with 82 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tunneldns/tunnel.go
View File

@@ -35,7 +35,7 @@ func Run(c *cli.Context) error {
go metrics.ServeMetrics(metricsListener, nil, logger)
listener, err := CreateListener(c.String("address"), uint16(c.Uint("port")), c.StringSlice("upstream"))
listener, err := CreateListener(c.String("address"), uint16(c.Uint("port")), c.StringSlice("upstream"), c.StringSlice("bootstrap"))
if err != nil {
logger.WithError(err).Errorf("Failed to create the listeners")
return err
@@ -117,12 +117,12 @@ func (l *Listener) Stop() error {
}
// CreateListener configures the server and bound sockets
func CreateListener(address string, port uint16, upstreams []string) (*Listener, error) {
func CreateListener(address string, port uint16, upstreams []string, bootstraps []string) (*Listener, error) {
// Build the list of upstreams
upstreamList := make([]Upstream, 0)
for _, url := range upstreams {
logger.WithField("url", url).Infof("Adding DNS upstream")
upstream, err := NewUpstreamHTTPS(url)
upstream, err := NewUpstreamHTTPS(url, bootstraps)
if err != nil {
return nil, errors.Wrap(err, "failed to create HTTPS upstream")
}