Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
02de760
Added heuristics file content detector that determines the content ba…
Dimi1010 Sep 12, 2025
d2b6339
Merge remote-tracking branch 'upstream/dev' into feature/heuristic-fi…
Dimi1010 Sep 12, 2025
685dd9f
Moved stream checkpoint outside format detector as it is not directly…
Dimi1010 Sep 12, 2025
40dee69
Added a new factory function `createReader` that uses the new heurist…
Dimi1010 Sep 12, 2025
f1e3e18
Add <algorithm> include.
Dimi1010 Sep 12, 2025
8da1790
Added unit tests.
Dimi1010 Sep 12, 2025
3ad51e2
Deprecated old factory function.
Dimi1010 Sep 12, 2025
15c2000
Add byte-swapped zstd magic number.
Dimi1010 Sep 12, 2025
17af8d4
Lint
Dimi1010 Sep 12, 2025
46418ec
Move enum closer to first usage.
Dimi1010 Sep 12, 2025
3d713ab
Added unit tests for file reader device factory.
Dimi1010 Sep 15, 2025
a2391ec
Revert indentation.
Dimi1010 Sep 15, 2025
ea328d7
Fixed StreamCheckpoint to restore original stream state.
Dimi1010 Sep 15, 2025
db86c3e
Merge branch 'dev' into feature/heuristic-file-selection
Dimi1010 Sep 15, 2025
4aed9bd
Merge branch 'dev' into feature/heuristic-file-selection
Dimi1010 Sep 20, 2025
a83ae2b
Moved isStreamSeekable helper to inside `CaptureFileFormatDetector`.
Dimi1010 Sep 20, 2025
916e872
Added pcap magic number for Alexey Kuznetzov's modified pcap format.
Dimi1010 Sep 20, 2025
022529f
Merge remote-tracking branch 'upstream/dev' into feature/heuristic-fi…
Dimi1010 Sep 26, 2025
169fcd2
Split the unit test into multiple smaller tests.
Dimi1010 Sep 26, 2025
db8c848
Merge branch 'dev' into feature/heuristic-file-selection
Dimi1010 Oct 2, 2025
3e74912
Merge remote-tracking branch 'upstream/dev' into feature/heuristic-fi…
Dimi1010 Oct 2, 2025
f1613c4
Added helper to indicate if ZstSupport is enabled for PcapNg devices.
Dimi1010 Oct 2, 2025
bc2bacd
Split pcap microsecond and nanosecond file heuristics tests.
Dimi1010 Oct 2, 2025
58ac45d
Skipping Zst test case if zst is not supported.
Dimi1010 Oct 2, 2025
3b4b5ad
Due to file heuristics returning PcapNG format on Zstd archive, if Zs…
Dimi1010 Oct 2, 2025
18379b4
Lint
Dimi1010 Oct 2, 2025
8a4f6f8
Added invalid device factory to pcap tag.
Dimi1010 Oct 2, 2025
7776e0e
Updated static zst archives to be actual archives.
Dimi1010 Oct 2, 2025
4f52f59
Centralized PTF test name width under a macro.
Dimi1010 Oct 3, 2025
88ebfff
Add Pcap++Test header files to test sources for IDE tooling.
Dimi1010 Oct 3, 2025
41fe188
Fixed test output formatting.
Dimi1010 Oct 3, 2025
c8ae4f8
Lint
Dimi1010 Oct 3, 2025
c7cab2b
Typo fix.
Dimi1010 Oct 3, 2025
6d55077
Merge remote-tracking branch 'upstream/dev' into feature/heuristic-fi…
Dimi1010 Oct 6, 2025
682eeac
Shortened test names.
Dimi1010 Oct 6, 2025
07804da
Simplified invalid file test.
Dimi1010 Oct 6, 2025
9c4fc08
Simplified ZST tests.
Dimi1010 Oct 6, 2025
d975157
Added snoop test.
Dimi1010 Oct 7, 2025
40530df
Expanded granularity of file format detection.
Dimi1010 Oct 7, 2025
96a61b2
Marked `checkSupport` functions as constexpr to enable compile time o…
Dimi1010 Oct 7, 2025
55a6b7a
Exclude json from pre-commit cppcheck as it is slow due to many defin…
Dimi1010 Oct 7, 2025
3ab14e7
Lint
Dimi1010 Oct 7, 2025
5dd9a30
Fix runtime side effects inside constexpr function.
Dimi1010 Oct 7, 2025
45ad769
Added a secondary factory function to separate mixed error handling m…
Dimi1010 Oct 7, 2025
d24a9ad
Revert deprecation message, as doxygen is unhappy.
Dimi1010 Oct 7, 2025
f5ff879
Update tests.
Dimi1010 Oct 7, 2025
2c1b2c4
Update deprecation warning to point to the function closer to the sig…
Dimi1010 Oct 7, 2025
8d1ed1d
Catch general exception instead of runtime error.
Dimi1010 Oct 7, 2025
0ea2da9
Shortened deprecation message due to pre-commit warnings when its is …
Dimi1010 Oct 7, 2025
c209c90
Fix braces.
Dimi1010 Oct 9, 2025
8d77aa0
Simplfy test.
Dimi1010 Oct 9, 2025
af12d2f
Added tests for createReader failures.
Dimi1010 Oct 9, 2025
b357087
Merge branch 'dev' into feature/heuristic-file-selection
Dimi1010 Oct 10, 2025
443c883
Simplified pcap detection to not require to read the entire pcap header.
Dimi1010 Oct 11, 2025
202d5cc
Added const qualifiers to detector methods.
Dimi1010 Oct 11, 2025
e6b2aa9
Added dedicated unit tests for CaptureFileFormatDetector.
Dimi1010 Oct 11, 2025
b8fb635
Added more tests for `createReader`.
Dimi1010 Oct 11, 2025
c6c7720
Add static assert for array indice checks.
Dimi1010 Oct 11, 2025
181a8b4
Updated detectPcap selection.
Dimi1010 Oct 18, 2025
76aa850
Merge branch 'dev' into feature/heuristic-file-selection
Dimi1010 Oct 18, 2025
d8f7419
Extracted capture format detector to remove it from publicly availabl…
Dimi1010 Oct 18, 2025
91a7a0a
Fix includes.
Dimi1010 Oct 18, 2025
e275950
Removed duplicate files from tracking.
Dimi1010 Oct 18, 2025
e7a42b5
Lint
Dimi1010 Oct 18, 2025
54f7bae
Trimmed pcapng sample.
Dimi1010 Oct 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: '.*\.(pcap|pcapng|dat)|(PacketExamples|PcapExamples|expected_output|pcap_examples).*\.txt'
exclude: '.*\.(pcap|pcapng|dat)|(PacketExamples|PcapExamples|expected_output|pcap_examples).*\.(txt|zst|zstd)'
fail_fast: false
repos:
- repo: local
Expand Down Expand Up @@ -37,6 +37,7 @@ repos:
files: ^(Common\+\+|Packet\+\+|Pcap\+\+|Tests|Examples)/.*\.(cpp|h)$
- id: cppcheck
args: ["--std=c++14", "--language=c++", "--suppressions-list=cppcheckSuppressions.txt", "--inline-suppr", "--force"]
exclude: ^3rdParty/json
- repo: https://github.com/BlankSpruce/gersemi
rev: 0.22.3
hooks:
Expand Down
2 changes: 2 additions & 0 deletions Pcap++/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
add_library(
Pcap++
src/CaptureFileFormatDetector.cpp
src/DeviceUtils.cpp
$<$<BOOL:${PCAPPP_USE_DPDK}>:src/DpdkDevice.cpp>
$<$<BOOL:${PCAPPP_USE_DPDK}>:src/DpdkDeviceList.cpp>
Expand Down Expand Up @@ -102,6 +103,7 @@ target_link_libraries(
)

if(LIGHT_PCAPNG_ZSTD)
target_compile_definitions(Pcap++ PRIVATE -DPCPP_PCAPNG_ZSTD_SUPPORT)
target_link_libraries(Pcap++ PRIVATE light_pcapng)
endif()

Expand Down
30 changes: 30 additions & 0 deletions Pcap++/header/PcapFileDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,29 @@ namespace pcpp
/// it returns an instance of PcapFileReaderDevice
/// @param[in] fileName The file name to open
/// @return An instance of the reader to read the file. Notice you should free this instance when done using it
/// @deprecated Prefer `createReader` or `tryCreateReader` due to selection of reader based on file content
/// instead of extension.
PCPP_DEPRECATED("Prefer `tryCreateReader` due to selection of reader based on file content.")
static IFileReaderDevice* getReader(const std::string& fileName);

/// @brief Creates an instance of the reader best fit to read the file.
///
/// The factory function uses heuristics based on the file content to decide the reader.
/// If the file type is known at compile time, it is better to construct a concrete reader instance directly.
///
/// @param[in] fileName The path to the file to open.
/// @return A unique pointer to a reader instance
/// @throws std::runtime_error If the file could not be opened or unsupported.
static std::unique_ptr<IFileReaderDevice> createReader(const std::string& fileName);

/// @brief Tries to create an instance of the reader best fit to read the file.
///
/// The factory function uses heuristics based on the file content to decide the reader.
/// If the file type is known at compile time, it is better to construct a concrete reader instance directly.
///
/// @param fileName The path to the file to open.
/// @return A unique pointer to a reader instance, or nullptr if the file could not be opened or unsupported.
static std::unique_ptr<IFileReaderDevice> tryCreateReader(const std::string& fileName);
};

