Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

resolver: Compress all DNS answers #173

Merged
merged 3 commits into from
Jun 18, 2015
Merged

resolver: Compress all DNS answers #173

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8520cf5
resolver: Compress all DNS answers
Jun 16, 2015
e470b0e
resolver: Set TC bit in compliance with RFC 1035
Jun 18, 2015
b046d1e
resolver: Cross reference contextual issues via comment
Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions resolver/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,8 @@ func (res *Resolver) HandleNonMesos(w dns.ResponseWriter, r *dns.Msg) {
}
}

err = w.WriteMsg(m)
if err != nil {
m.Compress = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would like to see some TODO comments here describing the pain point and the potential problems that a user will see until we resolve this properly. Perhaps even a reference to tickets 173 and 174.

if err = w.WriteMsg(truncate(m, isUDP(w))); err != nil {
logging.Error.Println(err)
}
}
Expand Down Expand Up @@ -463,12 +463,25 @@ func (res *Resolver) HandleMesos(w dns.ResponseWriter, r *dns.Msg) {
}
}

err = w.WriteMsg(m)
if err != nil {
m.Compress = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same TODO comment as above

if err = w.WriteMsg(truncate(m, isUDP(w))); err != nil {
logging.Error.Println(err)
}
}

// isUDP returns true if the transmission channel in use is UDP.
func isUDP(w dns.ResponseWriter) bool {
return strings.HasPrefix(w.RemoteAddr().Network(), "udp")
}

// truncate sets the TC bit in the given dns.Msg if its length exceeds the
// permitted length of the given transmission channel.
// See https://tools.ietf.org/html/rfc1035#section-4.2.1
func truncate(m *dns.Msg, udp bool) *dns.Msg {
m.Truncated = udp && m.Len() > dns.MinMsgSize
return m
}

func (res *Resolver) configureHTTP() {
// webserver + available routes
ws := new(restful.WebService)
Expand Down