github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve lookup tries for network state

Browse Source
This commit is contained in:
Daniel
2023-03-30 16:09:46 +02:00
parent d9f4a9e70b
commit 56998a010d
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
network/state/lookup.go
View File

@@ -2,7 +2,6 @@ package state
import (
"errors"
"time"
"github.com/safing/portmaster/network/netutils"
"github.com/safing/portmaster/network/packet"
@@ -30,9 +29,8 @@ var (
)
var (
baseWaitTime = 3 * time.Millisecond
lookupRetries = 7 * 2 // Every retry takes two full passes.
fastLookupRetries = 2 * 2
lookupTries = 15 // With a max wait of 5ms, this amounts to up to 75ms.
fastLookupTries = 2
)
// Lookup looks for the given connection in the system state tables and returns the PID of the associated process and whether the connection is inbound.
@@ -81,7 +79,7 @@ func (table *tcpTable) lookup(pktInfo *packet.Info, fast bool) (
)
// Search for the socket until found.
for i := 1; i <= lookupRetries; i++ {
for i := 1; i <= lookupTries; i++ {
// Get or update tables.
if i == 1 {
connections, listeners, updateIter = table.getCurrentTables()
@@ -120,7 +118,7 @@ func (table *tcpTable) lookup(pktInfo *packet.Info, fast bool) (
}
// Search less if we want to be fast.
if fast && i < fastLookupRetries {
if fast && i >= fastLookupTries {
break
}
}
@@ -184,7 +182,7 @@ func (table *udpTable) lookup(pktInfo *packet.Info, fast bool) (
)
// Search for the socket until found.
for i := 1; i <= lookupRetries; i++ {
for i := 1; i <= lookupTries; i++ {
// Get or update tables.
if i == 1 {
binds, updateIter = table.getCurrentTables()
@@ -245,7 +243,7 @@ func (table *udpTable) lookup(pktInfo *packet.Info, fast bool) (
}
// Search less if we want to be fast.
if fast && i < fastLookupRetries {
if fast && i >= fastLookupTries {
break
}
}