RawNetworkInterfaceDriver/labgrid-raw-interface Fixes #1745
Conversation
This file contains hidden or 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
Bastian-Krause
added
fix
pick to stable
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1745 +/- ##
========================================
- Coverage 45.3% 45.3% -0.1%
========================================
Files 172 172
Lines 13517 13530 +13
========================================
Hits 6131 6131
- Misses 7386 7399 +13
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Emantor
approved these changes
Sep 25, 2025
The current tcpdump timeout handling does not work. This is supposed to exit after 5 seconds: tcpdump --interface=eth0 -w - -G 5 -W 1 But that does not work if no packets are received. So in order to make the timeout actually work, prefix tcpdump with coreutils' timeout command instead: timeout --signal=INT --preserve-status <timeout> <tcpdump command> By sending SIGINT (`--signal=INT`), tcpdump exits gracefully and finishes writing received packets. Combined with `--preserve-status`, tcpdump's actual exit status is preserved, being 0 even on SIGINT if nothing else went wrong. An alternative would be to use subprocess, but that would prevent us from using `os.execvp()`, replacing the process. So the timeout command is the better approach here. Signed-off-by: Bastian Krause <bst@pengutronix.de>
…ptional The intention of labgrid-raw-interface was to have an optional "count" argument, allowing for packet capture on an interface until a timeout is reached, no matter how many packets are received. This is used when calling: RawNetworkInterfaceDriver.start_record(filename, timeout=10) However, the missing `nargs="?"` kwarg when adding the argument actually required the argument to be given: usage: labgrid-raw-interface tcpdump [-h] [--timeout TIMEOUT] ifname count labgrid-raw-interface tcpdump: error: the following arguments are required: count The original commit introducing the option actually included it [1]. Fix that by re-adding `nargs="?"`. [1] 90cf941 ("helpers: add labgrid-raw-interface helper") Fixes: c1aec37 ("helpers/labgrid-raw-interface: introduce subparsers per program, pass options") Signed-off-by: Bastian Krause <bst@pengutronix.de>
…ture started The expectation of RawNetworkInterfaceDriver.start_record() is that it returns once the packet capturing is running, so later code can start right away generating packets that are received on the interface. This does not work reliably currently because the labgrid-raw-interface helper (wrapping tcpdump) is started via subprocess.Popen(), but that does not mean the capture is actually running just yet. To fix this, wait until the subprocess emits "tcpdump: listening on", which is tcpdump's way of telling that it's now actually capturing. Signed-off-by: Bastian Krause <bst@pengutronix.de>
Emantor
force-pushed
the
bst/rawnetworkinterface-fixes
branch
from
8801164 to
eef08fe
Compare
Member
Author
|
I think this is good to get merged. |
Bastian-Krause
merged commit 70f6150
into
labgrid-project:master
10 of 12 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Fixes:
RawNetworkInterfaceDriver.record(..., timeout=<timeout>)/start_record(..., timeout=<timeout>)never stopping tcpdump if no packets were received.RawNetworkInterfaceDriver.record(..., count=None)/start_record(..., count=None)calling labgrid-raw-interface leading to an error.RawNetworkInterfaceDriver.record(...)/start_record(...)returning before the actual capture started, leading to missed packetsChecklist
Fixes #1157
Fixes #1320
/cc @JoshuaWatt @nick-potenski