chore: doq default port change to 853, ALPN use doq

This commit is contained in:
gVisor bot 2022-06-12 17:53:11 +08:00
parent 2bbfa562ce
commit 40c33e8fce
2 changed files with 3 additions and 2 deletions

View file

@ -666,7 +666,7 @@ func parseNameServer(servers []string) ([]dns.NameServer, error) {
addr = u.Host addr = u.Host
dnsNetType = "dhcp" // UDP from DHCP dnsNetType = "dhcp" // UDP from DHCP
case "quic": case "quic":
addr, err = hostWithDefaultPort(u.Host, "784") addr, err = hostWithDefaultPort(u.Host, "853")
dnsNetType = "quic" // DNS over QUIC dnsNetType = "quic" // DNS over QUIC
default: default:
return nil, fmt.Errorf("DNS NameServer[%d] unsupport scheme: %s", idx, u.Scheme) return nil, fmt.Errorf("DNS NameServer[%d] unsupport scheme: %s", idx, u.Scheme)

View file

@ -17,7 +17,7 @@ import (
D "github.com/miekg/dns" D "github.com/miekg/dns"
) )
const NextProtoDQ = "doq-i00" const NextProtoDQ = "doq"
var bytesPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }} var bytesPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
@ -149,6 +149,7 @@ func (dc *quicClient) openSession() (quic.Connection, error) {
) )
host, port, err := net.SplitHostPort(dc.addr) host, port, err := net.SplitHostPort(dc.addr)
if err != nil { if err != nil {
return nil, err return nil, err
} }