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

Fix shutting down nfq interception with go-nfqueue v1.3.1

Browse source
This commit is contained in:
Daniel 2022-05-11 13:19:31 +02:00
parent becb6b373f
commit ec6a3f03e8
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
firewall/interception/nfq/nfq.go
View file

@ -25,6 +25,7 @@ type Queue struct {
nf atomic.Value nf atomic.Value
packets chan pmpacket.Packet packets chan pmpacket.Packet
cancelSocketCallback context.CancelFunc cancelSocketCallback context.CancelFunc
canceled *abool.AtomicBool
restart chan struct{} restart chan struct{}
pendingVerdicts uint64 pendingVerdicts uint64
@ -50,6 +51,7 @@ func New(qid uint16, v6 bool) (*Queue, error) { //nolint:gocognit
restart: make(chan struct{}, 1), restart: make(chan struct{}, 1),
packets: make(chan pmpacket.Packet, 1000), packets: make(chan pmpacket.Packet, 1000),
cancelSocketCallback: cancel, cancelSocketCallback: cancel,
canceled: abool.New(),
verdictCompleted: make(chan struct{}, 1), verdictCompleted: make(chan struct{}, 1),
} }
@ -142,6 +144,11 @@ func (q *Queue) handleError(e error) int {
} }
} }
// Check if we have closed the queue already.
if q.canceled.IsSet() {
return 1
}
// Check if the queue was already closed. Unfortunately, the exposed error // Check if the queue was already closed. Unfortunately, the exposed error
// variable is in an internal stdlib package. Therefore, check for the error // variable is in an internal stdlib package. Therefore, check for the error
// string instead. :( // string instead. :(
@ -222,6 +229,7 @@ func (q *Queue) Destroy() {
return return
} }
q.canceled.Set()
q.cancelSocketCallback() q.cancelSocketCallback()
if nf := q.getNfq(); nf != nil { if nf := q.getNfq(); nf != nil {