Skip to content

Commit 9c37d64

Browse files
clementperonclementperon
committed
header: move to a dedicated pcapplusplus folder to follow install hierarchy
1 parent 4fb8f84 commit 9c37d64

35 files changed

+97
-93
lines changed

‎Common++/header/DeprecationUtils.h renamed to ‎Common++/header/pcapPlusPlus/DeprecationUtils.h

File renamed without changes.

‎Common++/header/GeneralUtils.h renamed to ‎Common++/header/pcapPlusPlus/GeneralUtils.h

File renamed without changes.

‎Common++/header/IpAddress.h renamed to ‎Common++/header/pcapPlusPlus/IpAddress.h

File renamed without changes.

‎Common++/header/IpAddressUtils.h renamed to ‎Common++/header/pcapPlusPlus/IpAddressUtils.h

File renamed without changes.

‎Common++/header/IpUtils.h renamed to ‎Common++/header/pcapPlusPlus/IpUtils.h

File renamed without changes.

‎Common++/header/LRUList.h renamed to ‎Common++/header/pcapPlusPlus/LRUList.h

File renamed without changes.

‎Common++/header/Logger.h renamed to ‎Common++/header/pcapPlusPlus/Logger.h

File renamed without changes.

‎Common++/header/MacAddress.h renamed to ‎Common++/header/pcapPlusPlus/MacAddress.h

File renamed without changes.

‎Common++/header/OUILookup.h renamed to ‎Common++/header/pcapPlusPlus/OUILookup.h

File renamed without changes.

‎Common++/header/PcapPlusPlusVersion.h renamed to ‎Common++/header/pcapPlusPlus/PcapPlusPlusVersion.h

File renamed without changes.

‎Common++/header/PointerVector.h renamed to ‎Common++/header/pcapPlusPlus/PointerVector.h

File renamed without changes.

‎Common++/header/SystemUtils.h renamed to ‎Common++/header/pcapPlusPlus/SystemUtils.h

File renamed without changes.

‎Common++/header/TablePrinter.h renamed to ‎Common++/header/pcapPlusPlus/TablePrinter.h

File renamed without changes.

‎Common++/header/TimespecTimeval.h renamed to ‎Common++/header/pcapPlusPlus/TimespecTimeval.h

File renamed without changes.

‎Common++/src/GeneralUtils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#define LOG_MODULE CommonLogModuleGenericUtils
22

3-
#include "GeneralUtils.h"
4-
#include "Logger.h"
3+
#include "pcapplusplus/GeneralUtils.h"
4+
#include "pcapplusplus/Logger.h"
55
#include <sstream>
66
#include <iomanip>
77
#include <string.h>

‎Common++/src/IpAddress.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include <stdexcept>
88
#include <stdint.h>
99
#include <bitset>
10-
#include "Logger.h"
11-
#include "IpUtils.h"
12-
#include "IpAddress.h"
10+
#include "pcapplusplus/Logger.h"
11+
#include "pcapplusplus/IpUtils.h"
12+
#include "pcapplusplus/IpAddress.h"
1313
#include "EndianPortable.h"
1414

1515
// for AF_INET, AF_INET6

‎Common++/src/IpAddressUtils.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include "IpAddressUtils.h"
1+
#include "pcapplusplus/IpAddressUtils.h"
22

3-
#include "IpAddress.h"
4-
#include "IpUtils.h" // Just needing in_addr and in6_addr.
3+
#include "pcapplusplus/IpAddress.h"
4+
#include "pcapplusplus/IpUtils.h" // Just needing in_addr and in6_addr.
55

