bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 17:35:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

dns: set timout only when multiple upstream dns servers set

Browse Source
This commit is contained in:
nadoo 2018-08-06 08:41:54 +08:00
parent 9c73e969ca
commit 7274dcf622
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dns/client.go
View File

@ -118,7 +118,10 @@ func (c *Client) exchange(qname string, reqBytes []byte, preferTCP bool) (server
for _, server = range servers { for _, server = range servers {
rc, err = dialer.Dial(network, server) rc, err = dialer.Dial(network, server)
// TODO: support timeout setting for different upstream server // TODO: support timeout setting for different upstream server
if len(servers) > 1 {
rc.SetDeadline(time.Now().Add(time.Duration(3) * time.Second)) rc.SetDeadline(time.Now().Add(time.Duration(3) * time.Second))
}
if err != nil { if err != nil {
log.F("[dns] failed to connect to server %v: %v", server, err) log.F("[dns] failed to connect to server %v: %v", server, err)
continue continue

2
dns/message.go
View File

@ -119,7 +119,7 @@ func (m *Message) Marshal() ([]byte, error) {
// UnmarshalMessage unmarshals []bytes to Message // UnmarshalMessage unmarshals []bytes to Message
func UnmarshalMessage(b []byte) (*Message, error) { func UnmarshalMessage(b []byte) (*Message, error) {
if len(b) <= 2+HeaderLen { if len(b) < HeaderLen {
return nil, errors.New("UnmarshalMessage: not enough data") return nil, errors.New("UnmarshalMessage: not enough data")
} }