Skip to content

Commit

Permalink
Feature: android binary runtime default dns set 8.8.8.8:53 (#572)
Browse files Browse the repository at this point in the history
  • Loading branch information
CalmLong authored Jan 2, 2021
1 parent a58bfc4 commit 3eb1386
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 0 deletions.
4 changes: 4 additions & 0 deletions infra/conf/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ func (c *DNSConfig) Build() (*dns.Config, error) {
config.NameServer = append(config.NameServer, ns)
}

if BootstrapDNS() {
newError("Bootstrap DNS: ", bootstrapDNS).AtWarning().WriteToLog()
}

if c.Hosts != nil && len(c.Hosts) > 0 {
domains := make([]string, 0, len(c.Hosts))
for domain := range c.Hosts {
Expand Down
9 changes: 9 additions & 0 deletions infra/conf/dns_bootstrap.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// +build !android

package conf

const bootstrapDNS = ""

func BootstrapDNS() bool {
return false
}
25 changes: 25 additions & 0 deletions infra/conf/dns_bootstrap_android.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// +build android

package conf

import (
"context"
"net"
)

const bootstrapDNS = "8.8.8.8:53"

func BootstrapDNS() bool {
var dialer net.Dialer
net.DefaultResolver = &net.Resolver{
PreferGo: false,
Dial: func(context context.Context, _, _ string) (net.Conn, error) {
conn, err := dialer.DialContext(context, "udp", bootstrapDNS)
if err != nil {
return nil, err
}
return conn, nil
},
}
return true
}
28 changes: 28 additions & 0 deletions infra/conf/dns_bootstrap_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package conf

import (
"context"
"net"
"testing"
)

func TestBootstrapDNS(t *testing.T) {
const (
defaultNS = "8.8.8.8:53"
domain = "github.com"
)
var dialer net.Dialer
net.DefaultResolver = &net.Resolver{
PreferGo: true,
Dial: func(context context.Context, network, address string) (net.Conn, error) {
conn, err := dialer.DialContext(context, "udp", defaultNS)
if err != nil {
return nil, err
}
return conn, nil
},
}
if ips, err := net.LookupIP(domain); len(ips) == 0 {
t.Error("set BootstrapDNS failed: ", err)
}
}

0 comments on commit 3eb1386

Please sign in to comment.