mirrors/dns
1
0
Fork 0
mirror of https://github.com/miekg/dns.git synced 2025-10-10 17:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Timeouts back in.

Browse Source 
Fix the timeouts
This commit is contained in:
Miek Gieben 2013-09-29 11:46:39 +01:00
parent bf37f92d4a
commit b02f1b5203
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client.go
View File

@ -43,7 +43,10 @@ func Exchange(m *Msg, a string) (r *Msg, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer co.Close() defer co.Close()
co.SetReadDeadline(time.Now().Add(dnsTimeout))
co.SetWriteDeadline(time.Now().Add(dnsTimeout))
if err = co.WriteMsg(m); err != nil { if err = co.WriteMsg(m); err != nil {
return nil, err return nil, err
} }
@ -97,6 +100,16 @@ func (c *Client) exchange(m *Msg, a string) (r *Msg, rtt time.Duration, err erro
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
timeout = dnsTimeout
if c.ReadTimeout != 0 {
timeout = c.ReadTimeout
}
co.SetReadDeadline(time.Now().Add(dnsTimeout))
timeout = dnsTimeout
if c.WriteTimeout != 0 {
timeout = c.ReadTimeout
}
co.SetWriteDeadline(time.Now().Add(dnsTimeout))
defer co.Close() defer co.Close()
opt := m.IsEdns0() opt := m.IsEdns0()
if opt != nil && opt.UDPSize() >= MinMsgSize { if opt != nil && opt.UDPSize() >= MinMsgSize {