pcapng enhancements (idb,epb) and some fixes #4342
Merged
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
Based on draft-ietf-opsawg-pcapng-latest, 5 March 2024. -map packet.sniffed_on to unique IDB id. When writing, if_name option and linktype is populated based on the first packet seen with a unique sniffed_on string. -map packet.direction to EPB flags inbound/outbound direction bits. Remaining flag bits not implemented. -simplified RawPcapNgReader._read_options() and moved (code,value) treatment to the caller since codes of same type can have different meaning for different type of blocks. -Fix RawPcapNgReader._read_block_shb() and _write_block_shb(). *added new tests and adapted others to the changes
guedou
reviewed
Mar 30, 2024
Co-authored-by: Guillaume Valadon <guillaume@valadon.net>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #4342 +/- ##
==========================================
+ Coverage 81.67% 82.12% +0.44%
==========================================
Files 350 350
Lines 82884 83195 +311
==========================================
+ Hits 67699 68326 +627
+ Misses 15185 14869 -316
|
jcpvdm
commented
Mar 30, 2024
|
Unless specifically asked or discussed during a PR review process, we squash all commits. You can simply add more commits to apply changes.
|
|
@guedou, I have done some changes as per your review suggestion. Additionally added a length check for the tsresol option when reading IDB. |
- changes around self.linktype, so that attribute is always int (when exists) - other minor type hint fixes
gpotter2
approved these changes
Apr 27, 2024
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.
Checklist:
cd test && ./run_testsortox)Based on draft-ietf-opsawg-pcapng-latest, 5 March 2024, I made following changes:
packet.sniffed_onto unique IDB id. When writing, if_name option and linktype is populated based on the first packet seen with a unique sniffed_on string.packet.directionto EPB flags inbound/outbound direction bits. Remaining flag bits not implemented.RawPcapNgReader._read_options()and moved (code,value) treatment to the caller since codes of same type can have different meaning for different type of blocks.RawPcapNgReader._read_block_shb()and_write_block_shb()to be according to the draftNote: I couldn't figure the meaning of
packet.directionon Scapy API reference or source code, but since it's marked as integer I assumed it follows the pcapng epb_flags outbound/inbound field.Why I did this changes:
I was using scapy to convert packet hex dump from a text file to pcap. The text file included information about interface name and direction (outbound/inbound) which I would like to to have included in the pcapng file.