mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request: 3655 shutdown panic
Merge in DNS/adguard-home from 3655-stop-panic to master Updates #3655. Squashed commit of the following: commit 5ffe5193d79a82c70e3f9f547ba52ca20f7abdeb Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 6 13:06:33 2021 +0300 dnsforward: imp code, docs commit 3a4f04f50cd8e0d59edb9e3824f1d55bab9c73a6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Oct 5 16:42:25 2021 +0300 dnsforward: lock to read proxy
This commit is contained in:
parent
08ec3f604e
commit
da45eabc31
@ -114,6 +114,7 @@ In this release, the schema version has changed from 10 to 12.
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
- Occasional panic during shutdown ([#3655]).
|
||||||
- Addition of IPs into only one as opposed to all matching ipsets on Linux
|
- Addition of IPs into only one as opposed to all matching ipsets on Linux
|
||||||
([#3638]).
|
([#3638]).
|
||||||
- Removal of temporary filter files ([#3567]).
|
- Removal of temporary filter files ([#3567]).
|
||||||
@ -202,6 +203,7 @@ In this release, the schema version has changed from 10 to 12.
|
|||||||
[#3579]: https://github.com/AdguardTeam/AdGuardHome/issues/3579
|
[#3579]: https://github.com/AdguardTeam/AdGuardHome/issues/3579
|
||||||
[#3607]: https://github.com/AdguardTeam/AdGuardHome/issues/3607
|
[#3607]: https://github.com/AdguardTeam/AdGuardHome/issues/3607
|
||||||
[#3638]: https://github.com/AdguardTeam/AdGuardHome/issues/3638
|
[#3638]: https://github.com/AdguardTeam/AdGuardHome/issues/3638
|
||||||
|
[#3655]: https://github.com/AdguardTeam/AdGuardHome/issues/3655
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -540,8 +540,16 @@ func (s *Server) processUpstream(ctx *dnsContext) (rc resultCode) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// request was not filtered so let it be processed further
|
// Process the request further since it wasn't filtered.
|
||||||
if ctx.err = s.dnsProxy.Resolve(d); ctx.err != nil {
|
|
||||||
|
prx := s.proxy()
|
||||||
|
if prx == nil {
|
||||||
|
ctx.err = srvClosedErr
|
||||||
|
|
||||||
|
return resultCodeError
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.err = prx.Resolve(d); ctx.err != nil {
|
||||||
return resultCodeError
|
return resultCodeError
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -551,6 +551,21 @@ func (s *Server) IsRunning() bool {
|
|||||||
return s.isRunning
|
return s.isRunning
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// srvClosedErr is returned when the method can't complete without unacessible
|
||||||
|
// data from the closing server.
|
||||||
|
const srvClosedErr errors.Error = "server is closed"
|
||||||
|
|
||||||
|
// proxy returns a pointer to the current DNS proxy instance. If p is nil, the
|
||||||
|
// server is closing.
|
||||||
|
//
|
||||||
|
// See https://github.com/AdguardTeam/AdGuardHome/issues/3655.
|
||||||
|
func (s *Server) proxy() (p *proxy.Proxy) {
|
||||||
|
s.serverLock.RLock()
|
||||||
|
defer s.serverLock.RUnlock()
|
||||||
|
|
||||||
|
return s.dnsProxy
|
||||||
|
}
|
||||||
|
|
||||||
// Reconfigure applies the new configuration to the DNS server.
|
// Reconfigure applies the new configuration to the DNS server.
|
||||||
func (s *Server) Reconfigure(config *ServerConfig) error {
|
func (s *Server) Reconfigure(config *ServerConfig) error {
|
||||||
s.serverLock.Lock()
|
s.serverLock.Lock()
|
||||||
@ -581,17 +596,8 @@ func (s *Server) Reconfigure(config *ServerConfig) error {
|
|||||||
|
|
||||||
// ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS.
|
// ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS.
|
||||||
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
var p *proxy.Proxy
|
if prx := s.proxy(); prx != nil {
|
||||||
|
prx.ServeHTTP(w, r)
|
||||||
func() {
|
|
||||||
s.serverLock.RLock()
|
|
||||||
defer s.serverLock.RUnlock()
|
|
||||||
|
|
||||||
p = s.dnsProxy
|
|
||||||
}()
|
|
||||||
|
|
||||||
if p != nil {
|
|
||||||
p.ServeHTTP(w, r)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -249,9 +249,17 @@ func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSCo
|
|||||||
Req: &replReq,
|
Req: &replReq,
|
||||||
}
|
}
|
||||||
|
|
||||||
err := s.dnsProxy.Resolve(newContext)
|
prx := s.proxy()
|
||||||
|
if prx == nil {
|
||||||
|
log.Debug("dns: %s", srvClosedErr)
|
||||||
|
|
||||||
|
return s.genServerFailure(request)
|
||||||
|
}
|
||||||
|
|
||||||
|
err := prx.Resolve(newContext)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Couldn't look up replacement host %q: %s", newAddr, err)
|
log.Printf("couldn't look up replacement host %q: %s", newAddr, err)
|
||||||
|
|
||||||
return s.genServerFailure(request)
|
return s.genServerFailure(request)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user