github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed sync of Extra in binarySearch

pull/4037/head
Pierre Souchay 2018-04-18 14:17:44 +02:00
parent 89ba5165f9
commit 728c5308df
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/dns.go
View File

@ -721,14 +721,17 @@ func syncExtra(index map[string]dns.RR, resp *dns.Msg) {
// it in order to return a DNS answer lower than maxSize parameter. // it in order to return a DNS answer lower than maxSize parameter.
func dnsBinaryTruncate(resp *dns.Msg, maxSize int, index map[string]dns.RR, hasExtra bool) int { func dnsBinaryTruncate(resp *dns.Msg, maxSize int, index map[string]dns.RR, hasExtra bool) int {
originalAnswser := resp.Answer originalAnswser := resp.Answer
originalExtra := resp.Extra
originalIndex := index
startIndex := 0 startIndex := 0
endIndex := len(resp.Answer) + 1 endIndex := len(resp.Answer) + 1
for endIndex-startIndex > 1 { for endIndex-startIndex > 1 {
median := startIndex + (endIndex-startIndex)/2 median := startIndex + (endIndex-startIndex)/2
resp.Answer = originalAnswser[:median] resp.Answer = originalAnswser[:median]
resp.Extra = originalAnswser[:median]
if hasExtra { if hasExtra {
resp.Extra = originalExtra[:median]
index := originalIndex
syncExtra(index, resp) syncExtra(index, resp)
} }
aLen := resp.Len() aLen := resp.Len()