diff --git a/CHANGELOG.md b/CHANGELOG.md index 58a153c..5e31897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Changed +- Fixed a bug that resulted in stream reassembly sporadically failing and displaying a blank screen. - Termshark will now, by default, suppress errors from tshark. You can change this via the minibuffer `set suppress-tshark-errors` command. - Added a summary of standard error to the error dialogs displayed when a tshark process fails to run diff --git a/pkg/streams/loader.go b/pkg/streams/loader.go index 23209fc..c0f7789 100644 --- a/pkg/streams/loader.go +++ b/pkg/streams/loader.go @@ -205,9 +205,9 @@ func (c *Loader) loadStreamReassemblyAsync(pcapf string, proto string, idx int, log.Infof("Started stream reassembly command %v with pid %d", c.streamCmd, c.streamCmd.Pid()) - termshark.TrackedGo(func() { + defer func() { termChan <- c.streamCmd.Wait() - }, Goroutinewg) + }() pid = c.streamCmd.Pid() procChan <- pid @@ -219,7 +219,7 @@ func (c *Loader) loadStreamReassemblyAsync(pcapf string, proto string, idx int, func() { _, err := ParseReader("", streamOut, ops...) if err != nil { - log.Infof("Stream parser reported error: %v", err) + log.Warnf("Stream parser reported error: %v", err) } }()