From fdf7ee2c08d4177d78fcdc20571bc7d2b61320ae Mon Sep 17 00:00:00 2001
From: Simon Zolin <s.zolin@adguard.com>
Date: Mon, 22 Jul 2019 12:52:27 +0300
Subject: [PATCH] * refactor: don't set new configuration while running DNS
 server

---
 dnsforward/dnsforward.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dnsforward/dnsforward.go b/dnsforward/dnsforward.go
index 7cd88eda..ef9fbc20 100644
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@@ -177,15 +177,11 @@ func processIPCIDRArray(dst *map[string]bool, dstIPNet *[]net.IPNet, src []strin
 
 // startInternal starts without locking
 func (s *Server) startInternal(config *ServerConfig) error {
-	if config != nil {
-		s.conf = *config
-	}
-
 	if s.dnsFilter != nil || s.dnsProxy != nil {
 		return errors.New("DNS server is already started")
 	}
 
-	err := s.initDNSFilter()
+	err := s.initDNSFilter(config)
 	if err != nil {
 		return err
 	}
@@ -246,9 +242,13 @@ func (s *Server) startInternal(config *ServerConfig) error {
 }
 
 // Initializes the DNS filter
-func (s *Server) initDNSFilter() error {
+func (s *Server) initDNSFilter(config *ServerConfig) error {
 	log.Tracef("Creating dnsfilter")
 
+	if config != nil {
+		s.conf = *config
+	}
+
 	var filters map[int]string
 	filters = nil
 	if s.conf.FilteringEnabled {