mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-04 21:57:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

No need to get the time if the connection is refused

Browse source
This commit is contained in:
Frank Denis 2021-08-04 13:23:21 +02:00
parent b4a073f54f
commit d996e3424d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dnscrypt-proxy/local-doh.go
View file

@ -35,13 +35,13 @@ func (handler localDoHHandler) ServeHTTP(writer http.ResponseWriter, request *ht
writer.Write([]byte("dnscrypt-proxy local DoH server\n")) writer.Write([]byte("dnscrypt-proxy local DoH server\n"))
return return
} }
start := time.Now()
clientAddr, err := net.ResolveTCPAddr("tcp", request.RemoteAddr) clientAddr, err := net.ResolveTCPAddr("tcp", request.RemoteAddr)
if err != nil { if err != nil {
dlog.Errorf("Unable to get the client address: [%v]", err) dlog.Errorf("Unable to get the client address: [%v]", err)
return return
} }
xClientAddr := net.Addr(clientAddr) xClientAddr := net.Addr(clientAddr)
start := time.Now()
packet, err := ioutil.ReadAll(io.LimitReader(request.Body, MaxHTTPBodyLength)) packet, err := ioutil.ReadAll(io.LimitReader(request.Body, MaxHTTPBodyLength))
if err != nil { if err != nil {
dlog.Warnf("No body in a local DoH query") dlog.Warnf("No body in a local DoH query")

4
dnscrypt-proxy/proxy.go
View file

@ -370,12 +370,12 @@ func (proxy *Proxy) udpListener(clientPc *net.UDPConn) {
} }
packet := buffer[:length] packet := buffer[:length]
go func() { go func() {
start := time.Now()
if !proxy.clientsCountInc() { if !proxy.clientsCountInc() {
dlog.Warnf("Too many incoming connections (max=%d)", proxy.maxClients) dlog.Warnf("Too many incoming connections (max=%d)", proxy.maxClients)
return return
} }
defer proxy.clientsCountDec() defer proxy.clientsCountDec()
start := time.Now()
proxy.processIncomingQuery("udp", proxy.mainProto, packet, &clientAddr, clientPc, start) proxy.processIncomingQuery("udp", proxy.mainProto, packet, &clientAddr, clientPc, start)
}() }()
} }
@ -389,7 +389,6 @@ func (proxy *Proxy) tcpListener(acceptPc *net.TCPListener) {
continue continue
} }
go func() { go func() {
start := time.Now()
defer clientPc.Close() defer clientPc.Close()
if !proxy.clientsCountInc() { if !proxy.clientsCountInc() {
dlog.Warnf("Too many incoming connections (max=%d)", proxy.maxClients) dlog.Warnf("Too many incoming connections (max=%d)", proxy.maxClients)
@ -399,6 +398,7 @@ func (proxy *Proxy) tcpListener(acceptPc *net.TCPListener) {
if err := clientPc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil { if err := clientPc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil {
return return
} }
start := time.Now()
packet, err := ReadPrefixed(&clientPc) packet, err := ReadPrefixed(&clientPc)
if err != nil { if err != nil {
return return