[bugfix] Fix warning about false remaining packets in ring buffer when piping mock sources #29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…iping mock sources
fako1024
commented
May 5, 2023
| @@ -99,7 +99,7 @@ func (m *MockSource) PacketAddCallbackFn(fn func(payload []byte, totalLen uint32 | |||
| // function of an actual ring buffer. Consequently, if the ring buffer is full and elements not | |||
| // yet consumed this function may block | |||
| func (m *MockSource) AddPacket(pkt capture.Packet) error { | |||
| return m.addPacket(pkt.Payload(), pkt.TotalLen(), pkt.Type(), 0) | |||
| return m.addPacket(pkt.Payload(), pkt.TotalLen(), pkt.Type(), pkt.IPLayerOffset()) | |||
There was a problem hiding this comment.
This is unrelated, but occurred to me: Now that a capture.Packet provides access to its specific IP layer offset we can properly hand it over (caused an issue when piping from mock to mock with different snaplen).
| @@ -235,7 +235,7 @@ func TestPipe(t *testing.T) { | |||
|
|
|||
| // Setup the original mock source | |||
| mockSrc, err := NewMockSource("mock", | |||
| CaptureLength(link.CaptureLengthMinimalIPv4Transport), | |||
| CaptureLength(link.CaptureLengthMinimalIPv6Transport), | |||
There was a problem hiding this comment.
Changed this to trigger the IP layer offset issue mentioned in my first comment.
fako1024
deleted the
28-mock-piping-may-cause-stray-packets-on-ring-buffer-when-wrapping-around
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #28