vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 02:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix panic in new tcp based dns resolver

Browse source 
Use service worker in order to survive future panics better
This commit is contained in:
Daniel 2020-07-08 16:06:20 +02:00
parent 2afd9cd143
commit 96fcc6993c
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
resolver/resolver-tcp.go
View file

@ -102,7 +102,9 @@ connMgmt:
if tr.dnsConnection != nil {
connClosing.Set()
_ = tr.dnsConnection.Close()
if cancelConnCtx != nil {
cancelConnCtx()
}
tr.dnsConnection = nil
atomic.AddUint32(tr.connInstanceID, 1)
@ -120,9 +122,15 @@ connMgmt:
tr.Unlock()
// hint network environment at failed connection
if failCnt >= FailThreshold {
netenv.ReportFailedConnection()
}
// The linter said so. Don't even...
if cancelConnCtx != nil {
cancelConnCtx()
}
cancelConnCtx() // The linter said so. Don't even...
return nil
}
@ -209,7 +217,9 @@ connMgmt:
msg, err := conn.ReadMsg()
if err != nil {
if connClosing.SetToIf(false, true) {
if cancelConnCtx != nil {
cancelConnCtx()
}
tr.ReportFailure()
failCnt++
if tr.IsFailing() {
@ -249,7 +259,9 @@ connMgmt:
err := tr.dnsConnection.WriteMsg(msg)
if err != nil {
if connClosing.SetToIf(false, true) {
if cancelConnCtx != nil {
cancelConnCtx()
}
tr.ReportFailure()
failCnt++
if tr.IsFailing() {
@ -344,7 +356,7 @@ func (tr *TCPResolver) submitQuery(_ context.Context, q *Query) *InFlightQuery {
// make sure client is started
if tr.clientStarted.SetToIf(false, true) {
module.StartWorker("dns client", tr.client)
module.StartServiceWorker("dns client", 10*time.Millisecond, tr.client)
}
return inFlight