xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Adjust the falling logic

Browse source
This commit is contained in:
gVisor bot 2022-07-16 19:52:51 +08:00
parent c768ae8b54
commit 95e3a765d4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dns/doh.go
View file

@ -7,6 +7,7 @@ import (
"github.com/Dreamacro/clash/component/dialer" "github.com/Dreamacro/clash/component/dialer"
"github.com/Dreamacro/clash/component/resolver" "github.com/Dreamacro/clash/component/resolver"
tls2 "github.com/Dreamacro/clash/component/tls" tls2 "github.com/Dreamacro/clash/component/tls"
"github.com/Dreamacro/clash/log"
"github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/http3" "github.com/lucas-clemente/quic-go/http3"
D "github.com/miekg/dns" D "github.com/miekg/dns"
@ -71,6 +72,7 @@ func (dc *dohClient) doRequest(req *http.Request) (msg *D.Msg, err error) {
client := &http.Client{Transport: dc.transport} client := &http.Client{Transport: dc.transport}
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
log.Errorln("doh %v", err)
return nil, err return nil, err
} }
@ -138,6 +140,7 @@ func newDohTransport(r *Resolver, preferH3 bool, proxyAdapter string) *dohTransp
if err != nil { if err != nil {
return nil, err return nil, err
} }
if proxyAdapter == "" { if proxyAdapter == "" {
return quic.DialAddrEarlyContext(ctx, net.JoinHostPort(ip.String(), port), tlsCfg, cfg) return quic.DialAddrEarlyContext(ctx, net.JoinHostPort(ip.String(), port), tlsCfg, cfg)
} else { } else {
@ -173,7 +176,7 @@ func (doh *dohTransport) RoundTrip(req *http.Request) (*http.Response, error) {
var fallbackErr bool var fallbackErr bool
defer func() { defer func() {
if doh.preferH3 && (h3Err || fallbackErr) { if doh.preferH3 && (h3Err || fallbackErr) {
doh.canUseH3.Store(doh.preferH3 && fallbackErr) doh.canUseH3.Store(doh.preferH3 && (!h3Err || fallbackErr))
} }
}() }()
@ -182,7 +185,7 @@ func (doh *dohTransport) RoundTrip(req *http.Request) (*http.Response, error) {
} }
req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes)) req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
if doh.preferH3 && doh.canUseH3.Load() { if doh.canUseH3.Load() {
resp, err = doh.h3.RoundTrip(req) resp, err = doh.h3.RoundTrip(req)
h3Err = err != nil h3Err = err != nil
if !h3Err { if !h3Err {