diff options
Diffstat (limited to 'plugin/file/file.go')
| -rw-r--r-- | plugin/file/file.go | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/plugin/file/file.go b/plugin/file/file.go index 2711282eb..ee4d64da0 100644 --- a/plugin/file/file.go +++ b/plugin/file/file.go @@ -120,22 +120,18 @@ func (s *serialErr) Error() string { // If serial >= 0 it will reload the zone, if the SOA hasn't changed // it returns an error indicating nothing was read. func Parse(f io.Reader, origin, fileName string, serial int64) (*Zone, error) { - tokens := dns.ParseZone(f, dns.Fqdn(origin), fileName) - defer func() { - // Drain the tokens chan so that large zone files won't - // leak goroutines and memory. - for range tokens { - } - }() + + zp := dns.NewZoneParser(f, dns.Fqdn(origin), fileName) + zp.SetIncludeAllowed(true) z := NewZone(origin, fileName) seenSOA := false - for x := range tokens { - if x.Error != nil { - return nil, x.Error + for rr, ok := zp.Next(); ok; rr, ok = zp.Next() { + if err := zp.Err(); err != nil { + return nil, err } if !seenSOA && serial >= 0 { - if s, ok := x.RR.(*dns.SOA); ok { + if s, ok := rr.(*dns.SOA); ok { if s.Serial == uint32(serial) { // same serial return nil, &serialErr{err: "no change in SOA serial", origin: origin, zone: fileName, serial: serial} } @@ -143,7 +139,7 @@ func Parse(f io.Reader, origin, fileName string, serial int64) (*Zone, error) { } } - if err := z.Insert(x.RR); err != nil { + if err := z.Insert(rr); err != nil { return nil, err } } |