mirror of
https://github.com/status-im/consul.git
synced 2025-01-09 13:26:07 +00:00
9dc7194321
See https://github.com/hashicorp/consul/issues/3977 While trying to improve furthermore #3948 (This pull request is still valid since we are not using Compression to compute the result anyway). I saw a strange behaviour of dns library. Basically, msg.Len() and len(msg.Pack()) disagree on Message len. Thus, calculation of DNS response is false consul relies on msg.Len() instead of the result of Pack() This is linked to miekg/dns#453 and a fix has been provided with miekg/dns#454 Would it be possible to upgrade miekg/dns to a more recent function ? Consul might for instance upgrade to a post 1.0 release such as https://github.com/miekg/dns/releases/tag/v1.0.4
57 lines
1.0 KiB
Go
57 lines
1.0 KiB
Go
package dns
|
|
|
|
// Implement a simple scanner, return a byte stream from an io reader.
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"io"
|
|
"text/scanner"
|
|
)
|
|
|
|
type scan struct {
|
|
src *bufio.Reader
|
|
position scanner.Position
|
|
eof bool // Have we just seen a eof
|
|
ctx context.Context
|
|
}
|
|
|
|
func scanInit(r io.Reader) (*scan, context.CancelFunc) {
|
|
s := new(scan)
|
|
s.src = bufio.NewReader(r)
|
|
s.position.Line = 1
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
s.ctx = ctx
|
|
|
|
return s, cancel
|
|
}
|
|
|
|
// tokenText returns the next byte from the input
|
|
func (s *scan) tokenText() (byte, error) {
|
|
c, err := s.src.ReadByte()
|
|
if err != nil {
|
|
return c, err
|
|
}
|
|
select {
|
|
case <-s.ctx.Done():
|
|
return c, context.Canceled
|
|
default:
|
|
break
|
|
}
|
|
|
|
// delay the newline handling until the next token is delivered,
|
|
// fixes off-by-one errors when reporting a parse error.
|
|
if s.eof == true {
|
|
s.position.Line++
|
|
s.position.Column = 0
|
|
s.eof = false
|
|
}
|
|
if c == '\n' {
|
|
s.eof = true
|
|
return c, nil
|
|
}
|
|
s.position.Column++
|
|
return c, nil
|
|
}
|