Skip to content
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.

Sign up for GitHub

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

Add Layer Build and Validation for DoIP (Diagnostic over IP) Support #1655

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Add Layer Build and Validation for DoIP (Diagnostic over IP) Support #1655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a50cf68
Add Layer Build and Validation for DoIP (Diagnostic over IP) Support
Dec 8, 2024
703b650
Merge branch 'master' into develop
raissi-oussema Dec 7, 2024
7aee737
Merge branch 'dev' into develop
tigercosmos Dec 8, 2024
7966b06
Correct endianness handling for imported data to ensure consistent in…
Dec 9, 2024
d4658d7
Fix serval issues related to multi-cross platform
Dec 9, 2024
dd26c31
other fix for DoIpLayerData
Dec 9, 2024
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
4 changes: 1 addition & 3 deletions 3rdParty/json/include/json.hpp
View file
Open in desktop
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why update this file?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same thing as my previous comment, I only removed some suppress-checks detected as incorrect

Original file line number Diff line number Diff line change
Expand Up @@ -3406,7 +3406,7 @@ NLOHMANN_JSON_NAMESPACE_END
template<typename U> class AllocatorType = std::allocator,
template<typename T, typename SFINAE = void> class JSONSerializer =
adl_serializer,
class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
class BinaryType = std::vector<std::uint8_t>,
class CustomBaseClass = void>
class basic_json;

Expand Down Expand Up @@ -4251,7 +4251,6 @@ inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
template<typename... Args>
inline std::size_t concat_length(const char* cstr, const Args& ... rest)
{
// cppcheck-suppress ignoredReturnValue
return ::strlen(cstr) + concat_length(rest...);
}

Expand Down Expand Up @@ -19991,7 +19990,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
#if JSON_DIAGNOSTICS
JSON_TRY
{
// cppcheck-suppress assertWithSideEffect
JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
{
return j.m_parent == this;
Expand Down
3 changes: 2 additions & 1 deletion Common++/header/Logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ namespace pcpp
PcapLogModuleKniDevice, ///< KniDevice module (Pcap++)
PcapLogModuleXdpDevice, ///< XdpDevice module (Pcap++)
NetworkUtils, ///< NetworkUtils module (Pcap++)
NumOfLogModules
PacketLogModuleDoIpLayer, ///< DoipLayer module (Packet++)
NumOfLogModules,
};

/**
Expand Down
6 changes: 6 additions & 0 deletions Packet++/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ add_library(
src/DnsLayer.cpp
src/DnsResource.cpp
src/DnsResourceData.cpp
src/DoIpLayerData.cpp
src/DoIpLayer.cpp
src/EthDot3Layer.cpp
src/EthLayer.cpp
src/FtpLayer.cpp
Expand Down Expand Up @@ -80,6 +82,10 @@ set(public_headers
header/DnsResourceData.h
header/DnsResource.h
header/EthDot3Layer.h
header/DoIpEnumToString.h
header/DoIpEnums.h
header/DoIpLayer.h
header/DoIpLayerData.h
header/EthLayer.h
header/FtpLayer.h
header/GreLayer.h
Expand Down
226 changes: 226 additions & 0 deletions Packet++/header/DoIpEnumToString.h
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading