Skip to content

Fix: Recalculate toxic stub chain after cleanup and improve documentationFix: Recalculate toxic stub chain after cleanup and improve buffer cl… #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Recalculate toxic stub chain after cleanup and improve documentationFix: Recalculate toxic stub chain after cleanup and improve buffer cl… #680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,16 @@ func (link *ToxicLink) RemoveToxic(ctx context.Context, toxic *toxics.ToxicWrapp
cleanup.Cleanup(link.stubs[toxic_index])
// Cleanup could have closed the stub.
if link.stubs[toxic_index].Closed() {
log.Trace().Msg("Cleanup closed toxic and removed toxic")
// TODO: Check if cleanup happen would link.stubs recalculated?
log.Trace().Msg("Cleanup closed toxic - recalculating stub chain")

// Recalculate link.stubs: reconnect the chain bypassing the closed toxic
link.stubs[toxic_index-1].Output = link.stubs[toxic_index].Output
// Remove the closed stub from the chain
link.stubs = append(link.stubs[:toxic_index], link.stubs[toxic_index+1:]...)

log.Trace().
Int("remaining_stubs", len(link.stubs)).
Msg("Stub chain recalculated and toxic removed after cleanup")
return
}
}
Expand All @@ -245,7 +253,13 @@ func (link *ToxicLink) RemoveToxic(ctx context.Context, toxic *toxics.ToxicWrapp
if !stopped {
<-stop
}
return // TODO: There are some steps after this to clean buffer
// TODO: Investigate if buffer cleanup is needed here before return.
// The buffer cleanup code below handles the normal interrupt case,
// but when tmp==nil (connection closed), we return early.
// This might skip cleaning buffered packets, potentially causing data loss.
// Need to verify if this is intentional or if we should drain the buffer
// before returning, similar to the cleanup loop below.
return
}

err := link.stubs[toxic_index].WriteOutput(tmp, 5*time.Second)
Expand Down