history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: h3 of doh fall back logic

Browse Source
This commit is contained in:
Skyxim 2022-07-06 21:25:25 +08:00
parent e382496e4c
commit 0a76876764
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dns/doh.go
View File

@ -69,11 +69,9 @@ func (dc *dohClient) newRequest(m *D.Msg) (*http.Request, error) {
func (dc *dohClient) doRequest(req *http.Request) (msg *D.Msg, err error) { 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 { if err != nil {
return nil, err return nil, err
} }
}
defer resp.Body.Close() defer resp.Body.Close()
@ -168,6 +166,14 @@ func (doh *dohTransport) RoundTrip(req *http.Request) (*http.Response, error) {
var resp *http.Response var resp *http.Response
var err error var err error
var bodyBytes []byte var bodyBytes []byte
var h3Err bool
var fallbackErr bool
defer func() {
if doh.preferH3 && h3Err {
doh.canUseH3.Store(doh.preferH3 && fallbackErr)
}
}()
if req.Body != nil { if req.Body != nil {
bodyBytes, err = ioutil.ReadAll(req.Body) bodyBytes, err = ioutil.ReadAll(req.Body)
} }
@ -175,20 +181,17 @@ 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.preferH3 && doh.canUseH3.Load() {
resp, err = doh.h3.RoundTrip(req) resp, err = doh.h3.RoundTrip(req)
if err == nil { h3Err = err != nil
if !h3Err {
return resp, err return resp, err
} else { } else {
doh.canUseH3.Store(false)
req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes)) req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
} }
} }
resp, err = doh.Transport.RoundTrip(req) resp, err = doh.Transport.RoundTrip(req)
if err != nil { fallbackErr = err != nil
if doh.preferH3 { if fallbackErr {
doh.canUseH3.Store(true)
}
return resp, err return resp, err
} }