status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoids allocations and function calls if no extra data is present.

This commit is contained in:
James Phillips 2016-08-12 10:29:57 -07:00
parent e30b99cef5
commit 6332e2b367
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
command/agent/dns.go
View File

@ -545,14 +545,23 @@ func syncExtra(index map[string]dns.RR, resp *dns.Msg) {
// records will be trimmed along with answers. // records will be trimmed along with answers.
func trimUDPResponse(config *DNSConfig, resp *dns.Msg) (trimmed bool) { func trimUDPResponse(config *DNSConfig, resp *dns.Msg) (trimmed bool) {
numAnswers := len(resp.Answer) numAnswers := len(resp.Answer)
index := indexRRs(resp.Extra) hasExtra := len(resp.Extra) > 0
// We avoid some function calls and allocations by only handling the
// extra data when necessary.
var index map[string]dns.RR
if hasExtra {
index = indexRRs(resp.Extra)
}
// This cuts UDP responses to a useful but limited number of responses. // This cuts UDP responses to a useful but limited number of responses.
maxAnswers := lib.MinInt(maxUDPAnswerLimit, config.UDPAnswerLimit) maxAnswers := lib.MinInt(maxUDPAnswerLimit, config.UDPAnswerLimit)
if numAnswers > maxAnswers { if numAnswers > maxAnswers {
resp.Answer = resp.Answer[:maxAnswers] resp.Answer = resp.Answer[:maxAnswers]
if hasExtra {
syncExtra(index, resp) syncExtra(index, resp)
} }
}
// This enforces the hard limit of 512 bytes per the RFC. Note that we // This enforces the hard limit of 512 bytes per the RFC. Note that we
// temporarily switch to uncompressed so that we limit to a response // temporarily switch to uncompressed so that we limit to a response
@ -563,8 +572,10 @@ func trimUDPResponse(config *DNSConfig, resp *dns.Msg) (trimmed bool) {
resp.Compress = false resp.Compress = false
for len(resp.Answer) > 0 && resp.Len() > 512 { for len(resp.Answer) > 0 && resp.Len() > 512 {
resp.Answer = resp.Answer[:len(resp.Answer)-1] resp.Answer = resp.Answer[:len(resp.Answer)-1]
if hasExtra {
syncExtra(index, resp) syncExtra(index, resp)
} }
}
resp.Compress = compress resp.Compress = compress
return len(resp.Answer) < numAnswers return len(resp.Answer) < numAnswers