/// @class IFileWriterDevice
Expand Down Expand Up @@ -313,6 +335,10 @@ namespace pcpp
PcapNgFileReaderDevice& operator=(const PcapNgFileReaderDevice& other);

public:
/// @brief A static method that checks if the device was built with zstd compression support
/// @return True if zstd compression is supported, false otherwise.
static bool isZstdSupported();

/// A constructor for this class that gets the pcap-ng full path file name to open. Notice that after calling
/// this constructor the file isn't opened yet, so reading packets will fail. For opening the file call open()
/// @param[in] fileName The full path of the file to read
Expand Down Expand Up @@ -397,6 +423,10 @@ namespace pcpp
PcapNgFileWriterDevice& operator=(const PcapNgFileWriterDevice& other);

public:
/// @brief A static method that checks if the device was built with zstd compression support.
/// @return True if zstd compression is supported, false otherwise.
static bool isZstdSupported();

/// A constructor for this class that gets the pcap-ng full path file name to open for writing or create. Notice
/// that after calling this constructor the file isn't opened yet, so writing packets will fail. For opening the
/// file call open()
Expand Down
191 changes: 191 additions & 0 deletions Pcap++/src/CaptureFileFormatDetector.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
#include "CaptureFileFormatDetector.h"

#include <algorithm>
#include <array>
#include <cstdint>
#include <istream>
#include <iterator>
#include <stdexcept>

