diff options
Diffstat (limited to 'plugin/forward/connect.go')
| -rw-r--r-- | plugin/forward/connect.go | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/plugin/forward/connect.go b/plugin/forward/connect.go index 64edb395e..55deeae1e 100644 --- a/plugin/forward/connect.go +++ b/plugin/forward/connect.go @@ -69,14 +69,6 @@ func (t *Transport) Dial(proto string) (*dns.Conn, bool, error) { return conn, false, err } -func (p *Proxy) readTimeout() time.Duration { - return limitTimeout(&p.avgRtt, minTimeout, maxTimeout) -} - -func (p *Proxy) updateRtt(newRtt time.Duration) { - averageTimeout(&p.avgRtt, newRtt, cumulativeAvgWeight) -} - // Connect selects an upstream, sends the request and waits for a response. func (p *Proxy) Connect(ctx context.Context, state request.Request, opts options) (*dns.Msg, error) { start := time.Now() @@ -103,7 +95,6 @@ func (p *Proxy) Connect(ctx context.Context, state request.Request, opts options } conn.SetWriteDeadline(time.Now().Add(maxTimeout)) - reqTime := time.Now() if err := conn.WriteMsg(state.Req); err != nil { conn.Close() // not giving it back if err == io.EOF && cached { @@ -112,10 +103,9 @@ func (p *Proxy) Connect(ctx context.Context, state request.Request, opts options return nil, err } - conn.SetReadDeadline(time.Now().Add(p.readTimeout())) + conn.SetReadDeadline(time.Now().Add(readTimeout)) ret, err := conn.ReadMsg() if err != nil { - p.updateRtt(maxTimeout) conn.Close() // not giving it back if err == io.EOF && cached { return nil, ErrCachedClosed @@ -123,8 +113,6 @@ func (p *Proxy) Connect(ctx context.Context, state request.Request, opts options return ret, err } - p.updateRtt(time.Since(reqTime)) - p.transport.Yield(conn) rc, ok := dns.RcodeToString[ret.Rcode] |