Cleanup PcapLiveDevice synchronous capture.
#2026
Open
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
Codecov Report❌ Patch coverage is
Additional details and impacted files
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
seladb
reviewed
Dec 1, 2025
| const int64_t timeoutMs = timeout * 1000; // timeout unit is seconds, let's change it to milliseconds | ||
| // A valid timeout is only generated when timeout is positive. | ||
| // This means that the timeout timepoint should be after the start time. | ||
| const bool hasTimeout = timeout > 0; |
Owner
There was a problem hiding this comment.
nit: I'd avoid this variable and use timeout > 0 to indicate timeout is used.
I'd also do:
auto timeoutTime = timeout > 0 ? startTime + std::chrono::milliseconds(static_cast<int64_t>(timeout * 1000)) : 0;
|
|
||
| if (std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - startTime).count() >= timeoutMs) | ||
| // Check the time only if a valid timeout was specified. Otherwise it would always be true. | ||
| if (hasTimeout && currentTime >= timeoutTime) |
Owner
There was a problem hiding this comment.
If we set timeoutTime = 0 if timeout <= 0 we probably don't need hasTimeout here
Comment on lines
+340
to
+359
| try | ||
| { | ||
| if (context->callback(&rawPacket, context->device, context->userCookie)) | ||
| { | ||
| // If the callback returns true, it means that the user wants to stop the capture | ||
| PCPP_LOG_DEBUG("Capture callback requested to stop capturing"); | ||
| context->requestStop = true; | ||
| } | ||
| } | ||
| catch (const std::exception& ex) | ||
| { | ||
| PCPP_LOG_ERROR("Exception occurred while invoking packet arrival callback: " << ex.what()); | ||
| context->requestStop = true; // Stop capture on exception | ||
| } | ||
| catch (...) | ||
| { | ||
| PCPP_LOG_ERROR("Unknown exception occurred while invoking packet arrival callback"); | ||
| context->requestStop = true; // Stop capture on unknown exception | ||
| } | ||
| } |
Owner
There was a problem hiding this comment.
I think we decided not to catch exceptions here, no?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Part of #1838
This PR updates the synchronous capture method.