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.

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 12 commits into
base: dev
Choose a base branch
from
4 changes: 1 addition & 3 deletions 3rdParty/json/include/json.hpp
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
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ namespace pcpp
PcapLogModuleKniDevice, ///< KniDevice module (Pcap++)
PcapLogModuleXdpDevice, ///< XdpDevice module (Pcap++)
NetworkUtils, ///< NetworkUtils module (Pcap++)
NumOfLogModules
PacketLogModuleDoIpLayer, ///< DoipLayer module (Packet++)
NumOfLogModules,
};

/// Cross-platform and thread-safe version of strerror
Expand Down
6 changes: 6 additions & 0 deletions Packet++/CMakeLists.txt
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/DoIpLayer.cpp
src/DoIpLayerData.cpp
src/EthDot3Layer.cpp
src/EthLayer.cpp
src/FtpLayer.cpp
Expand Down Expand Up @@ -80,6 +82,10 @@ set(
header/DnsLayer.h
header/DnsResourceData.h
header/DnsResource.h
header/DoIpEnums.h
header/DoIpEnumToString.h
header/DoIpLayer.h
header/DoIpLayerData.h
header/EthDot3Layer.h
header/EthLayer.h
header/FtpLayer.h
Expand Down
226 changes: 226 additions & 0 deletions Packet++/header/DoIpEnumToString.h

Large diffs are not rendered by default.

Loading
Loading