namespace pcpp
{
namespace
{
class StreamPositionCheckpoint
{
public:
explicit StreamPositionCheckpoint(std::istream& stream)
: m_Stream(stream), m_State(stream.rdstate()), m_Pos(stream.tellg())
{}

~StreamPositionCheckpoint()
{
m_Stream.seekg(m_Pos);
m_Stream.clear(m_State);
}

private:
std::istream& m_Stream;
std::ios_base::iostate m_State;
std::streampos m_Pos;
};

/// @brief Check if a stream is seekable.
/// @param stream The stream to check.
/// @return True if the stream supports seek operations, false otherwise.
bool isStreamSeekable(std::istream& stream)
{
auto pos = stream.tellg();
if (stream.fail())
{
stream.clear();
return false;
}

if (stream.seekg(pos).fail())
{
stream.clear();
return false;
}

return true;
}
} // namespace

namespace internal
{
CaptureFileFormat CaptureFileFormatDetector::detectFormat(std::istream& content) const
{
// Check if the stream supports seeking.
if (!isStreamSeekable(content))
{
throw std::runtime_error("Heuristic file format detection requires seekable stream");
}

CaptureFileFormat format = detectPcapFile(content);
if (format != CaptureFileFormat::Unknown)
{
return format;
}

if (isPcapNgFile(content))
{
return CaptureFileFormat::PcapNG;
}

// PcapNG backend can support ZstdCompressed Pcap files, so we assume an archive is compressed PcapNG.
if (isZstdArchive(content))
{
return CaptureFileFormat::PcapNGZstd;
}

if (isSnoopFile(content))
{
return CaptureFileFormat::Snoop;
}

return CaptureFileFormat::Unknown;
}

CaptureFileFormat CaptureFileFormatDetector::detectPcapFile(std::istream& content) const
{
// Pcap magic numbers are taken from: https://github.com/the-tcpdump-group/libpcap/blob/master/sf-pcap.c
// There are some other reserved magic numbers but they are not supported by libpcap so we ignore them.
// The order of the magic numbers in the array is important for format detection. See switch statement
// below.
constexpr std::array<uint32_t, 6> pcapMagicNumbers = {
0xa1'b2'c3'd4, // regular pcap, microsecond-precision
0xd4'c3'b2'a1, // regular pcap, microsecond-precision (byte-swapped)
// Libpcap 0.9.1 and later support reading a modified pcap format that contains an extended header.
// Format reference: https://wiki.wireshark.org/Development/LibpcapFileFormat#modified-pcap
0xa1'b2'cd'34, // Alexey Kuznetzov's modified libpcap format
0x34'cd'b2'a1, // Alexey Kuznetzov's modified libpcap format (byte-swapped)
// Libpcap 1.5.0 and later support reading nanosecond-precision pcap files.
0xa1'b2'3c'4d, // regular pcap, nanosecond-precision
0x4d'3c'b2'a1, // regular pcap, nanosecond-precision (byte-swapped)
};

StreamPositionCheckpoint checkpoint(content);

uint32_t magic = 0;
content.read(reinterpret_cast<char*>(&magic), sizeof(magic));
if (content.gcount() != sizeof(magic))
{
return CaptureFileFormat::Unknown;
}

auto it = std::find(pcapMagicNumbers.begin(), pcapMagicNumbers.end(), magic);
if (it == pcapMagicNumbers.end())
{
return CaptureFileFormat::Unknown;
}

// Indices 0-3 are regular pcap (microsecond-precision or modified) files.
// Indices 4-5 are nanosecond-precision pcap.
// Modified pcap files are treated as regular pcap files by libpcap so they are folded.
auto const selectedIdx = std::distance(pcapMagicNumbers.begin(), it);
if (selectedIdx < 4)
{
return CaptureFileFormat::Pcap;
}

return CaptureFileFormat::PcapNano;
}

bool CaptureFileFormatDetector::isPcapNgFile(std::istream& content) const
{
constexpr std::array<uint32_t, 1> pcapMagicNumbers = {
0x0A'0D'0D'0A, // pcapng magic number (palindrome)
};

StreamPositionCheckpoint checkpoint(content);

uint32_t magic = 0;
content.read(reinterpret_cast<char*>(&magic), sizeof(magic));
if (content.gcount() != sizeof(magic))
{
return false;
}

return std::find(pcapMagicNumbers.begin(), pcapMagicNumbers.end(), magic) != pcapMagicNumbers.end();
}

bool CaptureFileFormatDetector::isSnoopFile(std::istream& content) const
{
constexpr std::array<uint64_t, 2> snoopMagicNumbers = {
0x73'6E'6F'6F'70'00'00'00, // snoop magic number, "snoop" in ASCII
0x00'00'00'70'6F'6F'6E'73 // snoop magic number, "snoop" in ASCII (byte-swapped)
};

StreamPositionCheckpoint checkpoint(content);

uint64_t magic = 0;
content.read(reinterpret_cast<char*>(&magic), sizeof(magic));
if (content.gcount() != sizeof(magic))
{
return false;
}

return std::find(snoopMagicNumbers.begin(), snoopMagicNumbers.end(), magic) != snoopMagicNumbers.end();
}

bool CaptureFileFormatDetector::isZstdArchive(std::istream& content) const
{
constexpr std::array<uint32_t, 2> zstdMagicNumbers = {
0x28'B5'2F'FD, // zstd archive magic number
0xFD'2F'B5'28, // zstd archive magic number (byte-swapped)
};

StreamPositionCheckpoint checkpoint(content);

uint32_t magic = 0;
content.read(reinterpret_cast<char*>(&magic), sizeof(magic));
if (content.gcount() != sizeof(magic))
{
return false;
}

return std::find(zstdMagicNumbers.begin(), zstdMagicNumbers.end(), magic) != zstdMagicNumbers.end();
}
} // namespace internal
} // namespace pcpp
39 changes: 39 additions & 0 deletions Pcap++/src/CaptureFileFormatDetector.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#pragma once

#include <istream>

namespace pcpp
{
namespace internal
{
/// @brief An enumeration representing different capture file formats.
enum class CaptureFileFormat
{
Unknown,
Pcap, // regular pcap with microsecond precision
PcapNano, // regular pcap with nanosecond precision
PcapNG, // uncompressed pcapng
PcapNGZstd, // zstd compressed pcapng
Snoop, // solaris snoop
};

/// @brief Heuristic file format detector that scans the magic number of the file format header.
class CaptureFileFormatDetector
{
public:
/// @brief Checks a content stream for the magic number and determines the type.
/// @param content A content stream that contains the file content.
/// @return A CaptureFileFormat value with the detected content type.
CaptureFileFormat detectFormat(std::istream& content) const;

private:
CaptureFileFormat detectPcapFile(std::istream& content) const;

bool isPcapNgFile(std::istream& content) const;

bool isSnoopFile(std::istream& content) const;

bool isZstdArchive(std::istream& content) const;
};
} // namespace internal
} // namespace pcpp
Loading