AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-15 19:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pull request: 2574 external tests vol.2

Browse Source 
Merge in DNS/adguard-home from 2574-external-tests-2 to master

Updates #2574.

Squashed commit of the following:

commit 8a514facc33cb727ef842fc3048f72cc12efbbf1
Merge: 41c7374f 28b9abf1
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Feb 2 14:43:55 2021 +0300

    Merge branch 'master' into 2574-external-tests-2

commit 41c7374f88a292961c0217a6702e65c693691bf5
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Feb 2 14:42:33 2021 +0300

    dnsfilter: imp error messages

commit 1402a987ccec3f84d2e863d9dea6e47ac1c0249f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Feb 2 14:07:11 2021 +0300

    dnsfilter: imp tests
This commit is contained in:
Eugene Burkov 2021-02-02 15:13:12 +03:00
parent 28b9abf1dd
commit 6fe227646b
3 changed files with 655 additions and 607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/dhcpd/v6.go
View File

@ -42,7 +42,6 @@ func (s *v6Server) WriteDiskConfig6(c *V6ServerConf) {
} }
// Return TRUE if IP address is within range [start..0xff] // Return TRUE if IP address is within range [start..0xff]
// nolint(staticcheck)
func ip6InRange(start, ip net.IP) bool { func ip6InRange(start, ip net.IP) bool {
if len(start) != 16 { if len(start) != 16 {
return false return false

20
internal/dnsforward/dnsforward.go
View File

@ -163,15 +163,15 @@ func (s *Server) Exchange(req *dns.Msg) (*dns.Msg, error) {
return ctx.Res, nil return ctx.Res, nil
} }
// Start starts the DNS server // Start starts the DNS server.
func (s *Server) Start() error { func (s *Server) Start() error {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
return s.startInternal() return s.startLocked()
} }
// startInternal starts without locking // startLocked starts the DNS server without locking. For internal use only.
func (s *Server) startInternal() error { func (s *Server) startLocked() error {
err := s.dnsProxy.Start() err := s.dnsProxy.Start()
if err == nil { if err == nil {
s.isRunning = true s.isRunning = true
@ -256,15 +256,15 @@ func (s *Server) Prepare(config *ServerConfig) error {
return nil return nil
} }
// Stop stops the DNS server // Stop stops the DNS server.
func (s *Server) Stop() error { func (s *Server) Stop() error {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
return s.stopInternal() return s.stopLocked()
} }
// stopInternal stops without locking // stopLocked stops the DNS server without locking. For internal use only.
func (s *Server) stopInternal() error { func (s *Server) stopLocked() error {
if s.dnsProxy != nil { if s.dnsProxy != nil {
err := s.dnsProxy.Stop() err := s.dnsProxy.Stop()
if err != nil { if err != nil {
@ -289,7 +289,7 @@ func (s *Server) Reconfigure(config *ServerConfig) error {
defer s.Unlock() defer s.Unlock()
log.Print("Start reconfiguring the server") log.Print("Start reconfiguring the server")
err := s.stopInternal() err := s.stopLocked()
if err != nil { if err != nil {
return fmt.Errorf("could not reconfigure the server: %w", err) return fmt.Errorf("could not reconfigure the server: %w", err)
} }
@ -303,7 +303,7 @@ func (s *Server) Reconfigure(config *ServerConfig) error {
return fmt.Errorf("could not reconfigure the server: %w", err) return fmt.Errorf("could not reconfigure the server: %w", err)
} }
err = s.startInternal() err = s.startLocked()
if err != nil { if err != nil {
return fmt.Errorf("could not reconfigure the server: %w", err) return fmt.Errorf("could not reconfigure the server: %w", err)
} }

1241
internal/dnsforward/dnsforward_test.go
View File

File diff suppressed because it is too large Load Diff