66
namespace pcpp
77
{

‎Common++/src/IpUtils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#define LOG_MODULE CommonLogModuleIpUtils
22

3-
#include "IpUtils.h"
4-
#include "Logger.h"
3+
#include "pcapplusplus/IpUtils.h"
4+
#include "pcapplusplus/Logger.h"
55
#include <string.h>
66
#include <stdio.h>
77
#include <stdexcept>

‎Common++/src/Logger.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <sstream>
2-
#include "Logger.h"
2+
#include "pcapplusplus/Logger.h"
33

44
namespace pcpp
55
{

‎Common++/src/MacAddress.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <stdio.h>
22

3-
#include "MacAddress.h"
3+
#include "pcapplusplus/MacAddress.h"
44

55
namespace pcpp
66
{

‎Common++/src/OUILookup.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include "OUILookup.h"
2-
#include "Logger.h"
1+
#include "pcapplusplus/OUILookup.h"
2+
#include "pcapplusplus/Logger.h"
33

4-
#include "json.hpp"
4+
#include <json.hpp>
55

66
#include <fstream>
77

‎Common++/src/PcapPlusPlusVersion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "PcapPlusPlusVersion.h"
1+
#include "pcapplusplus/PcapPlusPlusVersion.h"
22

33
namespace pcpp
44
{

‎Common++/src/SystemUtils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "SystemUtils.h"
1+
#include "pcapplusplus/SystemUtils.h"
22
#include "EndianPortable.h"
33

44
#ifndef _MSC_VER

‎Common++/src/TablePrinter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <iterator>
77
#include <numeric>
88
#include <utility>
9-
#include "TablePrinter.h"
10-
#include "Logger.h"
9+
#include "pcapplusplus/TablePrinter.h"
10+
#include "pcapplusplus/Logger.h"
1111

1212
namespace pcpp
1313
{

‎Examples/ArpSpoofing/main.cpp

+11-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
#include <iostream>
44
#include <fstream>
55
#include <memory>
6-
#include <MacAddress.h>
7-
#include <IpAddress.h>
8-
#include <PcapPlusPlusVersion.h>
9-
#include <SystemUtils.h>
10-
#include <PcapLiveDeviceList.h>
11-
#include <PcapLiveDevice.h>
12-
#include <EthLayer.h>
13-
#include <ArpLayer.h>
14-
#include <Logger.h>
6+
7+
#include <pcapplusplus/MacAddress.h>
8+
#include <pcapplusplus/IpAddress.h>
9+
#include <pcapplusplus/PcapPlusPlusVersion.h>
10+
#include <pcapplusplus/SystemUtils.h>
11+
#include <pcapplusplus/PcapLiveDeviceList.h>
12+
#include <pcapplusplus/PcapLiveDevice.h>
13+
#include <pcapplusplus/EthLayer.h>
14+
#include <pcapplusplus/ArpLayer.h>
15+
#include <pcapplusplus/Logger.h>
16+
1517
#include <getopt.h>
1618

1719
#define EXIT_WITH_ERROR(reason) \

‎Examples/Arping/main.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
#include <stdlib.h>
99
#include <iostream>
10-
#include <MacAddress.h>
11-
#include <IpAddress.h>
12-
#include <Logger.h>
13-
#include <PcapPlusPlusVersion.h>
14-
#include <PcapLiveDeviceList.h>
15-
#include <PcapLiveDevice.h>
16-
#include <NetworkUtils.h>
1710
#include <getopt.h>
18-
#include <SystemUtils.h>
11+
#include <pcapplusplus/MacAddress.h>
12+
#include <pcapplusplus/IpAddress.h>
13+
#include <pcapplusplus/Logger.h>
14+
#include <pcapplusplus/PcapPlusPlusVersion.h>
15+
#include <pcapplusplus/PcapLiveDeviceList.h>
16+
#include <pcapplusplus/PcapLiveDevice.h>
17+
#include <pcapplusplus/NetworkUtils.h>
18+
#include <pcapplusplus/SystemUtils.h>
1919

2020
#define EXIT_WITH_ERROR(reason) \
2121
do \

‎Examples/DNSResolver/main.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include <stdlib.h>
22
#include <iostream>
3-
#include "PcapPlusPlusVersion.h"
4-
#include "PcapLiveDevice.h"
5-
#include "PcapLiveDeviceList.h"
6-
#include "NetworkUtils.h"
7-
#include "SystemUtils.h"
8-
#include "Logger.h"
3+
#include <pcapplusplus/PcapPlusPlusVersion.h>
4+
#include <pcapplusplus/PcapLiveDevice.h>
5+
#include <pcapplusplus/PcapLiveDeviceList.h>
6+
#include <pcapplusplus/NetworkUtils.h>
7+
#include <pcapplusplus/SystemUtils.h>
8+
#include <pcapplusplus/Logger.h>
99
#include <getopt.h>
1010

1111
#define EXIT_WITH_ERROR(reason) \

‎Examples/DnsSpoofing/main.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
#if !defined(_WIN32)
1717
# include <errno.h>
1818
#endif
19-
#include "IpAddress.h"
20-
#include "RawPacket.h"
21-
#include "ProtocolType.h"
22-
#include "Packet.h"
23-
#include "EthLayer.h"
24-
#include "IPv4Layer.h"
25-
#include "IPv6Layer.h"
26-
#include "UdpLayer.h"
27-
#include "DnsLayer.h"
28-
#include "PcapFilter.h"
29-
#include "PcapLiveDevice.h"
30-
#include "PcapLiveDeviceList.h"
31-
#include "TablePrinter.h"
32-
#include "SystemUtils.h"
33-
#include "PcapPlusPlusVersion.h"
19+
#include <pcapplusplus/IpAddress.h>
20+
#include <pcapplusplus/RawPacket.h>
21+
#include <pcapplusplus/ProtocolType.h>
22+
#include <pcapplusplus/Packet.h>
23+
#include <pcapplusplus/EthLayer.h>
24+
#include <pcapplusplus/IPv4Layer.h>
25+
#include <pcapplusplus/IPv6Layer.h>
26+
#include <pcapplusplus/UdpLayer.h>
27+
#include <pcapplusplus/DnsLayer.h>
28+
#include <pcapplusplus/PcapFilter.h>
29+
#include <pcapplusplus/PcapLiveDevice.h>
30+
#include <pcapplusplus/PcapLiveDeviceList.h>
31+
#include <pcapplusplus/TablePrinter.h>
32+
#include <pcapplusplus/SystemUtils.h>
33+
#include <pcapplusplus/PcapPlusPlusVersion.h>
3434
#include <getopt.h>
3535

3636
#define EXIT_WITH_ERROR(reason) \

‎Examples/DpdkBridge/main.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
#include "Common.h"
2424
#include "AppWorkerThread.h"
2525

26-
#include "DpdkDeviceList.h"
27-
#include "IPv4Layer.h"
28-
#include "TcpLayer.h"
29-
#include "UdpLayer.h"
30-
#include "SystemUtils.h"
31-
#include "PcapPlusPlusVersion.h"
32-
#include "TablePrinter.h"
26+
#include <pcapplusplus/DpdkDeviceList.h>
27+
#include <pcapplusplus/IPv4Layer.h>
28+
#include <pcapplusplus/TcpLayer.h>
29+
#include <pcapplusplus/UdpLayer.h>
30+
#include <pcapplusplus/SystemUtils.h>
31+
#include <pcapplusplus/PcapPlusPlusVersion.h>
32+
#include <pcapplusplus/TablePrinter.h>
3333

3434
#include <vector>
3535
#include <iostream>

‎Examples/DpdkExample-FilterTraffic/main.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
#include "PacketMatchingEngine.h"
2525
#include "AppWorkerThread.h"
2626

27-
#include "DpdkDeviceList.h"
28-
#include "TcpLayer.h"
29-
#include "UdpLayer.h"
30-
#include "SystemUtils.h"
31-
#include "PcapPlusPlusVersion.h"
32-
#include "TablePrinter.h"
27+
#include <pcapplusplus/DpdkDeviceList.h>
28+
#include <pcapplusplus/TcpLayer.h>
29+
#include <pcapplusplus/UdpLayer.h>
30+
#include <pcapplusplus/SystemUtils.h>
31+
#include <pcapplusplus/PcapPlusPlusVersion.h>
32+
#include <pcapplusplus/TablePrinter.h>
3333

3434
#include <vector>
3535
#include <iostream>

‎Examples/ExampleApp/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <iostream>
2-
#include <IPv4Layer.h>
3-
#include <Packet.h>
4-
#include <PcapFileDevice.h>
2+
#include <pcapplusplus/IPv4Layer.h>
3+
#include <pcapplusplus/Packet.h>
4+
#include <pcapplusplus/PcapFileDevice.h>
55

66
int main(int argc, char* argv[])
77
{

‎Examples/HttpAnalyzer/main.cpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@
2121
#include <string.h>
2222
#include <iomanip>
2323
#include <algorithm>
24-
#include "PcapLiveDeviceList.h"
25-
#include "PcapFilter.h"
26-
#include "PcapFileDevice.h"
27-
#include "HttpStatsCollector.h"
28-
#include "TablePrinter.h"
29-
#include "SystemUtils.h"
30-
#include "PcapPlusPlusVersion.h"
24+
#include <pcapplusplus/PcapLiveDeviceList.h>
25+
#include <pcapplusplus/PcapFilter.h>
26+
#include <pcapplusplus/PcapFileDevice.h>
27+
#include <pcapplusplus/TablePrinter.h>
28+
#include <pcapplusplus/SystemUtils.h>
29+
#include <pcapplusplus/PcapPlusPlusVersion.h>
3130
#include <getopt.h>
3231
#include <iostream>
3332
#include <sstream>
3433

34+
#include "HttpStatsCollector.h"
35+
3536
#define EXIT_WITH_ERROR(reason) \
3637
do \
3738
{ \

‎Examples/IPDefragUtil/main.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#include <sstream>
44
#include <stdlib.h>
55
#include <string.h>
6-
#include "PcapPlusPlusVersion.h"
7-
#include "IPv4Layer.h"
8-
#include "IPv6Layer.h"
9-
#include "IPReassembly.h"
10-
#include "PcapFileDevice.h"
11-
#include "SystemUtils.h"
12-
#include "getopt.h"
6+
#include <pcapplusplus/PcapPlusPlusVersion.h>
7+
#include <pcapplusplus/IPv4Layer.h>
8+
#include <pcapplusplus/IPv6Layer.h>
9+
#include <pcapplusplus/IPReassembly.h>
10+
#include <pcapplusplus/PcapFileDevice.h>
11+
#include <pcapplusplus/SystemUtils.h>
12+
#include <getopt.h>
1313

1414
#define EXIT_WITH_ERROR(reason) \
1515
do \

‎Examples/IcmpFileTransfer/Common.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include <iostream>
44
#include <vector>
55
#include <getopt.h>
6-
#include "EthLayer.h"
7-
#include "IPv4Layer.h"
8-
#include "IcmpLayer.h"
9-
#include "PcapLiveDeviceList.h"
10-
#include "SystemUtils.h"
11-
#include "PcapPlusPlusVersion.h"
6+
#include <pcapplusplus/EthLayer.h>
7+
#include <pcapplusplus/IPv4Layer.h>
8+
#include <pcapplusplus/IcmpLayer.h>
9+
#include <pcapplusplus/PcapLiveDeviceList.h>
10+
#include <pcapplusplus/SystemUtils.h>
11+
#include <pcapplusplus/PcapPlusPlusVersion.h>
1212

1313
#if defined(_WIN32)
1414
# define SEPARATOR '\\'

‎Pcap++/header/pcapplusplus

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.

0 commit comments

Comments
 (0)