From 096a95998749b673bc9be638bc9c8f6f0d13be41 Mon Sep 17 00:00:00 2001 From: Simon Zolin Date: Thu, 16 May 2019 17:32:15 +0300 Subject: [PATCH] * dnsforward: use new dnsfilter interface --- dnsforward/dnsforward.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dnsforward/dnsforward.go b/dnsforward/dnsforward.go index a1afd7a9..51c6d3f6 100644 --- a/dnsforward/dnsforward.go +++ b/dnsforward/dnsforward.go @@ -202,14 +202,20 @@ func (s *Server) startInternal(config *ServerConfig) error { // Initializes the DNS filter func (s *Server) initDNSFilter() error { log.Tracef("Creating dnsfilter") - s.dnsFilter = dnsfilter.New(&s.conf.Config) - // add rules only if they are enabled + + var filters map[int]string + filters = nil if s.conf.FilteringEnabled { - err := s.dnsFilter.AddRules(s.conf.Filters) - if err != nil { - return errorx.Decorate(err, "could not initialize dnsfilter") + filters = make(map[int]string) + for _, f := range s.conf.Filters { + filters[int(f.ID)] = string(f.Data) } } + + s.dnsFilter = dnsfilter.New(&s.conf.Config, filters) + if s.dnsFilter == nil { + return fmt.Errorf("could not initialize dnsfilter") + } return nil }