miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

DoH: send a dummy query before measuring the RTT to ignore the handshake

This commit is contained in:
Frank Denis 2018-01-27 16:48:22 +01:00
parent 4f0c29047d
commit be1e99ea32
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dnscrypt-proxy/main.go
View File

@ -399,9 +399,8 @@ func (proxy *Proxy) processIncomingQuery(serverInfo *ServerInfo, clientProto str
Timeout: proxy.timeout, Timeout: proxy.timeout,
} }
resp, err := client.Do(req) resp, err := client.Do(req)
if err == nil && resp != nil && (resp.StatusCode < 200 || resp.StatusCode > 299) { if (err == nil && resp != nil && (resp.StatusCode < 200 || resp.StatusCode > 299)) ||
return err != nil || resp == nil {
} else if err != nil || resp == nil {
return return
} }
response, err = ioutil.ReadAll(resp.Body) response, err = ioutil.ReadAll(resp.Body)

23
dnscrypt-proxy/serversInfo.go
View File

@ -201,6 +201,19 @@ func (serversInfo *ServersInfo) fetchDoHServerInfo(proxy *Proxy, name string, st
Host: stamp.providerName, Host: stamp.providerName,
Path: stamp.path, Path: stamp.path,
} }
client := http.Client{
Transport: proxy.httpTransport,
Timeout: proxy.timeout,
}
preReq := &http.Request{
Method: "HEAD",
URL: url,
Close: false,
Host: stamp.providerName,
}
if _, err := client.Do(preReq); err != nil {
return ServerInfo{}, err
}
body := ioutil.NopCloser(bytes.NewReader([]byte{ body := ioutil.NopCloser(bytes.NewReader([]byte{
0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
})) }))
@ -216,13 +229,9 @@ func (serversInfo *ServersInfo) fetchDoHServerInfo(proxy *Proxy, name string, st
Host: stamp.providerName, Host: stamp.providerName,
Body: body, Body: body,
} }
client := http.Client{
Transport: proxy.httpTransport,
Timeout: proxy.timeout,
}
start := time.Now() start := time.Now()
resp, err := client.Do(req) resp, err := client.Do(req)
elapsed := time.Since(start) rtt := time.Since(start)
if err == nil && resp != nil && (resp.StatusCode < 200 || resp.StatusCode > 299) { if err == nil && resp != nil && (resp.StatusCode < 200 || resp.StatusCode > 299) {
return ServerInfo{}, fmt.Errorf("Webserver returned code %d", resp.StatusCode) return ServerInfo{}, fmt.Errorf("Webserver returned code %d", resp.StatusCode)
} else if err != nil { } else if err != nil {
@ -237,13 +246,15 @@ func (serversInfo *ServersInfo) fetchDoHServerInfo(proxy *Proxy, name string, st
if len(respBody) < MinDNSPacketSize || len(respBody) > MaxDNSPacketSize { if len(respBody) < MinDNSPacketSize || len(respBody) > MaxDNSPacketSize {
return ServerInfo{}, errors.New("Webserver returned an unexpected response") return ServerInfo{}, errors.New("Webserver returned an unexpected response")
} }
dlog.Noticef("[%s] OK (DoH) - rtt: %dms", name, rtt.Nanoseconds()/1000000)
serverInfo := ServerInfo{ serverInfo := ServerInfo{
Proto: StampProtoTypeDoH, Proto: StampProtoTypeDoH,
Name: name, Name: name,
Timeout: proxy.timeout, Timeout: proxy.timeout,
URL: url, URL: url,
HostName: stamp.providerName, HostName: stamp.providerName,
initialRtt: int(elapsed.Nanoseconds() / 1000000), initialRtt: int(rtt.Nanoseconds() / 1000000),
} }
return serverInfo, nil return serverInfo, nil
} }