From 03b0a7c835f54d00335cc330a89bb1d336bdaf7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Date: Thu, 19 Sep 2024 13:27:53 +0200 Subject: [PATCH] header: move to a dedicated pcapplusplus folder to follow install hierarchy --- Common++/CMakeLists.txt | 28 ++-- .../{ => pcapPlusPlus}/DeprecationUtils.h | 0 .../header/{ => pcapPlusPlus}/GeneralUtils.h | 0 .../header/{ => pcapPlusPlus}/IpAddress.h | 0 .../{ => pcapPlusPlus}/IpAddressUtils.h | 0 Common++/header/{ => pcapPlusPlus}/IpUtils.h | 0 Common++/header/{ => pcapPlusPlus}/LRUList.h | 0 Common++/header/{ => pcapPlusPlus}/Logger.h | 0 .../header/{ => pcapPlusPlus}/MacAddress.h | 0 .../header/{ => pcapPlusPlus}/OUILookup.h | 0 .../{ => pcapPlusPlus}/PcapPlusPlusVersion.h | 0 .../header/{ => pcapPlusPlus}/PointerVector.h | 0 .../header/{ => pcapPlusPlus}/SystemUtils.h | 0 .../header/{ => pcapPlusPlus}/TablePrinter.h | 0 .../{ => pcapPlusPlus}/TimespecTimeval.h | 0 Common++/src/GeneralUtils.cpp | 4 +- Common++/src/IpAddress.cpp | 6 +- Common++/src/IpAddressUtils.cpp | 6 +- Common++/src/IpUtils.cpp | 4 +- Common++/src/Logger.cpp | 2 +- Common++/src/MacAddress.cpp | 2 +- Common++/src/OUILookup.cpp | 6 +- Common++/src/PcapPlusPlusVersion.cpp | 2 +- Common++/src/SystemUtils.cpp | 2 +- Common++/src/TablePrinter.cpp | 4 +- Examples/ArpSpoofing/main.cpp | 20 +-- Examples/Arping/main.cpp | 16 +-- Examples/DNSResolver/main.cpp | 12 +- Examples/DnsSpoofing/main.cpp | 30 ++-- Examples/DpdkBridge/main.cpp | 14 +- Examples/DpdkExample-FilterTraffic/main.cpp | 12 +- Examples/ExampleApp/main.cpp | 6 +- Examples/HttpAnalyzer/main.cpp | 15 +- Examples/IPDefragUtil/main.cpp | 14 +- Examples/IcmpFileTransfer/Common.cpp | 12 +- Packet++/CMakeLists.txt | 132 +++++++++--------- Packet++/header/{ => pcapPlusPlus}/ArpLayer.h | 6 +- .../header/{ => pcapPlusPlus}/Asn1Codec.h | 2 +- Packet++/header/{ => pcapPlusPlus}/BgpLayer.h | 4 +- .../header/{ => pcapPlusPlus}/CotpLayer.h | 4 +- .../header/{ => pcapPlusPlus}/DhcpLayer.h | 8 +- .../header/{ => pcapPlusPlus}/DhcpV6Layer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/DnsLayer.h | 8 +- .../header/{ => pcapPlusPlus}/DnsLayerEnums.h | 0 .../header/{ => pcapPlusPlus}/DnsResource.h | 6 +- .../{ => pcapPlusPlus}/DnsResourceData.h | 4 +- .../header/{ => pcapPlusPlus}/EthDot3Layer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/EthLayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/FtpLayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/GreLayer.h | 2 +- Packet++/header/{ => pcapPlusPlus}/GtpLayer.h | 2 +- .../header/{ => pcapPlusPlus}/HttpLayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/IPLayer.h | 4 +- .../header/{ => pcapPlusPlus}/IPReassembly.h | 8 +- .../header/{ => pcapPlusPlus}/IPSecLayer.h | 2 +- .../header/{ => pcapPlusPlus}/IPv4Layer.h | 8 +- .../{ => pcapPlusPlus}/IPv6Extensions.h | 6 +- .../header/{ => pcapPlusPlus}/IPv6Layer.h | 8 +- .../header/{ => pcapPlusPlus}/IcmpLayer.h | 4 +- .../header/{ => pcapPlusPlus}/IcmpV6Layer.h | 2 +- .../header/{ => pcapPlusPlus}/IgmpLayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/LLCLayer.h | 2 +- Packet++/header/{ => pcapPlusPlus}/Layer.h | 2 +- .../header/{ => pcapPlusPlus}/LdapLayer.h | 4 +- .../header/{ => pcapPlusPlus}/MplsLayer.h | 2 +- Packet++/header/{ => pcapPlusPlus}/NdpLayer.h | 10 +- .../header/{ => pcapPlusPlus}/NflogLayer.h | 6 +- Packet++/header/{ => pcapPlusPlus}/NtpLayer.h | 6 +- .../{ => pcapPlusPlus}/NullLoopbackLayer.h | 2 +- .../header/{ => pcapPlusPlus}/PPPoELayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/Packet.h | 4 +- .../{ => pcapPlusPlus}/PacketTrailerLayer.h | 2 +- .../header/{ => pcapPlusPlus}/PacketUtils.h | 4 +- .../header/{ => pcapPlusPlus}/PayloadLayer.h | 2 +- .../header/{ => pcapPlusPlus}/ProtocolType.h | 0 .../header/{ => pcapPlusPlus}/RadiusLayer.h | 4 +- .../header/{ => pcapPlusPlus}/RawPacket.h | 0 .../header/{ => pcapPlusPlus}/S7CommLayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/SSHLayer.h | 2 +- .../header/{ => pcapPlusPlus}/SSLCommon.h | 0 .../header/{ => pcapPlusPlus}/SSLHandshake.h | 6 +- Packet++/header/{ => pcapPlusPlus}/SSLLayer.h | 8 +- Packet++/header/{ => pcapPlusPlus}/SdpLayer.h | 4 +- .../SingleCommandTextProtocol.h | 2 +- Packet++/header/{ => pcapPlusPlus}/SipLayer.h | 2 +- .../header/{ => pcapPlusPlus}/Sll2Layer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/SllLayer.h | 4 +- .../header/{ => pcapPlusPlus}/SmtpLayer.h | 4 +- .../header/{ => pcapPlusPlus}/SomeIpLayer.h | 2 +- .../header/{ => pcapPlusPlus}/SomeIpSdLayer.h | 6 +- Packet++/header/{ => pcapPlusPlus}/StpLayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/TLVData.h | 4 +- Packet++/header/{ => pcapPlusPlus}/TcpLayer.h | 4 +- .../header/{ => pcapPlusPlus}/TcpReassembly.h | 6 +- .../header/{ => pcapPlusPlus}/TelnetLayer.h | 2 +- .../{ => pcapPlusPlus}/TextBasedProtocol.h | 2 +- .../header/{ => pcapPlusPlus}/TpktLayer.h | 4 +- Packet++/header/{ => pcapPlusPlus}/UdpLayer.h | 2 +- .../header/{ => pcapPlusPlus}/VlanLayer.h | 4 +- .../header/{ => pcapPlusPlus}/VrrpLayer.h | 4 +- .../header/{ => pcapPlusPlus}/VxlanLayer.h | 2 +- .../{ => pcapPlusPlus}/WakeOnLanLayer.h | 6 +- Packet++/src/ArpLayer.cpp | 4 +- Packet++/src/Asn1Codec.cpp | 6 +- Packet++/src/BgpLayer.cpp | 6 +- Packet++/src/CotpLayer.cpp | 6 +- Packet++/src/DhcpLayer.cpp | 4 +- Packet++/src/DhcpV6Layer.cpp | 6 +- Packet++/src/DnsLayer.cpp | 6 +- Packet++/src/DnsResource.cpp | 4 +- Packet++/src/DnsResourceData.cpp | 6 +- Packet++/src/EthDot3Layer.cpp | 6 +- Packet++/src/EthLayer.cpp | 18 +-- Packet++/src/FtpLayer.cpp | 2 +- Packet++/src/GreLayer.cpp | 22 +-- Packet++/src/GtpLayer.cpp | 10 +- Packet++/src/HttpLayer.cpp | 6 +- Packet++/src/IPReassembly.cpp | 10 +- Packet++/src/IPSecLayer.cpp | 14 +- Packet++/src/IPv4Layer.cpp | 24 ++-- Packet++/src/IPv6Extensions.cpp | 16 +-- Packet++/src/IPv6Layer.cpp | 20 +-- Packet++/src/IcmpLayer.cpp | 10 +- Packet++/src/IcmpV6Layer.cpp | 12 +- Packet++/src/IgmpLayer.cpp | 6 +- Packet++/src/LLCLayer.cpp | 6 +- Packet++/src/Layer.cpp | 6 +- Packet++/src/LdapLayer.cpp | 4 +- Packet++/src/MplsLayer.cpp | 10 +- Packet++/src/NdpLayer.cpp | 4 +- Packet++/src/NflogLayer.cpp | 10 +- Packet++/src/NtpLayer.cpp | 8 +- Packet++/src/NullLoopbackLayer.cpp | 10 +- Packet++/src/PPPoELayer.cpp | 10 +- Packet++/src/Packet.cpp | 24 ++-- Packet++/src/PacketTrailerLayer.cpp | 4 +- Packet++/src/PacketUtils.cpp | 12 +- Packet++/src/PayloadLayer.cpp | 4 +- Packet++/src/RadiusLayer.cpp | 6 +- Packet++/src/RawPacket.cpp | 6 +- Packet++/src/S7CommLayer.cpp | 4 +- Packet++/src/SSHLayer.cpp | 6 +- Packet++/src/SSLCommon.cpp | 2 +- Packet++/src/SSLHandshake.cpp | 4 +- Packet++/src/SSLLayer.cpp | 4 +- Packet++/src/SdpLayer.cpp | 4 +- Packet++/src/SingleCommandTextProtocol.cpp | 4 +- Packet++/src/SipLayer.cpp | 10 +- Packet++/src/Sll2Layer.cpp | 18 +-- Packet++/src/SllLayer.cpp | 18 +-- Packet++/src/SmtpLayer.cpp | 2 +- Packet++/src/SomeIpLayer.cpp | 8 +- Packet++/src/SomeIpSdLayer.cpp | 2 +- Packet++/src/StpLayer.cpp | 6 +- Packet++/src/TLVData.cpp | 4 +- Packet++/src/TcpLayer.cpp | 38 ++--- Packet++/src/TcpReassembly.cpp | 12 +- Packet++/src/TelnetLayer.cpp | 8 +- Packet++/src/TextBasedProtocol.cpp | 6 +- Packet++/src/TpktLayer.cpp | 8 +- Packet++/src/UdpLayer.cpp | 32 ++--- Packet++/src/VlanLayer.cpp | 16 +-- Packet++/src/VrrpLayer.cpp | 12 +- Packet++/src/VxlanLayer.cpp | 4 +- Packet++/src/WakeOnLanLayer.cpp | 6 +- Pcap++/CMakeLists.txt | 40 +++--- Pcap++/header/{ => pcapplusplus}/Device.h | 6 +- .../header/{ => pcapplusplus}/DeviceUtils.h | 4 +- Pcap++/header/{ => pcapplusplus}/DpdkDevice.h | 0 .../{ => pcapplusplus}/DpdkDeviceList.h | 0 Pcap++/header/{ => pcapplusplus}/KniDevice.h | 0 .../header/{ => pcapplusplus}/KniDeviceList.h | 0 .../LinuxNicInformationSocket.h | 0 .../header/{ => pcapplusplus}/MBufRawPacket.h | 0 .../header/{ => pcapplusplus}/NetworkUtils.h | 0 Pcap++/header/{ => pcapplusplus}/PcapDevice.h | 0 .../{ => pcapplusplus}/PcapFileDevice.h | 0 Pcap++/header/{ => pcapplusplus}/PcapFilter.h | 0 .../{ => pcapplusplus}/PcapLiveDevice.h | 0 .../{ => pcapplusplus}/PcapLiveDeviceList.h | 0 .../{ => pcapplusplus}/PcapRemoteDevice.h | 0 .../{ => pcapplusplus}/PcapRemoteDeviceList.h | 0 Pcap++/header/{ => pcapplusplus}/PcapUtils.h | 0 .../header/{ => pcapplusplus}/PfRingDevice.h | 0 .../{ => pcapplusplus}/PfRingDeviceList.h | 0 .../{ => pcapplusplus}/RawSocketDevice.h | 0 .../{ => pcapplusplus}/WinPcapLiveDevice.h | 0 Pcap++/header/{ => pcapplusplus}/XdpDevice.h | 0 Pcap++/src/DeviceUtils.cpp | 6 +- Pcap++/src/NetworkUtils.cpp | 20 +-- Pcap++/src/PcapDevice.cpp | 10 +- Pcap++/src/PcapFileDevice.cpp | 10 +- Pcap++/src/PcapFilter.cpp | 8 +- Pcap++/src/PcapLiveDevice.cpp | 12 +- Pcap++/src/PcapLiveDeviceList.cpp | 14 +- Pcap++/src/PcapRemoteDevice.cpp | 4 +- Pcap++/src/PcapRemoteDeviceList.cpp | 10 +- Pcap++/src/PcapUtils.cpp | 2 +- Pcap++/src/RawSocketDevice.cpp | 10 +- 199 files changed, 676 insertions(+), 673 deletions(-) rename Common++/header/{ => pcapPlusPlus}/DeprecationUtils.h (100%) rename Common++/header/{ => pcapPlusPlus}/GeneralUtils.h (100%) rename Common++/header/{ => pcapPlusPlus}/IpAddress.h (100%) rename Common++/header/{ => pcapPlusPlus}/IpAddressUtils.h (100%) rename Common++/header/{ => pcapPlusPlus}/IpUtils.h (100%) rename Common++/header/{ => pcapPlusPlus}/LRUList.h (100%) rename Common++/header/{ => pcapPlusPlus}/Logger.h (100%) rename Common++/header/{ => pcapPlusPlus}/MacAddress.h (100%) rename Common++/header/{ => pcapPlusPlus}/OUILookup.h (100%) rename Common++/header/{ => pcapPlusPlus}/PcapPlusPlusVersion.h (100%) rename Common++/header/{ => pcapPlusPlus}/PointerVector.h (100%) rename Common++/header/{ => pcapPlusPlus}/SystemUtils.h (100%) rename Common++/header/{ => pcapPlusPlus}/TablePrinter.h (100%) rename Common++/header/{ => pcapPlusPlus}/TimespecTimeval.h (100%) rename Packet++/header/{ => pcapPlusPlus}/ArpLayer.h (97%) rename Packet++/header/{ => pcapPlusPlus}/Asn1Codec.h (99%) rename Packet++/header/{ => pcapPlusPlus}/BgpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/CotpLayer.h (97%) rename Packet++/header/{ => pcapPlusPlus}/DhcpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/DhcpV6Layer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/DnsLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/DnsLayerEnums.h (100%) rename Packet++/header/{ => pcapPlusPlus}/DnsResource.h (98%) rename Packet++/header/{ => pcapPlusPlus}/DnsResourceData.h (99%) rename Packet++/header/{ => pcapPlusPlus}/EthDot3Layer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/EthLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/FtpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/GreLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/GtpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/HttpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/IPLayer.h (93%) rename Packet++/header/{ => pcapPlusPlus}/IPReassembly.h (99%) rename Packet++/header/{ => pcapPlusPlus}/IPSecLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/IPv4Layer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/IPv6Extensions.h (99%) rename Packet++/header/{ => pcapPlusPlus}/IPv6Layer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/IcmpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/IcmpV6Layer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/IgmpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/LLCLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/Layer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/LdapLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/MplsLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/NdpLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/NflogLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/NtpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/NullLoopbackLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/PPPoELayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/Packet.h (99%) rename Packet++/header/{ => pcapPlusPlus}/PacketTrailerLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/PacketUtils.h (97%) rename Packet++/header/{ => pcapPlusPlus}/PayloadLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/ProtocolType.h (100%) rename Packet++/header/{ => pcapPlusPlus}/RadiusLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/RawPacket.h (100%) rename Packet++/header/{ => pcapPlusPlus}/S7CommLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/SSHLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/SSLCommon.h (100%) rename Packet++/header/{ => pcapPlusPlus}/SSLHandshake.h (99%) rename Packet++/header/{ => pcapPlusPlus}/SSLLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/SdpLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/SingleCommandTextProtocol.h (98%) rename Packet++/header/{ => pcapPlusPlus}/SipLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/Sll2Layer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/SllLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/SmtpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/SomeIpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/SomeIpSdLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/StpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/TLVData.h (99%) rename Packet++/header/{ => pcapPlusPlus}/TcpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/TcpReassembly.h (99%) rename Packet++/header/{ => pcapPlusPlus}/TelnetLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/TextBasedProtocol.h (99%) rename Packet++/header/{ => pcapPlusPlus}/TpktLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/UdpLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/VlanLayer.h (98%) rename Packet++/header/{ => pcapPlusPlus}/VrrpLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/VxlanLayer.h (99%) rename Packet++/header/{ => pcapPlusPlus}/WakeOnLanLayer.h (97%) rename Pcap++/header/{ => pcapplusplus}/Device.h (95%) rename Pcap++/header/{ => pcapplusplus}/DeviceUtils.h (87%) rename Pcap++/header/{ => pcapplusplus}/DpdkDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/DpdkDeviceList.h (100%) rename Pcap++/header/{ => pcapplusplus}/KniDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/KniDeviceList.h (100%) rename Pcap++/header/{ => pcapplusplus}/LinuxNicInformationSocket.h (100%) rename Pcap++/header/{ => pcapplusplus}/MBufRawPacket.h (100%) rename Pcap++/header/{ => pcapplusplus}/NetworkUtils.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapFileDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapFilter.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapLiveDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapLiveDeviceList.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapRemoteDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapRemoteDeviceList.h (100%) rename Pcap++/header/{ => pcapplusplus}/PcapUtils.h (100%) rename Pcap++/header/{ => pcapplusplus}/PfRingDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/PfRingDeviceList.h (100%) rename Pcap++/header/{ => pcapplusplus}/RawSocketDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/WinPcapLiveDevice.h (100%) rename Pcap++/header/{ => pcapplusplus}/XdpDevice.h (100%) diff --git a/Common++/CMakeLists.txt b/Common++/CMakeLists.txt index 46ce5007bb..07ba2d5b38 100644 --- a/Common++/CMakeLists.txt +++ b/Common++/CMakeLists.txt @@ -12,20 +12,20 @@ add_library( src/TablePrinter.cpp) set(public_headers - header/DeprecationUtils.h - header/GeneralUtils.h - header/IpAddress.h - header/IpAddressUtils.h - header/IpUtils.h - header/Logger.h - header/LRUList.h - header/MacAddress.h - header/OUILookup.h - header/PcapPlusPlusVersion.h - header/PointerVector.h - header/SystemUtils.h - header/TablePrinter.h - header/TimespecTimeval.h) + header/pcapplusplus/DeprecationUtils.h + header/pcapplusplus/GeneralUtils.h + header/pcapplusplus/IpAddress.h + header/pcapplusplus/IpAddressUtils.h + header/pcapplusplus/IpUtils.h + header/pcapplusplus/Logger.h + header/pcapplusplus/LRUList.h + header/pcapplusplus/MacAddress.h + header/pcapplusplus/OUILookup.h + header/pcapplusplus/PcapPlusPlusVersion.h + header/pcapplusplus/PointerVector.h + header/pcapplusplus/SystemUtils.h + header/pcapplusplus/TablePrinter.h + header/pcapplusplus/TimespecTimeval.h) # Set the public header that will be installed set_property(TARGET Common++ PROPERTY PUBLIC_HEADER ${public_headers}) diff --git a/Common++/header/DeprecationUtils.h b/Common++/header/pcapPlusPlus/DeprecationUtils.h similarity index 100% rename from Common++/header/DeprecationUtils.h rename to Common++/header/pcapPlusPlus/DeprecationUtils.h diff --git a/Common++/header/GeneralUtils.h b/Common++/header/pcapPlusPlus/GeneralUtils.h similarity index 100% rename from Common++/header/GeneralUtils.h rename to Common++/header/pcapPlusPlus/GeneralUtils.h diff --git a/Common++/header/IpAddress.h b/Common++/header/pcapPlusPlus/IpAddress.h similarity index 100% rename from Common++/header/IpAddress.h rename to Common++/header/pcapPlusPlus/IpAddress.h diff --git a/Common++/header/IpAddressUtils.h b/Common++/header/pcapPlusPlus/IpAddressUtils.h similarity index 100% rename from Common++/header/IpAddressUtils.h rename to Common++/header/pcapPlusPlus/IpAddressUtils.h diff --git a/Common++/header/IpUtils.h b/Common++/header/pcapPlusPlus/IpUtils.h similarity index 100% rename from Common++/header/IpUtils.h rename to Common++/header/pcapPlusPlus/IpUtils.h diff --git a/Common++/header/LRUList.h b/Common++/header/pcapPlusPlus/LRUList.h similarity index 100% rename from Common++/header/LRUList.h rename to Common++/header/pcapPlusPlus/LRUList.h diff --git a/Common++/header/Logger.h b/Common++/header/pcapPlusPlus/Logger.h similarity index 100% rename from Common++/header/Logger.h rename to Common++/header/pcapPlusPlus/Logger.h diff --git a/Common++/header/MacAddress.h b/Common++/header/pcapPlusPlus/MacAddress.h similarity index 100% rename from Common++/header/MacAddress.h rename to Common++/header/pcapPlusPlus/MacAddress.h diff --git a/Common++/header/OUILookup.h b/Common++/header/pcapPlusPlus/OUILookup.h similarity index 100% rename from Common++/header/OUILookup.h rename to Common++/header/pcapPlusPlus/OUILookup.h diff --git a/Common++/header/PcapPlusPlusVersion.h b/Common++/header/pcapPlusPlus/PcapPlusPlusVersion.h similarity index 100% rename from Common++/header/PcapPlusPlusVersion.h rename to Common++/header/pcapPlusPlus/PcapPlusPlusVersion.h diff --git a/Common++/header/PointerVector.h b/Common++/header/pcapPlusPlus/PointerVector.h similarity index 100% rename from Common++/header/PointerVector.h rename to Common++/header/pcapPlusPlus/PointerVector.h diff --git a/Common++/header/SystemUtils.h b/Common++/header/pcapPlusPlus/SystemUtils.h similarity index 100% rename from Common++/header/SystemUtils.h rename to Common++/header/pcapPlusPlus/SystemUtils.h diff --git a/Common++/header/TablePrinter.h b/Common++/header/pcapPlusPlus/TablePrinter.h similarity index 100% rename from Common++/header/TablePrinter.h rename to Common++/header/pcapPlusPlus/TablePrinter.h diff --git a/Common++/header/TimespecTimeval.h b/Common++/header/pcapPlusPlus/TimespecTimeval.h similarity index 100% rename from Common++/header/TimespecTimeval.h rename to Common++/header/pcapPlusPlus/TimespecTimeval.h diff --git a/Common++/src/GeneralUtils.cpp b/Common++/src/GeneralUtils.cpp index 51c6c50c07..ab13770a37 100644 --- a/Common++/src/GeneralUtils.cpp +++ b/Common++/src/GeneralUtils.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE CommonLogModuleGenericUtils -#include "GeneralUtils.h" -#include "Logger.h" +#include "pcapplusplus/GeneralUtils.h" +#include "pcapplusplus/Logger.h" #include #include #include diff --git a/Common++/src/IpAddress.cpp b/Common++/src/IpAddress.cpp index 2c2f439361..1564b20f7e 100644 --- a/Common++/src/IpAddress.cpp +++ b/Common++/src/IpAddress.cpp @@ -7,9 +7,9 @@ #include #include #include -#include "Logger.h" -#include "IpUtils.h" -#include "IpAddress.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IpUtils.h" +#include "pcapplusplus/IpAddress.h" #include "EndianPortable.h" // for AF_INET, AF_INET6 diff --git a/Common++/src/IpAddressUtils.cpp b/Common++/src/IpAddressUtils.cpp index a65941cbf5..f8eeebe58b 100644 --- a/Common++/src/IpAddressUtils.cpp +++ b/Common++/src/IpAddressUtils.cpp @@ -1,7 +1,7 @@ -#include "IpAddressUtils.h" +#include "pcapplusplus/IpAddressUtils.h" -#include "IpAddress.h" -#include "IpUtils.h" // Just needing in_addr and in6_addr. +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/IpUtils.h" // Just needing in_addr and in6_addr. namespace pcpp { diff --git a/Common++/src/IpUtils.cpp b/Common++/src/IpUtils.cpp index bd8d8d7ad5..147e68e5ef 100644 --- a/Common++/src/IpUtils.cpp +++ b/Common++/src/IpUtils.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE CommonLogModuleIpUtils -#include "IpUtils.h" -#include "Logger.h" +#include "pcapplusplus/IpUtils.h" +#include "pcapplusplus/Logger.h" #include #include #include diff --git a/Common++/src/Logger.cpp b/Common++/src/Logger.cpp index 7608911b6b..aa9846a21c 100644 --- a/Common++/src/Logger.cpp +++ b/Common++/src/Logger.cpp @@ -1,5 +1,5 @@ #include -#include "Logger.h" +#include "pcapplusplus/Logger.h" namespace pcpp { diff --git a/Common++/src/MacAddress.cpp b/Common++/src/MacAddress.cpp index f9fcc9bcc1..55ea3ee822 100644 --- a/Common++/src/MacAddress.cpp +++ b/Common++/src/MacAddress.cpp @@ -1,6 +1,6 @@ #include -#include "MacAddress.h" +#include "pcapplusplus/MacAddress.h" namespace pcpp { diff --git a/Common++/src/OUILookup.cpp b/Common++/src/OUILookup.cpp index d116ee8388..2280134135 100644 --- a/Common++/src/OUILookup.cpp +++ b/Common++/src/OUILookup.cpp @@ -1,7 +1,7 @@ -#include "OUILookup.h" -#include "Logger.h" +#include "pcapplusplus/OUILookup.h" +#include "pcapplusplus/Logger.h" -#include "json.hpp" +#include #include diff --git a/Common++/src/PcapPlusPlusVersion.cpp b/Common++/src/PcapPlusPlusVersion.cpp index 16f0ca3b95..11e435dd32 100644 --- a/Common++/src/PcapPlusPlusVersion.cpp +++ b/Common++/src/PcapPlusPlusVersion.cpp @@ -1,4 +1,4 @@ -#include "PcapPlusPlusVersion.h" +#include "pcapplusplus/PcapPlusPlusVersion.h" namespace pcpp { diff --git a/Common++/src/SystemUtils.cpp b/Common++/src/SystemUtils.cpp index 702d8b801a..017454e9c4 100644 --- a/Common++/src/SystemUtils.cpp +++ b/Common++/src/SystemUtils.cpp @@ -1,4 +1,4 @@ -#include "SystemUtils.h" +#include "pcapplusplus/SystemUtils.h" #include "EndianPortable.h" #ifndef _MSC_VER diff --git a/Common++/src/TablePrinter.cpp b/Common++/src/TablePrinter.cpp index 8c424cd000..355f97eade 100644 --- a/Common++/src/TablePrinter.cpp +++ b/Common++/src/TablePrinter.cpp @@ -6,8 +6,8 @@ #include #include #include -#include "TablePrinter.h" -#include "Logger.h" +#include "pcapplusplus/TablePrinter.h" +#include "pcapplusplus/Logger.h" namespace pcpp { diff --git a/Examples/ArpSpoofing/main.cpp b/Examples/ArpSpoofing/main.cpp index d25e1a6eb3..31face0a62 100644 --- a/Examples/ArpSpoofing/main.cpp +++ b/Examples/ArpSpoofing/main.cpp @@ -3,15 +3,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #define EXIT_WITH_ERROR(reason) \ diff --git a/Examples/Arping/main.cpp b/Examples/Arping/main.cpp index 919e3d42f0..ec19d5393c 100644 --- a/Examples/Arping/main.cpp +++ b/Examples/Arping/main.cpp @@ -7,15 +7,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include #define EXIT_WITH_ERROR(reason) \ do \ diff --git a/Examples/DNSResolver/main.cpp b/Examples/DNSResolver/main.cpp index f29f1e894d..805f834fce 100644 --- a/Examples/DNSResolver/main.cpp +++ b/Examples/DNSResolver/main.cpp @@ -1,11 +1,11 @@ #include #include -#include "PcapPlusPlusVersion.h" -#include "PcapLiveDevice.h" -#include "PcapLiveDeviceList.h" -#include "NetworkUtils.h" -#include "SystemUtils.h" -#include "Logger.h" +#include +#include +#include +#include +#include +#include #include #define EXIT_WITH_ERROR(reason) \ diff --git a/Examples/DnsSpoofing/main.cpp b/Examples/DnsSpoofing/main.cpp index 3e03c6833a..29ff606dd2 100644 --- a/Examples/DnsSpoofing/main.cpp +++ b/Examples/DnsSpoofing/main.cpp @@ -16,21 +16,21 @@ #if !defined(_WIN32) # include #endif -#include "IpAddress.h" -#include "RawPacket.h" -#include "ProtocolType.h" -#include "Packet.h" -#include "EthLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "UdpLayer.h" -#include "DnsLayer.h" -#include "PcapFilter.h" -#include "PcapLiveDevice.h" -#include "PcapLiveDeviceList.h" -#include "TablePrinter.h" -#include "SystemUtils.h" -#include "PcapPlusPlusVersion.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define EXIT_WITH_ERROR(reason) \ diff --git a/Examples/DpdkBridge/main.cpp b/Examples/DpdkBridge/main.cpp index ffebb0f48f..2eb3463710 100644 --- a/Examples/DpdkBridge/main.cpp +++ b/Examples/DpdkBridge/main.cpp @@ -23,13 +23,13 @@ #include "Common.h" #include "AppWorkerThread.h" -#include "DpdkDeviceList.h" -#include "IPv4Layer.h" -#include "TcpLayer.h" -#include "UdpLayer.h" -#include "SystemUtils.h" -#include "PcapPlusPlusVersion.h" -#include "TablePrinter.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/Examples/DpdkExample-FilterTraffic/main.cpp b/Examples/DpdkExample-FilterTraffic/main.cpp index fceda082b9..0aa27ff335 100644 --- a/Examples/DpdkExample-FilterTraffic/main.cpp +++ b/Examples/DpdkExample-FilterTraffic/main.cpp @@ -24,12 +24,12 @@ #include "PacketMatchingEngine.h" #include "AppWorkerThread.h" -#include "DpdkDeviceList.h" -#include "TcpLayer.h" -#include "UdpLayer.h" -#include "SystemUtils.h" -#include "PcapPlusPlusVersion.h" -#include "TablePrinter.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/Examples/ExampleApp/main.cpp b/Examples/ExampleApp/main.cpp index 89f3bdf6d2..8cd6299a4f 100644 --- a/Examples/ExampleApp/main.cpp +++ b/Examples/ExampleApp/main.cpp @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include int main(int argc, char* argv[]) { diff --git a/Examples/HttpAnalyzer/main.cpp b/Examples/HttpAnalyzer/main.cpp index b1f6803177..266516668e 100644 --- a/Examples/HttpAnalyzer/main.cpp +++ b/Examples/HttpAnalyzer/main.cpp @@ -21,17 +21,18 @@ #include #include #include -#include "PcapLiveDeviceList.h" -#include "PcapFilter.h" -#include "PcapFileDevice.h" -#include "HttpStatsCollector.h" -#include "TablePrinter.h" -#include "SystemUtils.h" -#include "PcapPlusPlusVersion.h" +#include +#include +#include +#include +#include +#include #include #include #include +#include "HttpStatsCollector.h" + #define EXIT_WITH_ERROR(reason) \ do \ { \ diff --git a/Examples/IPDefragUtil/main.cpp b/Examples/IPDefragUtil/main.cpp index 394e87ddaf..659e1891a1 100644 --- a/Examples/IPDefragUtil/main.cpp +++ b/Examples/IPDefragUtil/main.cpp @@ -3,13 +3,13 @@ #include #include #include -#include "PcapPlusPlusVersion.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "IPReassembly.h" -#include "PcapFileDevice.h" -#include "SystemUtils.h" -#include "getopt.h" +#include +#include +#include +#include +#include +#include +#include #define EXIT_WITH_ERROR(reason) \ do \ diff --git a/Examples/IcmpFileTransfer/Common.cpp b/Examples/IcmpFileTransfer/Common.cpp index 80f080ce1d..75c9b502e8 100644 --- a/Examples/IcmpFileTransfer/Common.cpp +++ b/Examples/IcmpFileTransfer/Common.cpp @@ -3,12 +3,12 @@ #include #include #include -#include "EthLayer.h" -#include "IPv4Layer.h" -#include "IcmpLayer.h" -#include "PcapLiveDeviceList.h" -#include "SystemUtils.h" -#include "PcapPlusPlusVersion.h" +#include +#include +#include +#include +#include +#include #if defined(_WIN32) # define SEPARATOR '\\' diff --git a/Packet++/CMakeLists.txt b/Packet++/CMakeLists.txt index d493e01885..f154da73f4 100644 --- a/Packet++/CMakeLists.txt +++ b/Packet++/CMakeLists.txt @@ -68,72 +68,72 @@ add_library( ) set(public_headers - header/ArpLayer.h - header/Asn1Codec.h - header/BgpLayer.h - header/CotpLayer.h - header/DhcpLayer.h - header/DhcpV6Layer.h - header/DnsLayerEnums.h - header/DnsLayer.h - header/DnsResourceData.h - header/DnsResource.h - header/EthDot3Layer.h - header/EthLayer.h - header/FtpLayer.h - header/GreLayer.h - header/GtpLayer.h - header/HttpLayer.h - header/IcmpLayer.h - header/IcmpV6Layer.h - header/IgmpLayer.h - header/IPLayer.h - header/IPReassembly.h - header/IPSecLayer.h - header/IPv4Layer.h - header/IPv6Extensions.h - header/IPv6Layer.h - header/Layer.h - header/LdapLayer.h - header/LLCLayer.h - header/MplsLayer.h - header/NullLoopbackLayer.h - header/NdpLayer.h - header/NflogLayer.h - header/NtpLayer.h - header/Packet.h - header/PacketTrailerLayer.h - header/PacketUtils.h - header/PayloadLayer.h - header/PPPoELayer.h - header/ProtocolType.h - header/RadiusLayer.h - header/RawPacket.h - header/S7CommLayer.h - header/SdpLayer.h - header/SingleCommandTextProtocol.h - header/SipLayer.h - header/SllLayer.h - header/Sll2Layer.h - header/SmtpLayer.h - header/SomeIpLayer.h - header/SomeIpSdLayer.h - header/SSHLayer.h - header/SSLCommon.h - header/SSLHandshake.h - header/SSLLayer.h - header/StpLayer.h - header/TcpLayer.h - header/TcpReassembly.h - header/TelnetLayer.h - header/TextBasedProtocol.h - header/TLVData.h - header/TpktLayer.h - header/UdpLayer.h - header/VlanLayer.h - header/VrrpLayer.h - header/VxlanLayer.h - header/WakeOnLanLayer.h) + header/pcapplusplus/ArpLayer.h + header/pcapplusplus/Asn1Codec.h + header/pcapplusplus/BgpLayer.h + header/pcapplusplus/CotpLayer.h + header/pcapplusplus/DhcpLayer.h + header/pcapplusplus/DhcpV6Layer.h + header/pcapplusplus/DnsLayerEnums.h + header/pcapplusplus/DnsLayer.h + header/pcapplusplus/DnsResourceData.h + header/pcapplusplus/DnsResource.h + header/pcapplusplus/EthDot3Layer.h + header/pcapplusplus/EthLayer.h + header/pcapplusplus/FtpLayer.h + header/pcapplusplus/GreLayer.h + header/pcapplusplus/GtpLayer.h + header/pcapplusplus/HttpLayer.h + header/pcapplusplus/IcmpLayer.h + header/pcapplusplus/IcmpV6Layer.h + header/pcapplusplus/IgmpLayer.h + header/pcapplusplus/IPLayer.h + header/pcapplusplus/IPReassembly.h + header/pcapplusplus/IPSecLayer.h + header/pcapplusplus/IPv4Layer.h + header/pcapplusplus/IPv6Extensions.h + header/pcapplusplus/IPv6Layer.h + header/pcapplusplus/Layer.h + header/pcapplusplus/LdapLayer.h + header/pcapplusplus/LLCLayer.h + header/pcapplusplus/MplsLayer.h + header/pcapplusplus/NullLoopbackLayer.h + header/pcapplusplus/NdpLayer.h + header/pcapplusplus/NflogLayer.h + header/pcapplusplus/NtpLayer.h + header/pcapplusplus/Packet.h + header/pcapplusplus/PacketTrailerLayer.h + header/pcapplusplus/PacketUtils.h + header/pcapplusplus/PayloadLayer.h + header/pcapplusplus/PPPoELayer.h + header/pcapplusplus/ProtocolType.h + header/pcapplusplus/RadiusLayer.h + header/pcapplusplus/RawPacket.h + header/pcapplusplus/S7CommLayer.h + header/pcapplusplus/SdpLayer.h + header/pcapplusplus/SingleCommandTextProtocol.h + header/pcapplusplus/SipLayer.h + header/pcapplusplus/SllLayer.h + header/pcapplusplus/Sll2Layer.h + header/pcapplusplus/SmtpLayer.h + header/pcapplusplus/SomeIpLayer.h + header/pcapplusplus/SomeIpSdLayer.h + header/pcapplusplus/SSHLayer.h + header/pcapplusplus/SSLCommon.h + header/pcapplusplus/SSLHandshake.h + header/pcapplusplus/SSLLayer.h + header/pcapplusplus/StpLayer.h + header/pcapplusplus/TcpLayer.h + header/pcapplusplus/TcpReassembly.h + header/pcapplusplus/TelnetLayer.h + header/pcapplusplus/TextBasedProtocol.h + header/pcapplusplus/TLVData.h + header/pcapplusplus/TpktLayer.h + header/pcapplusplus/UdpLayer.h + header/pcapplusplus/VlanLayer.h + header/pcapplusplus/VrrpLayer.h + header/pcapplusplus/VxlanLayer.h + header/pcapplusplus/WakeOnLanLayer.h) # Don't use set_target_properties CMake limit to 50 elements set_property(TARGET Packet++ PROPERTY PUBLIC_HEADER ${public_headers}) diff --git a/Packet++/header/ArpLayer.h b/Packet++/header/pcapPlusPlus/ArpLayer.h similarity index 97% rename from Packet++/header/ArpLayer.h rename to Packet++/header/pcapPlusPlus/ArpLayer.h index a42db6270c..5634d0196c 100644 --- a/Packet++/header/ArpLayer.h +++ b/Packet++/header/pcapPlusPlus/ArpLayer.h @@ -1,8 +1,8 @@ #pragma once -#include "Layer.h" -#include "IpAddress.h" -#include "MacAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/MacAddress.h" /// @file diff --git a/Packet++/header/Asn1Codec.h b/Packet++/header/pcapPlusPlus/Asn1Codec.h similarity index 99% rename from Packet++/header/Asn1Codec.h rename to Packet++/header/pcapPlusPlus/Asn1Codec.h index 7b5bffef97..de7796739f 100644 --- a/Packet++/header/Asn1Codec.h +++ b/Packet++/header/pcapPlusPlus/Asn1Codec.h @@ -4,7 +4,7 @@ #include #include #include -#include "PointerVector.h" +#include "pcapplusplus/PointerVector.h" /// @file diff --git a/Packet++/header/BgpLayer.h b/Packet++/header/pcapPlusPlus/BgpLayer.h similarity index 99% rename from Packet++/header/BgpLayer.h rename to Packet++/header/pcapPlusPlus/BgpLayer.h index 979af7469a..b1e0e42a75 100644 --- a/Packet++/header/BgpLayer.h +++ b/Packet++/header/pcapPlusPlus/BgpLayer.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Layer.h" -#include "IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IpAddress.h" /** * @file diff --git a/Packet++/header/CotpLayer.h b/Packet++/header/pcapPlusPlus/CotpLayer.h similarity index 97% rename from Packet++/header/CotpLayer.h rename to Packet++/header/pcapPlusPlus/CotpLayer.h index 5412a2c312..810f7ec629 100644 --- a/Packet++/header/CotpLayer.h +++ b/Packet++/header/pcapPlusPlus/CotpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "EthLayer.h" -#include "Layer.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/Layer.h" namespace pcpp { diff --git a/Packet++/header/DhcpLayer.h b/Packet++/header/pcapPlusPlus/DhcpLayer.h similarity index 99% rename from Packet++/header/DhcpLayer.h rename to Packet++/header/pcapPlusPlus/DhcpLayer.h index 435becbdbc..98601f745a 100644 --- a/Packet++/header/DhcpLayer.h +++ b/Packet++/header/pcapPlusPlus/DhcpLayer.h @@ -1,9 +1,9 @@ #pragma once -#include "Layer.h" -#include "TLVData.h" -#include "IpAddress.h" -#include "MacAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/TLVData.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/MacAddress.h" #include /// @file diff --git a/Packet++/header/DhcpV6Layer.h b/Packet++/header/pcapPlusPlus/DhcpV6Layer.h similarity index 99% rename from Packet++/header/DhcpV6Layer.h rename to Packet++/header/pcapPlusPlus/DhcpV6Layer.h index 57e0edb5fc..7b2563b863 100644 --- a/Packet++/header/DhcpV6Layer.h +++ b/Packet++/header/pcapPlusPlus/DhcpV6Layer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "TLVData.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/TLVData.h" /// @file diff --git a/Packet++/header/DnsLayer.h b/Packet++/header/pcapPlusPlus/DnsLayer.h similarity index 99% rename from Packet++/header/DnsLayer.h rename to Packet++/header/pcapPlusPlus/DnsLayer.h index 06819a791a..1b5b28249e 100644 --- a/Packet++/header/DnsLayer.h +++ b/Packet++/header/pcapPlusPlus/DnsLayer.h @@ -1,9 +1,9 @@ #pragma once -#include "DnsLayerEnums.h" -#include "DnsResource.h" -#include "DnsResourceData.h" -#include "Layer.h" +#include "pcapplusplus/DnsLayerEnums.h" +#include "pcapplusplus/DnsResource.h" +#include "pcapplusplus/DnsResourceData.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/DnsLayerEnums.h b/Packet++/header/pcapPlusPlus/DnsLayerEnums.h similarity index 100% rename from Packet++/header/DnsLayerEnums.h rename to Packet++/header/pcapPlusPlus/DnsLayerEnums.h diff --git a/Packet++/header/DnsResource.h b/Packet++/header/pcapPlusPlus/DnsResource.h similarity index 98% rename from Packet++/header/DnsResource.h rename to Packet++/header/pcapPlusPlus/DnsResource.h index af34fe621f..6c37fabddd 100644 --- a/Packet++/header/DnsResource.h +++ b/Packet++/header/pcapPlusPlus/DnsResource.h @@ -1,8 +1,8 @@ #pragma once -#include "DnsLayer.h" -#include "DnsLayerEnums.h" -#include "DnsResourceData.h" +#include "pcapplusplus/DnsLayer.h" +#include "pcapplusplus/DnsLayerEnums.h" +#include "pcapplusplus/DnsResourceData.h" #include #include #include diff --git a/Packet++/header/DnsResourceData.h b/Packet++/header/pcapPlusPlus/DnsResourceData.h similarity index 99% rename from Packet++/header/DnsResourceData.h rename to Packet++/header/pcapPlusPlus/DnsResourceData.h index 990990a29b..f4a8b96e6a 100644 --- a/Packet++/header/DnsResourceData.h +++ b/Packet++/header/pcapPlusPlus/DnsResourceData.h @@ -1,7 +1,7 @@ #pragma once -#include "DnsResource.h" -#include "IpAddress.h" +#include "pcapplusplus/DnsResource.h" +#include "pcapplusplus/IpAddress.h" #include #include #include diff --git a/Packet++/header/EthDot3Layer.h b/Packet++/header/pcapPlusPlus/EthDot3Layer.h similarity index 98% rename from Packet++/header/EthDot3Layer.h rename to Packet++/header/pcapPlusPlus/EthDot3Layer.h index 44a987accc..59b4ade1a7 100644 --- a/Packet++/header/EthDot3Layer.h +++ b/Packet++/header/pcapPlusPlus/EthDot3Layer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "MacAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/MacAddress.h" /// @file diff --git a/Packet++/header/EthLayer.h b/Packet++/header/pcapPlusPlus/EthLayer.h similarity index 98% rename from Packet++/header/EthLayer.h rename to Packet++/header/pcapPlusPlus/EthLayer.h index 0192a5e44e..a3d6073a6a 100644 --- a/Packet++/header/EthLayer.h +++ b/Packet++/header/pcapPlusPlus/EthLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "MacAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/MacAddress.h" /// @file diff --git a/Packet++/header/FtpLayer.h b/Packet++/header/pcapPlusPlus/FtpLayer.h similarity index 99% rename from Packet++/header/FtpLayer.h rename to Packet++/header/pcapPlusPlus/FtpLayer.h index fc5863861f..599f327b2c 100644 --- a/Packet++/header/FtpLayer.h +++ b/Packet++/header/pcapPlusPlus/FtpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "SingleCommandTextProtocol.h" -#include "PayloadLayer.h" +#include "pcapplusplus/SingleCommandTextProtocol.h" +#include "pcapplusplus/PayloadLayer.h" /// @file diff --git a/Packet++/header/GreLayer.h b/Packet++/header/pcapPlusPlus/GreLayer.h similarity index 99% rename from Packet++/header/GreLayer.h rename to Packet++/header/pcapPlusPlus/GreLayer.h index d6793cba3d..5ec057f418 100644 --- a/Packet++/header/GreLayer.h +++ b/Packet++/header/pcapPlusPlus/GreLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/GtpLayer.h b/Packet++/header/pcapPlusPlus/GtpLayer.h similarity index 99% rename from Packet++/header/GtpLayer.h rename to Packet++/header/pcapPlusPlus/GtpLayer.h index a860f1ecf4..019fde1079 100644 --- a/Packet++/header/GtpLayer.h +++ b/Packet++/header/pcapPlusPlus/GtpLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/HttpLayer.h b/Packet++/header/pcapPlusPlus/HttpLayer.h similarity index 99% rename from Packet++/header/HttpLayer.h rename to Packet++/header/pcapPlusPlus/HttpLayer.h index 3716c7b598..a9e5f61018 100644 --- a/Packet++/header/HttpLayer.h +++ b/Packet++/header/pcapPlusPlus/HttpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "DeprecationUtils.h" -#include "TextBasedProtocol.h" +#include "pcapplusplus/DeprecationUtils.h" +#include "pcapplusplus/TextBasedProtocol.h" #include #include diff --git a/Packet++/header/IPLayer.h b/Packet++/header/pcapPlusPlus/IPLayer.h similarity index 93% rename from Packet++/header/IPLayer.h rename to Packet++/header/pcapPlusPlus/IPLayer.h index b65f4217a7..67f18b84b6 100644 --- a/Packet++/header/IPLayer.h +++ b/Packet++/header/pcapPlusPlus/IPLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "IpAddress.h" -#include "Layer.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/IPReassembly.h b/Packet++/header/pcapPlusPlus/IPReassembly.h similarity index 99% rename from Packet++/header/IPReassembly.h rename to Packet++/header/pcapPlusPlus/IPReassembly.h index cf16724f3e..8e031cd2a7 100644 --- a/Packet++/header/IPReassembly.h +++ b/Packet++/header/pcapPlusPlus/IPReassembly.h @@ -1,9 +1,9 @@ #pragma once -#include "Packet.h" -#include "LRUList.h" -#include "IpAddress.h" -#include "PointerVector.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/LRUList.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/PointerVector.h" #include /** diff --git a/Packet++/header/IPSecLayer.h b/Packet++/header/pcapPlusPlus/IPSecLayer.h similarity index 99% rename from Packet++/header/IPSecLayer.h rename to Packet++/header/pcapPlusPlus/IPSecLayer.h index 5ba64819e2..d5945770fa 100644 --- a/Packet++/header/IPSecLayer.h +++ b/Packet++/header/pcapPlusPlus/IPSecLayer.h @@ -2,7 +2,7 @@ /// @file -#include "Layer.h" +#include "pcapplusplus/Layer.h" /** * \namespace pcpp diff --git a/Packet++/header/IPv4Layer.h b/Packet++/header/pcapPlusPlus/IPv4Layer.h similarity index 99% rename from Packet++/header/IPv4Layer.h rename to Packet++/header/pcapPlusPlus/IPv4Layer.h index d88133fd39..b0aafba34f 100644 --- a/Packet++/header/IPv4Layer.h +++ b/Packet++/header/pcapPlusPlus/IPv4Layer.h @@ -1,9 +1,9 @@ #pragma once -#include "Layer.h" -#include "TLVData.h" -#include "IpAddress.h" -#include "IPLayer.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/TLVData.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/IPLayer.h" #include #include diff --git a/Packet++/header/IPv6Extensions.h b/Packet++/header/pcapPlusPlus/IPv6Extensions.h similarity index 99% rename from Packet++/header/IPv6Extensions.h rename to Packet++/header/pcapPlusPlus/IPv6Extensions.h index 92bd16740f..2979306752 100644 --- a/Packet++/header/IPv6Extensions.h +++ b/Packet++/header/pcapPlusPlus/IPv6Extensions.h @@ -1,9 +1,9 @@ #pragma once #include -#include "IpAddress.h" -#include "Layer.h" -#include "TLVData.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/TLVData.h" /// @file diff --git a/Packet++/header/IPv6Layer.h b/Packet++/header/pcapPlusPlus/IPv6Layer.h similarity index 98% rename from Packet++/header/IPv6Layer.h rename to Packet++/header/pcapPlusPlus/IPv6Layer.h index d3c2096e23..b2fb8080ab 100644 --- a/Packet++/header/IPv6Layer.h +++ b/Packet++/header/pcapPlusPlus/IPv6Layer.h @@ -1,9 +1,9 @@ #pragma once -#include "Layer.h" -#include "IPLayer.h" -#include "IPv6Extensions.h" -#include "IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IPLayer.h" +#include "pcapplusplus/IPv6Extensions.h" +#include "pcapplusplus/IpAddress.h" /// @file diff --git a/Packet++/header/IcmpLayer.h b/Packet++/header/pcapPlusPlus/IcmpLayer.h similarity index 99% rename from Packet++/header/IcmpLayer.h rename to Packet++/header/pcapPlusPlus/IcmpLayer.h index 18c8b85068..7bed759d6b 100644 --- a/Packet++/header/IcmpLayer.h +++ b/Packet++/header/pcapPlusPlus/IcmpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "IPv4Layer.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IPv4Layer.h" #ifdef _MSC_VER # include #else diff --git a/Packet++/header/IcmpV6Layer.h b/Packet++/header/pcapPlusPlus/IcmpV6Layer.h similarity index 99% rename from Packet++/header/IcmpV6Layer.h rename to Packet++/header/pcapPlusPlus/IcmpV6Layer.h index 3ea4843355..ffa8d6416c 100644 --- a/Packet++/header/IcmpV6Layer.h +++ b/Packet++/header/pcapPlusPlus/IcmpV6Layer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/IgmpLayer.h b/Packet++/header/pcapPlusPlus/IgmpLayer.h similarity index 99% rename from Packet++/header/IgmpLayer.h rename to Packet++/header/pcapPlusPlus/IgmpLayer.h index c16ecfee18..20f7c7bf52 100644 --- a/Packet++/header/IgmpLayer.h +++ b/Packet++/header/pcapPlusPlus/IgmpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IpAddress.h" #include /// @file diff --git a/Packet++/header/LLCLayer.h b/Packet++/header/pcapPlusPlus/LLCLayer.h similarity index 98% rename from Packet++/header/LLCLayer.h rename to Packet++/header/pcapPlusPlus/LLCLayer.h index 71f1815533..c758e4402c 100644 --- a/Packet++/header/LLCLayer.h +++ b/Packet++/header/pcapPlusPlus/LLCLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/Layer.h b/Packet++/header/pcapPlusPlus/Layer.h similarity index 99% rename from Packet++/header/Layer.h rename to Packet++/header/pcapPlusPlus/Layer.h index 53c49f83d1..a599613a75 100644 --- a/Packet++/header/Layer.h +++ b/Packet++/header/pcapPlusPlus/Layer.h @@ -2,7 +2,7 @@ #include #include -#include "ProtocolType.h" +#include "pcapplusplus/ProtocolType.h" #include /// @file diff --git a/Packet++/header/LdapLayer.h b/Packet++/header/pcapPlusPlus/LdapLayer.h similarity index 99% rename from Packet++/header/LdapLayer.h rename to Packet++/header/pcapPlusPlus/LdapLayer.h index c2d68a26e3..d0541af162 100644 --- a/Packet++/header/LdapLayer.h +++ b/Packet++/header/pcapPlusPlus/LdapLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "Asn1Codec.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/Asn1Codec.h" #include #include #include diff --git a/Packet++/header/MplsLayer.h b/Packet++/header/pcapPlusPlus/MplsLayer.h similarity index 99% rename from Packet++/header/MplsLayer.h rename to Packet++/header/pcapPlusPlus/MplsLayer.h index b5b6fef549..5498d0b3d9 100644 --- a/Packet++/header/MplsLayer.h +++ b/Packet++/header/pcapPlusPlus/MplsLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/NdpLayer.h b/Packet++/header/pcapPlusPlus/NdpLayer.h similarity index 98% rename from Packet++/header/NdpLayer.h rename to Packet++/header/pcapPlusPlus/NdpLayer.h index 518fb54fc1..e05cfbb26c 100644 --- a/Packet++/header/NdpLayer.h +++ b/Packet++/header/pcapPlusPlus/NdpLayer.h @@ -1,10 +1,10 @@ #pragma once -#include "IcmpV6Layer.h" -#include "IpAddress.h" -#include "Layer.h" -#include "MacAddress.h" -#include "TLVData.h" +#include "pcapplusplus/IcmpV6Layer.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/MacAddress.h" +#include "pcapplusplus/TLVData.h" #include diff --git a/Packet++/header/NflogLayer.h b/Packet++/header/pcapPlusPlus/NflogLayer.h similarity index 98% rename from Packet++/header/NflogLayer.h rename to Packet++/header/pcapPlusPlus/NflogLayer.h index b49aaa997a..8c4fbb85c1 100644 --- a/Packet++/header/NflogLayer.h +++ b/Packet++/header/pcapPlusPlus/NflogLayer.h @@ -1,8 +1,8 @@ #pragma once -#include "Layer.h" -#include "TLVData.h" -#include "GeneralUtils.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/TLVData.h" +#include "pcapplusplus/GeneralUtils.h" /// @file diff --git a/Packet++/header/NtpLayer.h b/Packet++/header/pcapPlusPlus/NtpLayer.h similarity index 99% rename from Packet++/header/NtpLayer.h rename to Packet++/header/pcapPlusPlus/NtpLayer.h index 822eca6b3c..b22845a9f9 100644 --- a/Packet++/header/NtpLayer.h +++ b/Packet++/header/pcapPlusPlus/NtpLayer.h @@ -1,8 +1,8 @@ #pragma once -#include "Logger.h" -#include "Layer.h" -#include "IpAddress.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IpAddress.h" /// @file diff --git a/Packet++/header/NullLoopbackLayer.h b/Packet++/header/pcapPlusPlus/NullLoopbackLayer.h similarity index 98% rename from Packet++/header/NullLoopbackLayer.h rename to Packet++/header/pcapPlusPlus/NullLoopbackLayer.h index 624696d648..85b2208dba 100644 --- a/Packet++/header/NullLoopbackLayer.h +++ b/Packet++/header/pcapPlusPlus/NullLoopbackLayer.h @@ -2,7 +2,7 @@ /// @file -#include "Layer.h" +#include "pcapplusplus/Layer.h" namespace pcpp { diff --git a/Packet++/header/PPPoELayer.h b/Packet++/header/pcapPlusPlus/PPPoELayer.h similarity index 99% rename from Packet++/header/PPPoELayer.h rename to Packet++/header/pcapPlusPlus/PPPoELayer.h index 242b165881..ec5a6a6b75 100644 --- a/Packet++/header/PPPoELayer.h +++ b/Packet++/header/pcapPlusPlus/PPPoELayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "TLVData.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/TLVData.h" #include #include diff --git a/Packet++/header/Packet.h b/Packet++/header/pcapPlusPlus/Packet.h similarity index 99% rename from Packet++/header/Packet.h rename to Packet++/header/pcapPlusPlus/Packet.h index fac0a7203b..f1e0830258 100644 --- a/Packet++/header/Packet.h +++ b/Packet++/header/pcapPlusPlus/Packet.h @@ -1,7 +1,7 @@ #pragma once -#include "RawPacket.h" -#include "Layer.h" +#include "pcapplusplus/RawPacket.h" +#include "pcapplusplus/Layer.h" #include /// @file diff --git a/Packet++/header/PacketTrailerLayer.h b/Packet++/header/pcapPlusPlus/PacketTrailerLayer.h similarity index 98% rename from Packet++/header/PacketTrailerLayer.h rename to Packet++/header/pcapPlusPlus/PacketTrailerLayer.h index 14ce071e81..cd5c48f828 100644 --- a/Packet++/header/PacketTrailerLayer.h +++ b/Packet++/header/pcapPlusPlus/PacketTrailerLayer.h @@ -2,7 +2,7 @@ /// @file -#include "Layer.h" +#include "pcapplusplus/Layer.h" namespace pcpp { diff --git a/Packet++/header/PacketUtils.h b/Packet++/header/pcapPlusPlus/PacketUtils.h similarity index 97% rename from Packet++/header/PacketUtils.h rename to Packet++/header/pcapPlusPlus/PacketUtils.h index 1bf04c091a..e5ff52304e 100644 --- a/Packet++/header/PacketUtils.h +++ b/Packet++/header/pcapPlusPlus/PacketUtils.h @@ -1,7 +1,7 @@ #pragma once -#include "Packet.h" -#include "IpAddress.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/IpAddress.h" /// @file diff --git a/Packet++/header/PayloadLayer.h b/Packet++/header/pcapPlusPlus/PayloadLayer.h similarity index 98% rename from Packet++/header/PayloadLayer.h rename to Packet++/header/pcapPlusPlus/PayloadLayer.h index dc07279451..71560023cd 100644 --- a/Packet++/header/PayloadLayer.h +++ b/Packet++/header/pcapPlusPlus/PayloadLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/ProtocolType.h b/Packet++/header/pcapPlusPlus/ProtocolType.h similarity index 100% rename from Packet++/header/ProtocolType.h rename to Packet++/header/pcapPlusPlus/ProtocolType.h diff --git a/Packet++/header/RadiusLayer.h b/Packet++/header/pcapPlusPlus/RadiusLayer.h similarity index 99% rename from Packet++/header/RadiusLayer.h rename to Packet++/header/pcapPlusPlus/RadiusLayer.h index 9405551c21..7317257e9f 100644 --- a/Packet++/header/RadiusLayer.h +++ b/Packet++/header/pcapPlusPlus/RadiusLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "TLVData.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/TLVData.h" /// @file diff --git a/Packet++/header/RawPacket.h b/Packet++/header/pcapPlusPlus/RawPacket.h similarity index 100% rename from Packet++/header/RawPacket.h rename to Packet++/header/pcapPlusPlus/RawPacket.h diff --git a/Packet++/header/S7CommLayer.h b/Packet++/header/pcapPlusPlus/S7CommLayer.h similarity index 98% rename from Packet++/header/S7CommLayer.h rename to Packet++/header/pcapPlusPlus/S7CommLayer.h index 4cc5bc9235..7a6c02a66e 100644 --- a/Packet++/header/S7CommLayer.h +++ b/Packet++/header/pcapPlusPlus/S7CommLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "EthLayer.h" -#include "Layer.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/Layer.h" namespace pcpp { diff --git a/Packet++/header/SSHLayer.h b/Packet++/header/pcapPlusPlus/SSHLayer.h similarity index 99% rename from Packet++/header/SSHLayer.h rename to Packet++/header/pcapPlusPlus/SSHLayer.h index d4e5b14562..0c4a638340 100644 --- a/Packet++/header/SSHLayer.h +++ b/Packet++/header/pcapPlusPlus/SSHLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /** * @file diff --git a/Packet++/header/SSLCommon.h b/Packet++/header/pcapPlusPlus/SSLCommon.h similarity index 100% rename from Packet++/header/SSLCommon.h rename to Packet++/header/pcapPlusPlus/SSLCommon.h diff --git a/Packet++/header/SSLHandshake.h b/Packet++/header/pcapPlusPlus/SSLHandshake.h similarity index 99% rename from Packet++/header/SSLHandshake.h rename to Packet++/header/pcapPlusPlus/SSLHandshake.h index 5f5f97e8bc..e15c83623f 100644 --- a/Packet++/header/SSLHandshake.h +++ b/Packet++/header/pcapPlusPlus/SSLHandshake.h @@ -1,9 +1,9 @@ #pragma once #include -#include "SSLCommon.h" -#include "PointerVector.h" -#include "Asn1Codec.h" +#include "pcapplusplus/SSLCommon.h" +#include "pcapplusplus/PointerVector.h" +#include "pcapplusplus/Asn1Codec.h" /** * @file diff --git a/Packet++/header/SSLLayer.h b/Packet++/header/pcapPlusPlus/SSLLayer.h similarity index 99% rename from Packet++/header/SSLLayer.h rename to Packet++/header/pcapPlusPlus/SSLLayer.h index fb7565f738..ce45e4a6fd 100644 --- a/Packet++/header/SSLLayer.h +++ b/Packet++/header/pcapPlusPlus/SSLLayer.h @@ -1,9 +1,9 @@ #pragma once -#include "PointerVector.h" -#include "Layer.h" -#include "SSLCommon.h" -#include "SSLHandshake.h" +#include "pcapplusplus/PointerVector.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/SSLCommon.h" +#include "pcapplusplus/SSLHandshake.h" /** * @file diff --git a/Packet++/header/SdpLayer.h b/Packet++/header/pcapPlusPlus/SdpLayer.h similarity index 98% rename from Packet++/header/SdpLayer.h rename to Packet++/header/pcapPlusPlus/SdpLayer.h index 067f4d8feb..233f00498a 100644 --- a/Packet++/header/SdpLayer.h +++ b/Packet++/header/pcapPlusPlus/SdpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "IpAddress.h" -#include "TextBasedProtocol.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/TextBasedProtocol.h" #include /// @file diff --git a/Packet++/header/SingleCommandTextProtocol.h b/Packet++/header/pcapPlusPlus/SingleCommandTextProtocol.h similarity index 98% rename from Packet++/header/SingleCommandTextProtocol.h rename to Packet++/header/pcapPlusPlus/SingleCommandTextProtocol.h index cee3343f8f..d53aafac7f 100644 --- a/Packet++/header/SingleCommandTextProtocol.h +++ b/Packet++/header/pcapPlusPlus/SingleCommandTextProtocol.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/SipLayer.h b/Packet++/header/pcapPlusPlus/SipLayer.h similarity index 99% rename from Packet++/header/SipLayer.h rename to Packet++/header/pcapPlusPlus/SipLayer.h index 2562f53ee4..f38f64f890 100644 --- a/Packet++/header/SipLayer.h +++ b/Packet++/header/pcapPlusPlus/SipLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "TextBasedProtocol.h" +#include "pcapplusplus/TextBasedProtocol.h" /// @file diff --git a/Packet++/header/Sll2Layer.h b/Packet++/header/pcapPlusPlus/Sll2Layer.h similarity index 98% rename from Packet++/header/Sll2Layer.h rename to Packet++/header/pcapPlusPlus/Sll2Layer.h index 7b17682654..d717c4141d 100644 --- a/Packet++/header/Sll2Layer.h +++ b/Packet++/header/pcapPlusPlus/Sll2Layer.h @@ -1,7 +1,7 @@ #pragma once -#include "MacAddress.h" -#include "Layer.h" +#include "pcapplusplus/MacAddress.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/SllLayer.h b/Packet++/header/pcapPlusPlus/SllLayer.h similarity index 98% rename from Packet++/header/SllLayer.h rename to Packet++/header/pcapPlusPlus/SllLayer.h index 6c6d19e888..c1b8d8f8f6 100644 --- a/Packet++/header/SllLayer.h +++ b/Packet++/header/pcapPlusPlus/SllLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "MacAddress.h" -#include "Layer.h" +#include "pcapplusplus/MacAddress.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/SmtpLayer.h b/Packet++/header/pcapPlusPlus/SmtpLayer.h similarity index 99% rename from Packet++/header/SmtpLayer.h rename to Packet++/header/pcapPlusPlus/SmtpLayer.h index 2c251b75d1..167221d03b 100644 --- a/Packet++/header/SmtpLayer.h +++ b/Packet++/header/pcapPlusPlus/SmtpLayer.h @@ -1,8 +1,8 @@ #ifndef PACKETPP_SMTP_LAYER #define PACKETPP_SMTP_LAYER -#include "PayloadLayer.h" -#include "SingleCommandTextProtocol.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/SingleCommandTextProtocol.h" /// @file diff --git a/Packet++/header/SomeIpLayer.h b/Packet++/header/pcapPlusPlus/SomeIpLayer.h similarity index 99% rename from Packet++/header/SomeIpLayer.h rename to Packet++/header/pcapPlusPlus/SomeIpLayer.h index 930869843c..6b9f9632c0 100644 --- a/Packet++/header/SomeIpLayer.h +++ b/Packet++/header/pcapPlusPlus/SomeIpLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" #include /// @file diff --git a/Packet++/header/SomeIpSdLayer.h b/Packet++/header/pcapPlusPlus/SomeIpSdLayer.h similarity index 99% rename from Packet++/header/SomeIpSdLayer.h rename to Packet++/header/pcapPlusPlus/SomeIpSdLayer.h index b7c1bd9024..cb46ba777f 100644 --- a/Packet++/header/SomeIpSdLayer.h +++ b/Packet++/header/pcapPlusPlus/SomeIpSdLayer.h @@ -1,8 +1,8 @@ #pragma once -#include "IpAddress.h" -#include "Layer.h" -#include "SomeIpLayer.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/SomeIpLayer.h" #include #include #include diff --git a/Packet++/header/StpLayer.h b/Packet++/header/pcapPlusPlus/StpLayer.h similarity index 99% rename from Packet++/header/StpLayer.h rename to Packet++/header/pcapPlusPlus/StpLayer.h index f59dc39910..6ec7a66ce3 100644 --- a/Packet++/header/StpLayer.h +++ b/Packet++/header/pcapPlusPlus/StpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "MacAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/MacAddress.h" /// @file diff --git a/Packet++/header/TLVData.h b/Packet++/header/pcapPlusPlus/TLVData.h similarity index 99% rename from Packet++/header/TLVData.h rename to Packet++/header/pcapPlusPlus/TLVData.h index 54787915b4..c96ee71ae0 100644 --- a/Packet++/header/TLVData.h +++ b/Packet++/header/pcapPlusPlus/TLVData.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IpAddress.h" #include /// @file diff --git a/Packet++/header/TcpLayer.h b/Packet++/header/pcapPlusPlus/TcpLayer.h similarity index 99% rename from Packet++/header/TcpLayer.h rename to Packet++/header/pcapPlusPlus/TcpLayer.h index fbe762f280..43d4542c44 100644 --- a/Packet++/header/TcpLayer.h +++ b/Packet++/header/pcapPlusPlus/TcpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "DeprecationUtils.h" -#include "Layer.h" +#include "pcapplusplus/DeprecationUtils.h" +#include "pcapplusplus/Layer.h" #include "TLVData.h" #include diff --git a/Packet++/header/TcpReassembly.h b/Packet++/header/pcapPlusPlus/TcpReassembly.h similarity index 99% rename from Packet++/header/TcpReassembly.h rename to Packet++/header/pcapPlusPlus/TcpReassembly.h index 129c2c9690..174b41faf7 100644 --- a/Packet++/header/TcpReassembly.h +++ b/Packet++/header/pcapPlusPlus/TcpReassembly.h @@ -1,8 +1,8 @@ #pragma once -#include "Packet.h" -#include "IpAddress.h" -#include "PointerVector.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/PointerVector.h" #include #include #include diff --git a/Packet++/header/TelnetLayer.h b/Packet++/header/pcapPlusPlus/TelnetLayer.h similarity index 99% rename from Packet++/header/TelnetLayer.h rename to Packet++/header/pcapPlusPlus/TelnetLayer.h index d57125f8f5..241c04f39a 100644 --- a/Packet++/header/TelnetLayer.h +++ b/Packet++/header/pcapPlusPlus/TelnetLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/TextBasedProtocol.h b/Packet++/header/pcapPlusPlus/TextBasedProtocol.h similarity index 99% rename from Packet++/header/TextBasedProtocol.h rename to Packet++/header/pcapPlusPlus/TextBasedProtocol.h index 054f1f3caa..c325fd8315 100644 --- a/Packet++/header/TextBasedProtocol.h +++ b/Packet++/header/pcapPlusPlus/TextBasedProtocol.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/TpktLayer.h b/Packet++/header/pcapPlusPlus/TpktLayer.h similarity index 98% rename from Packet++/header/TpktLayer.h rename to Packet++/header/pcapPlusPlus/TpktLayer.h index 29bcba8aa2..c5d9ca9254 100644 --- a/Packet++/header/TpktLayer.h +++ b/Packet++/header/pcapPlusPlus/TpktLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "EthLayer.h" -#include "Layer.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/UdpLayer.h b/Packet++/header/pcapPlusPlus/UdpLayer.h similarity index 98% rename from Packet++/header/UdpLayer.h rename to Packet++/header/pcapPlusPlus/UdpLayer.h index 44c0f85bce..79639d8205 100644 --- a/Packet++/header/UdpLayer.h +++ b/Packet++/header/pcapPlusPlus/UdpLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/VlanLayer.h b/Packet++/header/pcapPlusPlus/VlanLayer.h similarity index 98% rename from Packet++/header/VlanLayer.h rename to Packet++/header/pcapPlusPlus/VlanLayer.h index a8ff158f59..f7f1bd2fe8 100644 --- a/Packet++/header/VlanLayer.h +++ b/Packet++/header/pcapPlusPlus/VlanLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "EthLayer.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/EthLayer.h" /// @file diff --git a/Packet++/header/VrrpLayer.h b/Packet++/header/pcapPlusPlus/VrrpLayer.h similarity index 99% rename from Packet++/header/VrrpLayer.h rename to Packet++/header/pcapPlusPlus/VrrpLayer.h index d6361521cc..5e9eaeb2fb 100644 --- a/Packet++/header/VrrpLayer.h +++ b/Packet++/header/pcapPlusPlus/VrrpLayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Layer.h" -#include "IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/IpAddress.h" #include /// @file diff --git a/Packet++/header/VxlanLayer.h b/Packet++/header/pcapPlusPlus/VxlanLayer.h similarity index 99% rename from Packet++/header/VxlanLayer.h rename to Packet++/header/pcapPlusPlus/VxlanLayer.h index 87673d18ae..3cf83c1270 100644 --- a/Packet++/header/VxlanLayer.h +++ b/Packet++/header/pcapPlusPlus/VxlanLayer.h @@ -1,6 +1,6 @@ #pragma once -#include "Layer.h" +#include "pcapplusplus/Layer.h" /// @file diff --git a/Packet++/header/WakeOnLanLayer.h b/Packet++/header/pcapPlusPlus/WakeOnLanLayer.h similarity index 97% rename from Packet++/header/WakeOnLanLayer.h rename to Packet++/header/pcapPlusPlus/WakeOnLanLayer.h index 358bbb5a3d..1d23855865 100644 --- a/Packet++/header/WakeOnLanLayer.h +++ b/Packet++/header/pcapPlusPlus/WakeOnLanLayer.h @@ -1,8 +1,8 @@ #pragma once -#include "IpAddress.h" -#include "Layer.h" -#include "MacAddress.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/Layer.h" +#include "pcapplusplus/MacAddress.h" /// @file diff --git a/Packet++/src/ArpLayer.cpp b/Packet++/src/ArpLayer.cpp index 0852d9bb0f..dea0f33136 100644 --- a/Packet++/src/ArpLayer.cpp +++ b/Packet++/src/ArpLayer.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModuleArpLayer -#include "ArpLayer.h" -#include "EthLayer.h" +#include "pcapplusplus/ArpLayer.h" +#include "pcapplusplus/EthLayer.h" #include #include "EndianPortable.h" diff --git a/Packet++/src/Asn1Codec.cpp b/Packet++/src/Asn1Codec.cpp index 5990f70fd0..94aafbce48 100644 --- a/Packet++/src/Asn1Codec.cpp +++ b/Packet++/src/Asn1Codec.cpp @@ -1,9 +1,9 @@ #define LOG_MODULE PacketLogModuleAsn1Codec -#include "Asn1Codec.h" -#include "GeneralUtils.h" +#include "pcapplusplus/Asn1Codec.h" +#include "pcapplusplus/GeneralUtils.h" #include "EndianPortable.h" -#include "GeneralUtils.h" +#include "pcapplusplus/GeneralUtils.h" #include #include #include diff --git a/Packet++/src/BgpLayer.cpp b/Packet++/src/BgpLayer.cpp index e8e48320d7..ab52017e41 100644 --- a/Packet++/src/BgpLayer.cpp +++ b/Packet++/src/BgpLayer.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModuleBgpLayer #include -#include "Logger.h" -#include "BgpLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/BgpLayer.h" #include "EndianPortable.h" -#include "GeneralUtils.h" +#include "pcapplusplus/GeneralUtils.h" namespace pcpp { diff --git a/Packet++/src/CotpLayer.cpp b/Packet++/src/CotpLayer.cpp index f3ea7975db..081fae63dd 100644 --- a/Packet++/src/CotpLayer.cpp +++ b/Packet++/src/CotpLayer.cpp @@ -1,7 +1,7 @@ -#include "../header/CotpLayer.h" +#include "pcapplusplus//CotpLayer.h" #include "EndianPortable.h" -#include "S7CommLayer.h" -#include +#include "pcapplusplus/S7CommLayer.h" +#include "pcapplusplus/PayloadLayer.h" #include #include #include diff --git a/Packet++/src/DhcpLayer.cpp b/Packet++/src/DhcpLayer.cpp index b5f15511fc..01c2abd578 100644 --- a/Packet++/src/DhcpLayer.cpp +++ b/Packet++/src/DhcpLayer.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModuleDhcpLayer -#include "DhcpLayer.h" -#include "Logger.h" +#include "pcapplusplus/DhcpLayer.h" +#include "pcapplusplus/Logger.h" namespace pcpp { diff --git a/Packet++/src/DhcpV6Layer.cpp b/Packet++/src/DhcpV6Layer.cpp index e6a2d2a0e5..44d1314ff9 100644 --- a/Packet++/src/DhcpV6Layer.cpp +++ b/Packet++/src/DhcpV6Layer.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleDhcpV6Layer -#include "DhcpV6Layer.h" -#include "Logger.h" -#include "GeneralUtils.h" +#include "pcapplusplus/DhcpV6Layer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/GeneralUtils.h" #include "EndianPortable.h" namespace pcpp diff --git a/Packet++/src/DnsLayer.cpp b/Packet++/src/DnsLayer.cpp index 6d7ae5ec76..e318370ddb 100644 --- a/Packet++/src/DnsLayer.cpp +++ b/Packet++/src/DnsLayer.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleDnsLayer -#include "DnsLayer.h" -#include "Logger.h" -#include "IpAddress.h" +#include "pcapplusplus/DnsLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IpAddress.h" #include #include #include diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp index 488d207e99..d53dc818d0 100644 --- a/Packet++/src/DnsResource.cpp +++ b/Packet++/src/DnsResource.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModuleDnsLayer -#include "DnsResource.h" -#include "Logger.h" +#include "pcapplusplus/DnsResource.h" +#include "pcapplusplus/Logger.h" #include #include #include "EndianPortable.h" diff --git a/Packet++/src/DnsResourceData.cpp b/Packet++/src/DnsResourceData.cpp index 7516a94a65..a0c093a62c 100644 --- a/Packet++/src/DnsResourceData.cpp +++ b/Packet++/src/DnsResourceData.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleDnsLayer -#include "DnsResourceData.h" -#include "Logger.h" -#include "GeneralUtils.h" +#include "pcapplusplus/DnsResourceData.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/GeneralUtils.h" #include #include #include diff --git a/Packet++/src/EthDot3Layer.cpp b/Packet++/src/EthDot3Layer.cpp index dff65ac12a..087f15af3d 100644 --- a/Packet++/src/EthDot3Layer.cpp +++ b/Packet++/src/EthDot3Layer.cpp @@ -1,7 +1,7 @@ -#include "EthDot3Layer.h" +#include "pcapplusplus/EthDot3Layer.h" #include "EndianPortable.h" -#include "PayloadLayer.h" -#include "LLCLayer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/LLCLayer.h" namespace pcpp { diff --git a/Packet++/src/EthLayer.cpp b/Packet++/src/EthLayer.cpp index fe03e28ad0..f3adb20393 100644 --- a/Packet++/src/EthLayer.cpp +++ b/Packet++/src/EthLayer.cpp @@ -1,14 +1,14 @@ #define LOG_MODULE PacketLogModuleEthLayer -#include "EthLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "ArpLayer.h" -#include "VlanLayer.h" -#include "PPPoELayer.h" -#include "MplsLayer.h" -#include "WakeOnLanLayer.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/ArpLayer.h" +#include "pcapplusplus/VlanLayer.h" +#include "pcapplusplus/PPPoELayer.h" +#include "pcapplusplus/MplsLayer.h" +#include "pcapplusplus/WakeOnLanLayer.h" #include "EndianPortable.h" #include diff --git a/Packet++/src/FtpLayer.cpp b/Packet++/src/FtpLayer.cpp index dba5828da4..47f1175f3c 100644 --- a/Packet++/src/FtpLayer.cpp +++ b/Packet++/src/FtpLayer.cpp @@ -1,6 +1,6 @@ #define LOG_MODULE PacketLogModuleFtpLayer -#include "FtpLayer.h" +#include "pcapplusplus/FtpLayer.h" namespace pcpp { diff --git a/Packet++/src/GreLayer.cpp b/Packet++/src/GreLayer.cpp index da8b5d7170..582fbf8240 100644 --- a/Packet++/src/GreLayer.cpp +++ b/Packet++/src/GreLayer.cpp @@ -1,16 +1,16 @@ #define LOG_MODULE PacketLogModuleGreLayer -#include "GreLayer.h" -#include "EthLayer.h" -#include "EthDot3Layer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PPPoELayer.h" -#include "VlanLayer.h" -#include "MplsLayer.h" -#include "PayloadLayer.h" -#include "PacketUtils.h" -#include "Logger.h" +#include "pcapplusplus/GreLayer.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/EthDot3Layer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PPPoELayer.h" +#include "pcapplusplus/VlanLayer.h" +#include "pcapplusplus/MplsLayer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" #include "EndianPortable.h" // ============== diff --git a/Packet++/src/GtpLayer.cpp b/Packet++/src/GtpLayer.cpp index 30113cd5f4..38b72c4fd5 100644 --- a/Packet++/src/GtpLayer.cpp +++ b/Packet++/src/GtpLayer.cpp @@ -2,11 +2,11 @@ #include #include -#include "Logger.h" -#include "GtpLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/GtpLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" #include "EndianPortable.h" namespace pcpp diff --git a/Packet++/src/HttpLayer.cpp b/Packet++/src/HttpLayer.cpp index 46a37531ad..b3b2f8b6ee 100644 --- a/Packet++/src/HttpLayer.cpp +++ b/Packet++/src/HttpLayer.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleHttpLayer -#include "Logger.h" -#include "GeneralUtils.h" -#include "HttpLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/GeneralUtils.h" +#include "pcapplusplus/HttpLayer.h" #include #include #include diff --git a/Packet++/src/IPReassembly.cpp b/Packet++/src/IPReassembly.cpp index 470bdbf42b..1701bae812 100644 --- a/Packet++/src/IPReassembly.cpp +++ b/Packet++/src/IPReassembly.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModuleIPReassembly -#include "IPReassembly.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PacketUtils.h" -#include "Logger.h" +#include "pcapplusplus/IPReassembly.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" #include #include "EndianPortable.h" diff --git a/Packet++/src/IPSecLayer.cpp b/Packet++/src/IPSecLayer.cpp index 445ddcb54c..b691f7f44e 100644 --- a/Packet++/src/IPSecLayer.cpp +++ b/Packet++/src/IPSecLayer.cpp @@ -1,13 +1,13 @@ #define LOG_MODULE PacketLogModuleIPSecLayer #include "EndianPortable.h" -#include "GeneralUtils.h" -#include "IPSecLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "UdpLayer.h" -#include "TcpLayer.h" -#include "PayloadLayer.h" +#include "pcapplusplus/GeneralUtils.h" +#include "pcapplusplus/IPSecLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/UdpLayer.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/PayloadLayer.h" #include namespace pcpp diff --git a/Packet++/src/IPv4Layer.cpp b/Packet++/src/IPv4Layer.cpp index 7f09c5db5c..3a998feabd 100644 --- a/Packet++/src/IPv4Layer.cpp +++ b/Packet++/src/IPv4Layer.cpp @@ -1,19 +1,19 @@ #define LOG_MODULE PacketLogModuleIPv4Layer -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "UdpLayer.h" -#include "TcpLayer.h" -#include "IcmpLayer.h" -#include "GreLayer.h" -#include "IgmpLayer.h" -#include "IPSecLayer.h" -#include "VrrpLayer.h" -#include "PacketUtils.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/UdpLayer.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/IcmpLayer.h" +#include "pcapplusplus/GreLayer.h" +#include "pcapplusplus/IgmpLayer.h" +#include "pcapplusplus/IPSecLayer.h" +#include "pcapplusplus/VrrpLayer.h" +#include "pcapplusplus/PacketUtils.h" #include #include -#include "Logger.h" #include "EndianPortable.h" namespace pcpp diff --git a/Packet++/src/IPv6Extensions.cpp b/Packet++/src/IPv6Extensions.cpp index 3a1bc08bb9..9951d8d050 100644 --- a/Packet++/src/IPv6Extensions.cpp +++ b/Packet++/src/IPv6Extensions.cpp @@ -2,14 +2,14 @@ #include #include "EndianPortable.h" -#include "Logger.h" -#include "IPv6Extensions.h" -#include "IPv6Layer.h" -#include "IPv4Layer.h" -#include "PayloadLayer.h" -#include "UdpLayer.h" -#include "TcpLayer.h" -#include "GreLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IPv6Extensions.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/UdpLayer.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/GreLayer.h" namespace pcpp { diff --git a/Packet++/src/IPv6Layer.cpp b/Packet++/src/IPv6Layer.cpp index f09e68816b..df8f9e8790 100644 --- a/Packet++/src/IPv6Layer.cpp +++ b/Packet++/src/IPv6Layer.cpp @@ -1,16 +1,16 @@ #define LOG_MODULE PacketLogModuleIPv6Layer #include -#include "IPv6Layer.h" -#include "IPv4Layer.h" -#include "PayloadLayer.h" -#include "UdpLayer.h" -#include "TcpLayer.h" -#include "GreLayer.h" -#include "IPSecLayer.h" -#include "IcmpV6Layer.h" -#include "VrrpLayer.h" -#include "Packet.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/UdpLayer.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/GreLayer.h" +#include "pcapplusplus/IPSecLayer.h" +#include "pcapplusplus/IcmpV6Layer.h" +#include "pcapplusplus/VrrpLayer.h" +#include "pcapplusplus/Packet.h" #include #include "EndianPortable.h" diff --git a/Packet++/src/IcmpLayer.cpp b/Packet++/src/IcmpLayer.cpp index 77370d112a..c11f981d18 100644 --- a/Packet++/src/IcmpLayer.cpp +++ b/Packet++/src/IcmpLayer.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModuleIcmpLayer -#include "IcmpLayer.h" -#include "PayloadLayer.h" -#include "Packet.h" -#include "PacketUtils.h" -#include "Logger.h" +#include "pcapplusplus/IcmpLayer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" #include #include #include "EndianPortable.h" diff --git a/Packet++/src/IcmpV6Layer.cpp b/Packet++/src/IcmpV6Layer.cpp index e118d1295f..22f95a0d55 100644 --- a/Packet++/src/IcmpV6Layer.cpp +++ b/Packet++/src/IcmpV6Layer.cpp @@ -1,12 +1,12 @@ #define LOG_MODULE PacketLogModuleIcmpV6Layer -#include "IcmpV6Layer.h" +#include "pcapplusplus/IcmpV6Layer.h" #include "EndianPortable.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "NdpLayer.h" -#include "PacketUtils.h" -#include "PayloadLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/NdpLayer.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/PayloadLayer.h" #include #include diff --git a/Packet++/src/IgmpLayer.cpp b/Packet++/src/IgmpLayer.cpp index 6f95416b5b..88a48afe0e 100644 --- a/Packet++/src/IgmpLayer.cpp +++ b/Packet++/src/IgmpLayer.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleIgmpLayer -#include "IgmpLayer.h" -#include "PacketUtils.h" -#include "Logger.h" +#include "pcapplusplus/IgmpLayer.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" #include #include "EndianPortable.h" diff --git a/Packet++/src/LLCLayer.cpp b/Packet++/src/LLCLayer.cpp index f0a71c0703..80a2cefc42 100644 --- a/Packet++/src/LLCLayer.cpp +++ b/Packet++/src/LLCLayer.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleLLCLayer -#include "LLCLayer.h" -#include "PayloadLayer.h" -#include "StpLayer.h" +#include "pcapplusplus/LLCLayer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/StpLayer.h" #include namespace pcpp diff --git a/Packet++/src/Layer.cpp b/Packet++/src/Layer.cpp index f51a271eb2..299c5945ab 100644 --- a/Packet++/src/Layer.cpp +++ b/Packet++/src/Layer.cpp @@ -1,9 +1,9 @@ #define LOG_MODULE PacketLogModuleLayer -#include "Layer.h" +#include "pcapplusplus/Layer.h" #include -#include "Logger.h" -#include "Packet.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/Packet.h" namespace pcpp { diff --git a/Packet++/src/LdapLayer.cpp b/Packet++/src/LdapLayer.cpp index c123fc0f2d..fd1edaaf69 100644 --- a/Packet++/src/LdapLayer.cpp +++ b/Packet++/src/LdapLayer.cpp @@ -1,5 +1,5 @@ -#include "LdapLayer.h" -#include "GeneralUtils.h" +#include "pcapplusplus/LdapLayer.h" +#include "pcapplusplus/GeneralUtils.h" #include namespace pcpp diff --git a/Packet++/src/MplsLayer.cpp b/Packet++/src/MplsLayer.cpp index 184222dc91..26d433fac2 100644 --- a/Packet++/src/MplsLayer.cpp +++ b/Packet++/src/MplsLayer.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModuleMplsLayer -#include "MplsLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "Logger.h" +#include "pcapplusplus/MplsLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/Logger.h" #include #include #include "EndianPortable.h" diff --git a/Packet++/src/NdpLayer.cpp b/Packet++/src/NdpLayer.cpp index c0448938a5..a519dc65ad 100644 --- a/Packet++/src/NdpLayer.cpp +++ b/Packet++/src/NdpLayer.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModuleNdpLayer -#include "NdpLayer.h" -#include "Logger.h" +#include "pcapplusplus/NdpLayer.h" +#include "pcapplusplus/Logger.h" namespace pcpp { diff --git a/Packet++/src/NflogLayer.cpp b/Packet++/src/NflogLayer.cpp index 305a56a3d1..ed53f664b2 100644 --- a/Packet++/src/NflogLayer.cpp +++ b/Packet++/src/NflogLayer.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModuleNflogLayer -#include "NflogLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "GeneralUtils.h" +#include "pcapplusplus/NflogLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/GeneralUtils.h" #include "EndianPortable.h" #include diff --git a/Packet++/src/NtpLayer.cpp b/Packet++/src/NtpLayer.cpp index 6fc1220ee7..bdcd518424 100644 --- a/Packet++/src/NtpLayer.cpp +++ b/Packet++/src/NtpLayer.cpp @@ -1,9 +1,9 @@ #define LOG_MODULE PacketLogModuleNtpLayer -#include "Logger.h" -#include "NtpLayer.h" -#include "SystemUtils.h" -#include "GeneralUtils.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/NtpLayer.h" +#include "pcapplusplus/SystemUtils.h" +#include "pcapplusplus/GeneralUtils.h" #include #include diff --git a/Packet++/src/NullLoopbackLayer.cpp b/Packet++/src/NullLoopbackLayer.cpp index 7f67472cce..ed912267e4 100644 --- a/Packet++/src/NullLoopbackLayer.cpp +++ b/Packet++/src/NullLoopbackLayer.cpp @@ -1,8 +1,8 @@ -#include "NullLoopbackLayer.h" -#include "EthLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" +#include "pcapplusplus/NullLoopbackLayer.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" #include namespace pcpp diff --git a/Packet++/src/PPPoELayer.cpp b/Packet++/src/PPPoELayer.cpp index 25b07f4033..e7305b3884 100644 --- a/Packet++/src/PPPoELayer.cpp +++ b/Packet++/src/PPPoELayer.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModulePPPoELayer -#include "PPPoELayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "Logger.h" +#include "pcapplusplus/PPPoELayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/Logger.h" #include #include #include "EndianPortable.h" diff --git a/Packet++/src/Packet.cpp b/Packet++/src/Packet.cpp index 30a2790fa9..6c458bff63 100644 --- a/Packet++/src/Packet.cpp +++ b/Packet++/src/Packet.cpp @@ -1,17 +1,17 @@ #define LOG_MODULE PacketLogModulePacket -#include "Packet.h" -#include "EthLayer.h" -#include "EthDot3Layer.h" -#include "SllLayer.h" -#include "Sll2Layer.h" -#include "NflogLayer.h" -#include "NullLoopbackLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "PacketTrailerLayer.h" -#include "Logger.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/EthDot3Layer.h" +#include "pcapplusplus/SllLayer.h" +#include "pcapplusplus/Sll2Layer.h" +#include "pcapplusplus/NflogLayer.h" +#include "pcapplusplus/NullLoopbackLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/PacketTrailerLayer.h" +#include "pcapplusplus/Logger.h" #include "EndianPortable.h" #include #include diff --git a/Packet++/src/PacketTrailerLayer.cpp b/Packet++/src/PacketTrailerLayer.cpp index f05f381361..a51ca0502e 100644 --- a/Packet++/src/PacketTrailerLayer.cpp +++ b/Packet++/src/PacketTrailerLayer.cpp @@ -1,5 +1,5 @@ -#include "PacketTrailerLayer.h" -#include "GeneralUtils.h" +#include "pcapplusplus/PacketTrailerLayer.h" +#include "pcapplusplus/GeneralUtils.h" #include #include diff --git a/Packet++/src/PacketUtils.cpp b/Packet++/src/PacketUtils.cpp index fda7a9bc40..066774e9fd 100644 --- a/Packet++/src/PacketUtils.cpp +++ b/Packet++/src/PacketUtils.cpp @@ -1,9 +1,9 @@ -#include "PacketUtils.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "TcpLayer.h" -#include "UdpLayer.h" -#include "Logger.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/UdpLayer.h" +#include "pcapplusplus/Logger.h" #include "EndianPortable.h" namespace pcpp diff --git a/Packet++/src/PayloadLayer.cpp b/Packet++/src/PayloadLayer.cpp index b85177ca85..6b557601ac 100644 --- a/Packet++/src/PayloadLayer.cpp +++ b/Packet++/src/PayloadLayer.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModulePayloadLayer -#include "PayloadLayer.h" -#include "GeneralUtils.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/GeneralUtils.h" #include #include diff --git a/Packet++/src/RadiusLayer.cpp b/Packet++/src/RadiusLayer.cpp index d5ad43ec36..5dd3ac2b75 100644 --- a/Packet++/src/RadiusLayer.cpp +++ b/Packet++/src/RadiusLayer.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModuleRadiusLayer -#include "RadiusLayer.h" -#include "Logger.h" -#include "GeneralUtils.h" +#include "pcapplusplus/RadiusLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/GeneralUtils.h" #include #include diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp index 4a42a3c7be..283a6e3e4c 100644 --- a/Packet++/src/RawPacket.cpp +++ b/Packet++/src/RawPacket.cpp @@ -1,9 +1,9 @@ #define LOG_MODULE PacketLogModuleRawPacket -#include "RawPacket.h" +#include "pcapplusplus/RawPacket.h" #include -#include "Logger.h" -#include "TimespecTimeval.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/TimespecTimeval.h" namespace pcpp { diff --git a/Packet++/src/S7CommLayer.cpp b/Packet++/src/S7CommLayer.cpp index 40af5c0b29..283ca20a57 100644 --- a/Packet++/src/S7CommLayer.cpp +++ b/Packet++/src/S7CommLayer.cpp @@ -1,7 +1,7 @@ #include "EndianPortable.h" -#include "S7CommLayer.h" -#include "TcpLayer.h" +#include "pcapplusplus/S7CommLayer.h" +#include "pcapplusplus/TcpLayer.h" #include #include diff --git a/Packet++/src/SSHLayer.cpp b/Packet++/src/SSHLayer.cpp index 2023bc11a5..63f2eeb939 100644 --- a/Packet++/src/SSHLayer.cpp +++ b/Packet++/src/SSHLayer.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleSSHLayer -#include "SSHLayer.h" -#include "GeneralUtils.h" -#include "Logger.h" +#include "pcapplusplus/SSHLayer.h" +#include "pcapplusplus/GeneralUtils.h" +#include "pcapplusplus/Logger.h" #include "EndianPortable.h" #include diff --git a/Packet++/src/SSLCommon.cpp b/Packet++/src/SSLCommon.cpp index 31207d8866..b081396b38 100644 --- a/Packet++/src/SSLCommon.cpp +++ b/Packet++/src/SSLCommon.cpp @@ -1,6 +1,6 @@ #define LOG_MODULE PacketLogModuleSSLLayer -#include "SSLCommon.h" +#include "pcapplusplus/SSLCommon.h" namespace pcpp { diff --git a/Packet++/src/SSLHandshake.cpp b/Packet++/src/SSLHandshake.cpp index 847f27a06b..89fdf593b9 100644 --- a/Packet++/src/SSLHandshake.cpp +++ b/Packet++/src/SSLHandshake.cpp @@ -7,8 +7,8 @@ #include #include #include -#include "Logger.h" -#include "SSLHandshake.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/SSLHandshake.h" namespace pcpp { diff --git a/Packet++/src/SSLLayer.cpp b/Packet++/src/SSLLayer.cpp index 3025bdd582..3fa4adf603 100644 --- a/Packet++/src/SSLLayer.cpp +++ b/Packet++/src/SSLLayer.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModuleSSLLayer -#include "Logger.h" -#include "SSLLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/SSLLayer.h" #include "EndianPortable.h" #include diff --git a/Packet++/src/SdpLayer.cpp b/Packet++/src/SdpLayer.cpp index 375eb7371b..dd9b4c5bcc 100644 --- a/Packet++/src/SdpLayer.cpp +++ b/Packet++/src/SdpLayer.cpp @@ -1,7 +1,7 @@ #define LOG_MODULE PacketLogModuleSdpLayer -#include "SdpLayer.h" -#include "Logger.h" +#include "pcapplusplus/SdpLayer.h" +#include "pcapplusplus/Logger.h" #include #include #include diff --git a/Packet++/src/SingleCommandTextProtocol.cpp b/Packet++/src/SingleCommandTextProtocol.cpp index f24407f56d..95087a6321 100644 --- a/Packet++/src/SingleCommandTextProtocol.cpp +++ b/Packet++/src/SingleCommandTextProtocol.cpp @@ -1,5 +1,5 @@ -#include "SingleCommandTextProtocol.h" -#include "Logger.h" +#include "pcapplusplus/SingleCommandTextProtocol.h" +#include "pcapplusplus/Logger.h" #include #include diff --git a/Packet++/src/SipLayer.cpp b/Packet++/src/SipLayer.cpp index 6cfa8256c9..687cc80236 100644 --- a/Packet++/src/SipLayer.cpp +++ b/Packet++/src/SipLayer.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModuleSipLayer -#include "SipLayer.h" -#include "SdpLayer.h" -#include "PayloadLayer.h" -#include "Logger.h" -#include "GeneralUtils.h" +#include "pcapplusplus/SipLayer.h" +#include "pcapplusplus/SdpLayer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/GeneralUtils.h" #include #include #include diff --git a/Packet++/src/Sll2Layer.cpp b/Packet++/src/Sll2Layer.cpp index 99638b46bb..0313593af6 100644 --- a/Packet++/src/Sll2Layer.cpp +++ b/Packet++/src/Sll2Layer.cpp @@ -1,14 +1,14 @@ #define LOG_MODULE PacketLogModuleSll2Layer -#include "Sll2Layer.h" -#include "Logger.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "ArpLayer.h" -#include "VlanLayer.h" -#include "PPPoELayer.h" -#include "MplsLayer.h" +#include "pcapplusplus/Sll2Layer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/ArpLayer.h" +#include "pcapplusplus/VlanLayer.h" +#include "pcapplusplus/PPPoELayer.h" +#include "pcapplusplus/MplsLayer.h" #include #include "EndianPortable.h" diff --git a/Packet++/src/SllLayer.cpp b/Packet++/src/SllLayer.cpp index 405990cc99..6370617aa0 100644 --- a/Packet++/src/SllLayer.cpp +++ b/Packet++/src/SllLayer.cpp @@ -1,14 +1,14 @@ #define LOG_MODULE PacketLogModuleSllLayer -#include "SllLayer.h" -#include "Logger.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "ArpLayer.h" -#include "VlanLayer.h" -#include "PPPoELayer.h" -#include "MplsLayer.h" +#include "pcapplusplus/SllLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/ArpLayer.h" +#include "pcapplusplus/VlanLayer.h" +#include "pcapplusplus/PPPoELayer.h" +#include "pcapplusplus/MplsLayer.h" #include #include "EndianPortable.h" diff --git a/Packet++/src/SmtpLayer.cpp b/Packet++/src/SmtpLayer.cpp index bf2a703637..f2d0d3f026 100644 --- a/Packet++/src/SmtpLayer.cpp +++ b/Packet++/src/SmtpLayer.cpp @@ -1,6 +1,6 @@ #define LOG_MODULE PacketLogModuleSmtpLayer -#include "SmtpLayer.h" +#include "pcapplusplus/SmtpLayer.h" #include diff --git a/Packet++/src/SomeIpLayer.cpp b/Packet++/src/SomeIpLayer.cpp index 9c351d0675..648b261412 100644 --- a/Packet++/src/SomeIpLayer.cpp +++ b/Packet++/src/SomeIpLayer.cpp @@ -1,9 +1,9 @@ #define LOG_MODULE PacketLogModuleSomeIpLayer -#include "SomeIpLayer.h" -#include "SomeIpSdLayer.h" -#include "Packet.h" -#include "PayloadLayer.h" +#include "pcapplusplus/SomeIpLayer.h" +#include "pcapplusplus/SomeIpSdLayer.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/PayloadLayer.h" #include "EndianPortable.h" #include #include diff --git a/Packet++/src/SomeIpSdLayer.cpp b/Packet++/src/SomeIpSdLayer.cpp index 2538959944..bfc10f2245 100644 --- a/Packet++/src/SomeIpSdLayer.cpp +++ b/Packet++/src/SomeIpSdLayer.cpp @@ -1,6 +1,6 @@ #define LOG_MODULE PacketLogModuleSomeIpSdLayer -#include "SomeIpSdLayer.h" +#include "pcapplusplus/SomeIpSdLayer.h" #include "EndianPortable.h" #include #include diff --git a/Packet++/src/StpLayer.cpp b/Packet++/src/StpLayer.cpp index 147395018d..d08f209356 100644 --- a/Packet++/src/StpLayer.cpp +++ b/Packet++/src/StpLayer.cpp @@ -1,9 +1,9 @@ #define LOG_MODULE PacketLogModuleStpLayer -#include "StpLayer.h" -#include "PayloadLayer.h" +#include "pcapplusplus/StpLayer.h" +#include "pcapplusplus/PayloadLayer.h" #include "EndianPortable.h" -#include "Logger.h" +#include "pcapplusplus/Logger.h" namespace pcpp { diff --git a/Packet++/src/TLVData.cpp b/Packet++/src/TLVData.cpp index 7fc571635d..babaca55a9 100644 --- a/Packet++/src/TLVData.cpp +++ b/Packet++/src/TLVData.cpp @@ -1,5 +1,5 @@ -#include "TLVData.h" -#include "GeneralUtils.h" +#include "pcapplusplus/TLVData.h" +#include "pcapplusplus/GeneralUtils.h" #include "EndianPortable.h" namespace pcpp diff --git a/Packet++/src/TcpLayer.cpp b/Packet++/src/TcpLayer.cpp index c6963d2259..92ecff649c 100644 --- a/Packet++/src/TcpLayer.cpp +++ b/Packet++/src/TcpLayer.cpp @@ -1,25 +1,25 @@ #define LOG_MODULE PacketLogModuleTcpLayer #include "EndianPortable.h" -#include "TcpLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "HttpLayer.h" -#include "SSLLayer.h" -#include "SipLayer.h" -#include "BgpLayer.h" -#include "SSHLayer.h" -#include "DnsLayer.h" -#include "TelnetLayer.h" -#include "TpktLayer.h" -#include "FtpLayer.h" -#include "SomeIpLayer.h" -#include "SmtpLayer.h" -#include "LdapLayer.h" -#include "PacketUtils.h" -#include "Logger.h" -#include "DeprecationUtils.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/HttpLayer.h" +#include "pcapplusplus/SSLLayer.h" +#include "pcapplusplus/SipLayer.h" +#include "pcapplusplus/BgpLayer.h" +#include "pcapplusplus/SSHLayer.h" +#include "pcapplusplus/DnsLayer.h" +#include "pcapplusplus/TelnetLayer.h" +#include "pcapplusplus/TpktLayer.h" +#include "pcapplusplus/FtpLayer.h" +#include "pcapplusplus/SomeIpLayer.h" +#include "pcapplusplus/SmtpLayer.h" +#include "pcapplusplus/LdapLayer.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/DeprecationUtils.h" #include #include diff --git a/Packet++/src/TcpReassembly.cpp b/Packet++/src/TcpReassembly.cpp index 697041c915..62b8ac2e0f 100644 --- a/Packet++/src/TcpReassembly.cpp +++ b/Packet++/src/TcpReassembly.cpp @@ -1,14 +1,14 @@ #define LOG_MODULE PacketLogModuleTcpReassembly -#include "TcpReassembly.h" -#include "TcpLayer.h" -#include "IPLayer.h" -#include "PacketUtils.h" -#include "Logger.h" +#include "pcapplusplus/TcpReassembly.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/IPLayer.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" #include #include #include "EndianPortable.h" -#include "TimespecTimeval.h" +#include "pcapplusplus/TimespecTimeval.h" #ifdef _MSC_VER # include #endif diff --git a/Packet++/src/TelnetLayer.cpp b/Packet++/src/TelnetLayer.cpp index b8ee8cbbd4..04852a04d8 100644 --- a/Packet++/src/TelnetLayer.cpp +++ b/Packet++/src/TelnetLayer.cpp @@ -1,10 +1,10 @@ #define LOG_MODULE PacketLogModuleTelnetLayer -#include "TelnetLayer.h" -#include "Logger.h" +#include "pcapplusplus/TelnetLayer.h" +#include "pcapplusplus/Logger.h" -#include "GeneralUtils.h" -#include "SystemUtils.h" +#include "pcapplusplus/GeneralUtils.h" +#include "pcapplusplus/SystemUtils.h" #include diff --git a/Packet++/src/TextBasedProtocol.cpp b/Packet++/src/TextBasedProtocol.cpp index 6c01010813..6c9f9ecf30 100644 --- a/Packet++/src/TextBasedProtocol.cpp +++ b/Packet++/src/TextBasedProtocol.cpp @@ -1,6 +1,6 @@ -#include "TextBasedProtocol.h" -#include "Logger.h" -#include "PayloadLayer.h" +#include "pcapplusplus/TextBasedProtocol.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/PayloadLayer.h" #include #include #include diff --git a/Packet++/src/TpktLayer.cpp b/Packet++/src/TpktLayer.cpp index 941402c20d..c60ae38668 100644 --- a/Packet++/src/TpktLayer.cpp +++ b/Packet++/src/TpktLayer.cpp @@ -1,8 +1,8 @@ -#include "TpktLayer.h" +#include "pcapplusplus/TpktLayer.h" +#include "pcapplusplus/TcpLayer.h" +#include "pcapplusplus/CotpLayer.h" +#include "pcapplusplus/PayloadLayer.h" #include "EndianPortable.h" -#include "TcpLayer.h" -#include "CotpLayer.h" -#include "PayloadLayer.h" #include #include #include diff --git a/Packet++/src/UdpLayer.cpp b/Packet++/src/UdpLayer.cpp index 2e17b9cddc..59f20a67b7 100644 --- a/Packet++/src/UdpLayer.cpp +++ b/Packet++/src/UdpLayer.cpp @@ -1,22 +1,22 @@ #define LOG_MODULE PacketLogModuleUdpLayer #include "EndianPortable.h" -#include "UdpLayer.h" -#include "PayloadLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "DnsLayer.h" -#include "DhcpLayer.h" -#include "DhcpV6Layer.h" -#include "VxlanLayer.h" -#include "SipLayer.h" -#include "RadiusLayer.h" -#include "GtpLayer.h" -#include "NtpLayer.h" -#include "SomeIpLayer.h" -#include "WakeOnLanLayer.h" -#include "PacketUtils.h" -#include "Logger.h" +#include "pcapplusplus/UdpLayer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/DnsLayer.h" +#include "pcapplusplus/DhcpLayer.h" +#include "pcapplusplus/DhcpV6Layer.h" +#include "pcapplusplus/VxlanLayer.h" +#include "pcapplusplus/SipLayer.h" +#include "pcapplusplus/RadiusLayer.h" +#include "pcapplusplus/GtpLayer.h" +#include "pcapplusplus/NtpLayer.h" +#include "pcapplusplus/SomeIpLayer.h" +#include "pcapplusplus/WakeOnLanLayer.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" #include #include diff --git a/Packet++/src/VlanLayer.cpp b/Packet++/src/VlanLayer.cpp index fe72a1263e..93c1e3a71b 100644 --- a/Packet++/src/VlanLayer.cpp +++ b/Packet++/src/VlanLayer.cpp @@ -1,13 +1,13 @@ #define LOG_MODULE PacketLogModuleVlanLayer -#include "VlanLayer.h" -#include "IPv4Layer.h" -#include "IPv6Layer.h" -#include "PayloadLayer.h" -#include "ArpLayer.h" -#include "PPPoELayer.h" -#include "MplsLayer.h" -#include "LLCLayer.h" +#include "pcapplusplus/VlanLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/IPv6Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/ArpLayer.h" +#include "pcapplusplus/PPPoELayer.h" +#include "pcapplusplus/MplsLayer.h" +#include "pcapplusplus/LLCLayer.h" #include #include #include "EndianPortable.h" diff --git a/Packet++/src/VrrpLayer.cpp b/Packet++/src/VrrpLayer.cpp index c56cd7f058..e42fe02d4b 100644 --- a/Packet++/src/VrrpLayer.cpp +++ b/Packet++/src/VrrpLayer.cpp @@ -1,12 +1,12 @@ #define LOG_MODULE PacketLogModuleVrrpLayer -#include -#include "PacketUtils.h" -#include "Logger.h" +#include "pcapplusplus/SystemUtils.h" +#include "pcapplusplus/PacketUtils.h" +#include "pcapplusplus/Logger.h" #include "EndianPortable.h" -#include "IPv4Layer.h" -#include "PayloadLayer.h" -#include "VrrpLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/PayloadLayer.h" +#include "pcapplusplus/VrrpLayer.h" namespace pcpp { diff --git a/Packet++/src/VxlanLayer.cpp b/Packet++/src/VxlanLayer.cpp index 1ec5c806eb..f1b78458d0 100644 --- a/Packet++/src/VxlanLayer.cpp +++ b/Packet++/src/VxlanLayer.cpp @@ -1,5 +1,5 @@ -#include "VxlanLayer.h" -#include "EthLayer.h" +#include "pcapplusplus/VxlanLayer.h" +#include "pcapplusplus/EthLayer.h" #include #include "EndianPortable.h" diff --git a/Packet++/src/WakeOnLanLayer.cpp b/Packet++/src/WakeOnLanLayer.cpp index 1175375d5a..ae1a4cc313 100644 --- a/Packet++/src/WakeOnLanLayer.cpp +++ b/Packet++/src/WakeOnLanLayer.cpp @@ -1,8 +1,8 @@ #define LOG_MODULE PacketLogModuleWakeOnLanLayer -#include "WakeOnLanLayer.h" -#include "GeneralUtils.h" -#include "Logger.h" +#include "pcapplusplus/WakeOnLanLayer.h" +#include "pcapplusplus/GeneralUtils.h" +#include "pcapplusplus/Logger.h" namespace pcpp { diff --git a/Pcap++/CMakeLists.txt b/Pcap++/CMakeLists.txt index 0f1ca03cba..2be29e593b 100644 --- a/Pcap++/CMakeLists.txt +++ b/Pcap++/CMakeLists.txt @@ -25,55 +25,55 @@ add_library( $) set(public_headers - header/Device.h - header/NetworkUtils.h - header/PcapDevice.h - header/PcapFileDevice.h - header/PcapFilter.h - header/PcapLiveDevice.h - header/PcapLiveDeviceList.h - header/RawSocketDevice.h) + header/pcapplusplus/Device.h + header/pcapplusplus/NetworkUtils.h + header/pcapplusplus/PcapDevice.h + header/pcapplusplus/PcapFileDevice.h + header/pcapplusplus/PcapFilter.h + header/pcapplusplus/PcapLiveDevice.h + header/pcapplusplus/PcapLiveDeviceList.h + header/pcapplusplus/RawSocketDevice.h) if(PCAPPP_USE_DPDK) list( APPEND public_headers - header/DpdkDevice.h - header/DpdkDeviceList.h - header/MBufRawPacket.h) + header/pcapplusplus/DpdkDevice.h + header/pcapplusplus/DpdkDeviceList.h + header/pcapplusplus/MBufRawPacket.h) endif() if(PCAPPP_USE_DPDK_KNI) list( APPEND public_headers - header/KniDevice.h - header/KniDeviceList.h) + header/pcapplusplus/KniDevice.h + header/pcapplusplus/KniDeviceList.h) endif() if(PCAPPP_USE_PF_RING) list( APPEND public_headers - header/PfRingDevice.h - header/PfRingDeviceList.h) + header/pcapplusplus/PfRingDevice.h + header/pcapplusplus/PfRingDeviceList.h) endif() if(PCAPPP_USE_XDP) - list(APPEND public_headers header/XdpDevice.h) + list(APPEND public_headers header/pcapplusplus/XdpDevice.h) endif() if(LINUX) - list(APPEND public_headers header/LinuxNicInformationSocket.h) + list(APPEND public_headers header/pcapplusplus/LinuxNicInformationSocket.h) endif() if(WIN32) list( APPEND public_headers - header/WinPcapLiveDevice.h - header/PcapRemoteDevice.h - header/PcapRemoteDeviceList.h) + header/pcapplusplus/WinPcapLiveDevice.h + header/pcapplusplus/PcapRemoteDevice.h + header/pcapplusplus/PcapRemoteDeviceList.h) endif() set_property(TARGET Pcap++ PROPERTY PUBLIC_HEADER ${public_headers}) diff --git a/Pcap++/header/Device.h b/Pcap++/header/pcapplusplus/Device.h similarity index 95% rename from Pcap++/header/Device.h rename to Pcap++/header/pcapplusplus/Device.h index d8ba547076..e1f59e6052 100644 --- a/Pcap++/header/Device.h +++ b/Pcap++/header/pcapplusplus/Device.h @@ -2,9 +2,9 @@ /// @file -#include "PointerVector.h" -#include "RawPacket.h" -#include "PcapFilter.h" +#include "pcapplusplus/PointerVector.h" +#include "pcapplusplus/RawPacket.h" +#include "pcapplusplus/PcapFilter.h" /** * \namespace pcpp diff --git a/Pcap++/header/DeviceUtils.h b/Pcap++/header/pcapplusplus/DeviceUtils.h similarity index 87% rename from Pcap++/header/DeviceUtils.h rename to Pcap++/header/pcapplusplus/DeviceUtils.h index b453eb3d97..6bf0e44b06 100644 --- a/Pcap++/header/DeviceUtils.h +++ b/Pcap++/header/pcapplusplus/DeviceUtils.h @@ -3,8 +3,8 @@ /// @file #include -#include "IpAddress.h" -#include "PcapUtils.h" +#include "pcapplusplus/IpAddress.h" +#include "pcapplusplus/PcapUtils.h" namespace pcpp { diff --git a/Pcap++/header/DpdkDevice.h b/Pcap++/header/pcapplusplus/DpdkDevice.h similarity index 100% rename from Pcap++/header/DpdkDevice.h rename to Pcap++/header/pcapplusplus/DpdkDevice.h diff --git a/Pcap++/header/DpdkDeviceList.h b/Pcap++/header/pcapplusplus/DpdkDeviceList.h similarity index 100% rename from Pcap++/header/DpdkDeviceList.h rename to Pcap++/header/pcapplusplus/DpdkDeviceList.h diff --git a/Pcap++/header/KniDevice.h b/Pcap++/header/pcapplusplus/KniDevice.h similarity index 100% rename from Pcap++/header/KniDevice.h rename to Pcap++/header/pcapplusplus/KniDevice.h diff --git a/Pcap++/header/KniDeviceList.h b/Pcap++/header/pcapplusplus/KniDeviceList.h similarity index 100% rename from Pcap++/header/KniDeviceList.h rename to Pcap++/header/pcapplusplus/KniDeviceList.h diff --git a/Pcap++/header/LinuxNicInformationSocket.h b/Pcap++/header/pcapplusplus/LinuxNicInformationSocket.h similarity index 100% rename from Pcap++/header/LinuxNicInformationSocket.h rename to Pcap++/header/pcapplusplus/LinuxNicInformationSocket.h diff --git a/Pcap++/header/MBufRawPacket.h b/Pcap++/header/pcapplusplus/MBufRawPacket.h similarity index 100% rename from Pcap++/header/MBufRawPacket.h rename to Pcap++/header/pcapplusplus/MBufRawPacket.h diff --git a/Pcap++/header/NetworkUtils.h b/Pcap++/header/pcapplusplus/NetworkUtils.h similarity index 100% rename from Pcap++/header/NetworkUtils.h rename to Pcap++/header/pcapplusplus/NetworkUtils.h diff --git a/Pcap++/header/PcapDevice.h b/Pcap++/header/pcapplusplus/PcapDevice.h similarity index 100% rename from Pcap++/header/PcapDevice.h rename to Pcap++/header/pcapplusplus/PcapDevice.h diff --git a/Pcap++/header/PcapFileDevice.h b/Pcap++/header/pcapplusplus/PcapFileDevice.h similarity index 100% rename from Pcap++/header/PcapFileDevice.h rename to Pcap++/header/pcapplusplus/PcapFileDevice.h diff --git a/Pcap++/header/PcapFilter.h b/Pcap++/header/pcapplusplus/PcapFilter.h similarity index 100% rename from Pcap++/header/PcapFilter.h rename to Pcap++/header/pcapplusplus/PcapFilter.h diff --git a/Pcap++/header/PcapLiveDevice.h b/Pcap++/header/pcapplusplus/PcapLiveDevice.h similarity index 100% rename from Pcap++/header/PcapLiveDevice.h rename to Pcap++/header/pcapplusplus/PcapLiveDevice.h diff --git a/Pcap++/header/PcapLiveDeviceList.h b/Pcap++/header/pcapplusplus/PcapLiveDeviceList.h similarity index 100% rename from Pcap++/header/PcapLiveDeviceList.h rename to Pcap++/header/pcapplusplus/PcapLiveDeviceList.h diff --git a/Pcap++/header/PcapRemoteDevice.h b/Pcap++/header/pcapplusplus/PcapRemoteDevice.h similarity index 100% rename from Pcap++/header/PcapRemoteDevice.h rename to Pcap++/header/pcapplusplus/PcapRemoteDevice.h diff --git a/Pcap++/header/PcapRemoteDeviceList.h b/Pcap++/header/pcapplusplus/PcapRemoteDeviceList.h similarity index 100% rename from Pcap++/header/PcapRemoteDeviceList.h rename to Pcap++/header/pcapplusplus/PcapRemoteDeviceList.h diff --git a/Pcap++/header/PcapUtils.h b/Pcap++/header/pcapplusplus/PcapUtils.h similarity index 100% rename from Pcap++/header/PcapUtils.h rename to Pcap++/header/pcapplusplus/PcapUtils.h diff --git a/Pcap++/header/PfRingDevice.h b/Pcap++/header/pcapplusplus/PfRingDevice.h similarity index 100% rename from Pcap++/header/PfRingDevice.h rename to Pcap++/header/pcapplusplus/PfRingDevice.h diff --git a/Pcap++/header/PfRingDeviceList.h b/Pcap++/header/pcapplusplus/PfRingDeviceList.h similarity index 100% rename from Pcap++/header/PfRingDeviceList.h rename to Pcap++/header/pcapplusplus/PfRingDeviceList.h diff --git a/Pcap++/header/RawSocketDevice.h b/Pcap++/header/pcapplusplus/RawSocketDevice.h similarity index 100% rename from Pcap++/header/RawSocketDevice.h rename to Pcap++/header/pcapplusplus/RawSocketDevice.h diff --git a/Pcap++/header/WinPcapLiveDevice.h b/Pcap++/header/pcapplusplus/WinPcapLiveDevice.h similarity index 100% rename from Pcap++/header/WinPcapLiveDevice.h rename to Pcap++/header/pcapplusplus/WinPcapLiveDevice.h diff --git a/Pcap++/header/XdpDevice.h b/Pcap++/header/pcapplusplus/XdpDevice.h similarity index 100% rename from Pcap++/header/XdpDevice.h rename to Pcap++/header/pcapplusplus/XdpDevice.h diff --git a/Pcap++/src/DeviceUtils.cpp b/Pcap++/src/DeviceUtils.cpp index 25bb5e5f20..e990c75462 100644 --- a/Pcap++/src/DeviceUtils.cpp +++ b/Pcap++/src/DeviceUtils.cpp @@ -1,11 +1,11 @@ -#include "DeviceUtils.h" +#include "pcapplusplus/DeviceUtils.h" #include #include #include "pcap.h" -#include "Logger.h" -#include "IpAddress.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IpAddress.h" namespace pcpp { diff --git a/Pcap++/src/NetworkUtils.cpp b/Pcap++/src/NetworkUtils.cpp index 06e26f5315..c1435c5aac 100644 --- a/Pcap++/src/NetworkUtils.cpp +++ b/Pcap++/src/NetworkUtils.cpp @@ -4,18 +4,18 @@ #include #include #include -#include "Logger.h" -#include "Packet.h" -#include "EthLayer.h" -#include "ArpLayer.h" -#include "IPv4Layer.h" -#include "UdpLayer.h" -#include "DnsLayer.h" -#include "PcapFilter.h" -#include "NetworkUtils.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/EthLayer.h" +#include "pcapplusplus/ArpLayer.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/UdpLayer.h" +#include "pcapplusplus/DnsLayer.h" +#include "pcapplusplus/PcapFilter.h" +#include "pcapplusplus/NetworkUtils.h" #include "EndianPortable.h" #ifdef _MSC_VER -# include "SystemUtils.h" +# include "pcapplusplus/SystemUtils.h" #endif #ifndef ETIMEDOUT # define ETIMEDOUT 10060 diff --git a/Pcap++/src/PcapDevice.cpp b/Pcap++/src/PcapDevice.cpp index 9cef275c07..8eae2d50b0 100644 --- a/Pcap++/src/PcapDevice.cpp +++ b/Pcap++/src/PcapDevice.cpp @@ -1,8 +1,8 @@ -#include "PcapDevice.h" -#include "PcapFilter.h" -#include "Logger.h" -#include "TimespecTimeval.h" -#include "pcap.h" +#include "pcapplusplus/PcapDevice.h" +#include "pcapplusplus/PcapFilter.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/TimespecTimeval.h" +#include "pcapplusplus/pcap.h" namespace pcpp { diff --git a/Pcap++/src/PcapFileDevice.cpp b/Pcap++/src/PcapFileDevice.cpp index 3aa00fff67..a7c02e9575 100644 --- a/Pcap++/src/PcapFileDevice.cpp +++ b/Pcap++/src/PcapFileDevice.cpp @@ -2,11 +2,11 @@ #include #include -#include "PcapFileDevice.h" -#include "light_pcapng_ext.h" -#include "Logger.h" -#include "TimespecTimeval.h" -#include "pcap.h" +#include "pcapplusplus/PcapFileDevice.h" +#include "pcapplusplus/light_pcapng_ext.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/TimespecTimeval.h" +#include "pcapplusplus/pcap.h" #include #include #include "EndianPortable.h" diff --git a/Pcap++/src/PcapFilter.cpp b/Pcap++/src/PcapFilter.cpp index c3d905e856..a844f5c9c6 100644 --- a/Pcap++/src/PcapFilter.cpp +++ b/Pcap++/src/PcapFilter.cpp @@ -1,9 +1,9 @@ #define LOG_MODULE PcapLogModuleLiveDevice -#include "PcapFilter.h" -#include "Logger.h" -#include "IPv4Layer.h" -#include "PcapUtils.h" +#include "pcapplusplus/PcapFilter.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IPv4Layer.h" +#include "pcapplusplus/PcapUtils.h" #include #include #if defined(_WIN32) diff --git a/Pcap++/src/PcapLiveDevice.cpp b/Pcap++/src/PcapLiveDevice.cpp index 7ac0f79edc..9d3bdeeb1e 100644 --- a/Pcap++/src/PcapLiveDevice.cpp +++ b/Pcap++/src/PcapLiveDevice.cpp @@ -1,11 +1,11 @@ #define LOG_MODULE PcapLogModuleLiveDevice -#include "IpUtils.h" -#include "DeviceUtils.h" -#include "PcapUtils.h" -#include "PcapLiveDevice.h" -#include "PcapLiveDeviceList.h" -#include "Packet.h" +#include "pcapplusplus/IpUtils.h" +#include "pcapplusplus/DeviceUtils.h" +#include "pcapplusplus/PcapUtils.h" +#include "pcapplusplus/PcapLiveDevice.h" +#include "pcapplusplus/PcapLiveDeviceList.h" +#include "pcapplusplus/Packet.h" #ifndef _MSC_VER # include #endif // ! _MSC_VER diff --git a/Pcap++/src/PcapLiveDeviceList.cpp b/Pcap++/src/PcapLiveDeviceList.cpp index e65cd23d2f..d36147c8cd 100644 --- a/Pcap++/src/PcapLiveDeviceList.cpp +++ b/Pcap++/src/PcapLiveDeviceList.cpp @@ -1,12 +1,12 @@ #define LOG_MODULE PcapLogModuleLiveDevice -#include "IpUtils.h" -#include "IpAddressUtils.h" -#include "PcapLiveDeviceList.h" -#include "Logger.h" -#include "PcapUtils.h" -#include "DeviceUtils.h" -#include "SystemUtils.h" +#include "pcapplusplus/IpUtils.h" +#include "pcapplusplus/IpAddressUtils.h" +#include "pcapplusplus/PcapLiveDeviceList.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/PcapUtils.h" +#include "pcapplusplus/DeviceUtils.h" +#include "pcapplusplus/SystemUtils.h" #include "pcap.h" #include #include diff --git a/Pcap++/src/PcapRemoteDevice.cpp b/Pcap++/src/PcapRemoteDevice.cpp index 3b020aba5e..74c1d6180b 100644 --- a/Pcap++/src/PcapRemoteDevice.cpp +++ b/Pcap++/src/PcapRemoteDevice.cpp @@ -2,8 +2,8 @@ # define LOG_MODULE PcapLogModuleRemoteDevice -# include "PcapRemoteDevice.h" -# include "Logger.h" +# include "pcapplusplus/PcapRemoteDevice.h" +# include "pcapplusplus/Logger.h" # include "pcap.h" namespace pcpp diff --git a/Pcap++/src/PcapRemoteDeviceList.cpp b/Pcap++/src/PcapRemoteDeviceList.cpp index 4ad2ac4f42..8e2a72facb 100644 --- a/Pcap++/src/PcapRemoteDeviceList.cpp +++ b/Pcap++/src/PcapRemoteDeviceList.cpp @@ -2,11 +2,11 @@ # define LOG_MODULE PcapLogModuleRemoteDevice -# include "PcapRemoteDeviceList.h" -# include "Logger.h" -# include "IpUtils.h" -# include "PcapUtils.h" -# include "IpAddressUtils.h" +# include "pcapplusplus/PcapRemoteDeviceList.h" +# include "pcapplusplus/Logger.h" +# include "pcapplusplus/IpUtils.h" +# include "pcapplusplus/PcapUtils.h" +# include "pcapplusplus/IpAddressUtils.h" # include "pcap.h" # include # include diff --git a/Pcap++/src/PcapUtils.cpp b/Pcap++/src/PcapUtils.cpp index df8ee5f4c7..ecdc3b31ef 100644 --- a/Pcap++/src/PcapUtils.cpp +++ b/Pcap++/src/PcapUtils.cpp @@ -1,4 +1,4 @@ -#include "PcapUtils.h" +#include "pcapplusplus/PcapUtils.h" #include "pcap.h" diff --git a/Pcap++/src/RawSocketDevice.cpp b/Pcap++/src/RawSocketDevice.cpp index 00174272c8..7e00b991d1 100644 --- a/Pcap++/src/RawSocketDevice.cpp +++ b/Pcap++/src/RawSocketDevice.cpp @@ -11,11 +11,11 @@ # include #endif #include -#include "Logger.h" -#include "IpUtils.h" -#include "SystemUtils.h" -#include "Packet.h" -#include "EthLayer.h" +#include "pcapplusplus/Logger.h" +#include "pcapplusplus/IpUtils.h" +#include "pcapplusplus/SystemUtils.h" +#include "pcapplusplus/Packet.h" +#include "pcapplusplus/EthLayer.h" namespace pcpp {