-
Notifications
You must be signed in to change notification settings - Fork 724
Use file content heuristics to decide file reader. #1962
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: dev
Are you sure you want to change the base?
Changes from 10 commits
02de760
d2b6339
685dd9f
40dee69
f1e3e18
8da1790
3ad51e2
15c2000
17af8d4
46418ec
3d713ab
a2391ec
ea328d7
db86c3e
4aed9bd
a83ae2b
916e872
022529f
169fcd2
db8c848
3e74912
f1613c4
bc2bacd
58ac45d
3b4b5ad
18379b4
8a4f6f8
7776e0e
4f52f59
88ebfff
41fe188
c8ae4f8
c7cab2b
6d55077
682eeac
07804da
9c4fc08
d975157
40530df
96a61b2
55a6b7a
3ab14e7
5dd9a30
45ad769
d24a9ad
f5ff879
2c1b2c4
8d1ed1d
0ea2da9
c209c90
8d77aa0
af12d2f
b357087
443c883
202d5cc
e6b2aa9
b8fb635
c6c7720
181a8b4
76aa850
d8f7419
91a7a0a
e275950
e7a42b5
54f7bae
93cba3d
3643fac
ec5980f
b3639a9
ce561b9
6322b41
ae9caa8
956b596
5275349
a15f529
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Dimi1010 marked this conversation as resolved.
Show resolved
Hide resolved
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -754,7 +754,7 @@ PTF_TEST_CASE(TestPcapNgFileReadWriteAdv) | |
|
|
||
| PTF_ASSERT_EQUAL(packetCount, 161); | ||
|
|
||
| // ------- | ||
| // ------- IFileReaderDevice::getReader() Factory | ||
|
|
||
| // copy the .zstd file to a similar file with .zst extension | ||
| std::ifstream zstdFile(EXAMPLE2_PCAPNG_ZSTD_WRITE_PATH, std::ios::binary); | ||
|
|
@@ -763,26 +763,57 @@ PTF_TEST_CASE(TestPcapNgFileReadWriteAdv) | |
| zstdFile.close(); | ||
| zstFile.close(); | ||
|
|
||
| pcpp::IFileReaderDevice* genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE2_PCAP_PATH); | ||
| FileReaderTeardown genericReaderTeardown1(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapFileReaderDevice*>(genericReader)); | ||
| PTF_ASSERT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE2_PCAPNG_PATH); | ||
| FileReaderTeardown genericReaderTeardown2(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE_PCAPNG_ZSTD_WRITE_PATH); | ||
| FileReaderTeardown genericReaderTeardown3(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
| PTF_ASSERT_TRUE(genericReader->open()); | ||
| { | ||
| pcpp::IFileReaderDevice* genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE2_PCAP_PATH); | ||
| FileReaderTeardown genericReaderTeardown1(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapFileReaderDevice*>(genericReader)); | ||
| PTF_ASSERT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE2_PCAPNG_PATH); | ||
| FileReaderTeardown genericReaderTeardown2(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE_PCAPNG_ZSTD_WRITE_PATH); | ||
| FileReaderTeardown genericReaderTeardown3(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
| PTF_ASSERT_TRUE(genericReader->open()); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE2_PCAPNG_ZST_WRITE_PATH); | ||
| FileReaderTeardown genericReaderTeardown4(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
| PTF_ASSERT_TRUE(genericReader->open()); | ||
|
|
||
| genericReader->close(); | ||
| } | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::getReader(EXAMPLE2_PCAPNG_ZST_WRITE_PATH); | ||
| FileReaderTeardown genericReaderTeardown4(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader)); | ||
| PTF_ASSERT_TRUE(genericReader->open()); | ||
| // ------- IFileReaderDevice::createReader() Factory | ||
| // TODO: Move to a separate unit test. | ||
Dimi1010 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| genericReader->close(); | ||
| { | ||
| PTF_ASSERT_RAISES(pcpp::IFileReaderDevice::createReader("BogusFile"), std::runtime_error, | ||
| "Could not open: BogusFile"); | ||
|
|
||
| auto genericReader = pcpp::IFileReaderDevice::createReader(EXAMPLE2_PCAP_PATH); | ||
| PTF_ASSERT_NOT_NULL(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapFileReaderDevice*>(genericReader.get())); | ||
| genericReader->close(); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::createReader(EXAMPLE2_PCAPNG_PATH); | ||
| PTF_ASSERT_NOT_NULL(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader.get())); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::createReader(EXAMPLE_PCAPNG_ZSTD_WRITE_PATH); | ||
| PTF_ASSERT_NOT_NULL(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader.get())); | ||
| PTF_ASSERT_TRUE(genericReader->open()); | ||
| genericReader->close(); | ||
|
|
||
| genericReader = pcpp::IFileReaderDevice::createReader(EXAMPLE2_PCAPNG_ZST_WRITE_PATH); | ||
| PTF_ASSERT_NOT_NULL(genericReader); | ||
| PTF_ASSERT_NOT_NULL(dynamic_cast<pcpp::PcapNgFileReaderDevice*>(genericReader.get())); | ||
| PTF_ASSERT_TRUE(genericReader->open()); | ||
| genericReader->close(); | ||
| } | ||
|
|
||
| // ------- | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.