From 0a042ac36de383013f716b95c0affde7880156df Mon Sep 17 00:00:00 2001 From: Viktor Liu Date: Wed, 5 Mar 2025 19:11:20 +0100 Subject: [PATCH] Fix merge conflict --- client/firewall/uspfilter/conntrack/tcp.go | 4 ++-- client/firewall/uspfilter/tracer_test.go | 0 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 client/firewall/uspfilter/tracer_test.go diff --git a/client/firewall/uspfilter/conntrack/tcp.go b/client/firewall/uspfilter/conntrack/tcp.go index 0c0e7bd99..892ae6bcb 100644 --- a/client/firewall/uspfilter/conntrack/tcp.go +++ b/client/firewall/uspfilter/conntrack/tcp.go @@ -299,7 +299,7 @@ func (t *TCPTracker) updateState(key ConnKey, conn *TCPConnTrack, flags uint8, i } else if flags&TCPRst != 0 { conn.State = TCPStateClosed conn.SetTombstone() - t.sendEvent(nftypes.TypeEnd, key, conn) + t.sendEvent(nftypes.TypeEnd, conn) } case TCPStateFinWait1: @@ -313,7 +313,7 @@ func (t *TCPTracker) updateState(key ConnKey, conn *TCPConnTrack, flags uint8, i case flags&TCPRst != 0: conn.State = TCPStateClosed conn.SetTombstone() - t.sendEvent(nftypes.TypeEnd, key, conn) + t.sendEvent(nftypes.TypeEnd, conn) } case TCPStateFinWait2: diff --git a/client/firewall/uspfilter/tracer_test.go b/client/firewall/uspfilter/tracer_test.go deleted file mode 100644 index e69de29bb..000000000