mirror of
https://github.com/netbirdio/netbird.git
synced 2025-06-28 13:42:31 +02:00
Fix merge conflict
This commit is contained in:
parent
e9f11fb11b
commit
0a042ac36d
@ -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:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user