mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-04-18 00:43:17 -04:00
Feature: android binary runtime default dns set 8.8.8.8:53 (#572)
ref https://github.com/golang/go/issues/8877 ref https://github.com/v2ray/v2ray-core/issues/1909
This commit is contained in:
parent
a58bfc4ba4
commit
3eb13868f2
@ -158,6 +158,10 @@ func (c *DNSConfig) Build() (*dns.Config, error) {
|
|||||||
config.NameServer = append(config.NameServer, ns)
|
config.NameServer = append(config.NameServer, ns)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if BootstrapDNS() {
|
||||||
|
newError("Bootstrap DNS: ", bootstrapDNS).AtWarning().WriteToLog()
|
||||||
|
}
|
||||||
|
|
||||||
if c.Hosts != nil && len(c.Hosts) > 0 {
|
if c.Hosts != nil && len(c.Hosts) > 0 {
|
||||||
domains := make([]string, 0, len(c.Hosts))
|
domains := make([]string, 0, len(c.Hosts))
|
||||||
for domain := range c.Hosts {
|
for domain := range c.Hosts {
|
||||||
|
9
infra/conf/dns_bootstrap.go
Normal file
9
infra/conf/dns_bootstrap.go
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
// +build !android
|
||||||
|
|
||||||
|
package conf
|
||||||
|
|
||||||
|
const bootstrapDNS = ""
|
||||||
|
|
||||||
|
func BootstrapDNS() bool {
|
||||||
|
return false
|
||||||
|
}
|
25
infra/conf/dns_bootstrap_android.go
Normal file
25
infra/conf/dns_bootstrap_android.go
Normal file
@ -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
infra/conf/dns_bootstrap_test.go
Normal file
28
infra/conf/dns_bootstrap_test.go
Normal file
@ -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)
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user