extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-28 13:42:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Viktor Liu 2025-03-05 19:11:20 +01:00
parent e9f11fb11b
commit 0a042ac36d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/firewall/uspfilter/conntrack/tcp.go
View File

@ -299,7 +299,7 @@ func (t *TCPTracker) updateState(key ConnKey, conn *TCPConnTrack, flags uint8, i
} else if flags&TCPRst != 0 { } else if flags&TCPRst != 0 {
conn.State = TCPStateClosed conn.State = TCPStateClosed
conn.SetTombstone() conn.SetTombstone()
t.sendEvent(nftypes.TypeEnd, key, conn) t.sendEvent(nftypes.TypeEnd, conn)
} }
case TCPStateFinWait1: case TCPStateFinWait1:
@ -313,7 +313,7 @@ func (t *TCPTracker) updateState(key ConnKey, conn *TCPConnTrack, flags uint8, i
case flags&TCPRst != 0: case flags&TCPRst != 0:
conn.State = TCPStateClosed conn.State = TCPStateClosed
conn.SetTombstone() conn.SetTombstone()
t.sendEvent(nftypes.TypeEnd, key, conn) t.sendEvent(nftypes.TypeEnd, conn)
} }
case TCPStateFinWait2: case TCPStateFinWait2:

0
client/firewall/uspfilter/tracer_test.go
View File