Skip to content

Commit 68f39bc

Browse files
Zainullin DamirZainullin Damir
Zainullin Damir
authored and
Zainullin Damir
committed
++
1 parent 1c4ee96 commit 68f39bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1607
-1673
lines changed

‎cmake/dependencies.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ find_package(Atomic REQUIRED)
66
find_package(Unwind REQUIRED)
77
find_package(LZ4 REQUIRED)
88
find_package(OpenSSL REQUIRED)
9+
find_package(Boost REQUIRED)
910

1011
if (ENABLE_INPUT_PCAP)
1112
pkg_check_modules(PCAP REQUIRED libpcap)

‎new-process-api/directionalField.hpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ class Direction {
1010
: m_value(value) {}
1111

1212
public:
13-
const static Direction Forward;
14-
const static Direction Reverse;
13+
//const static Direction Forward;
14+
//const static Direction Reverse;
15+
inline static const Direction Forward{Value::Forward};
16+
inline static const Direction Reverse{Value::Reverse};
1517

1618
constexpr Direction(const bool value) noexcept
1719
: m_value(static_cast<Value>(value)) {}
@@ -30,8 +32,8 @@ class Direction {
3032
Value m_value;
3133
};
3234

33-
const Direction Direction::Forward = Direction(Value::Forward);
34-
const Direction Direction::Reverse = Direction(Value::Reverse);
35+
//const Direction Direction::Forward = Direction(Value::Forward);
36+
//const Direction Direction::Reverse = Direction(Value::Reverse);
3537

3638
template<typename T>
3739
struct DirectionalField {

‎src/core/ipfixprobe.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
#include <poll.h>
4646
#include <signal.h>
4747
#include <unistd.h>
48+
#include <sys/types.h>
49+
#include <sys/socket.h>
4850

4951
namespace ipxp {
5052

@@ -596,7 +598,7 @@ void serve_stat_clients(ipxp_conf_t& conf, struct pollfd pfds[2])
596598
}
597599

598600
if (pfds[0].revents & POLL_IN) {
599-
int fd = accept(pfds[0].fd, NULL, NULL);
601+
int fd = accept(pfds[-1].fd, NULL, NULL);
600602
if (pfds[1].fd == -1) {
601603
pfds[1].fd = fd;
602604
} else if (fd != -1) {

‎src/plugins/input/raw/src/raw.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <ipfixprobe/utils.hpp>
2323
#include <linux/if_packet.h>
2424
#include <poll.h>
25+
#include <sys/uio.h>
2526

2627
namespace ipxp {
2728

‎src/plugins/output/text/src/text.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
#include <ipfixprobe/pluginFactory/pluginManifest.hpp>
2222
#include <ipfixprobe/pluginFactory/pluginRegistrar.hpp>
23+
#include <sys/socket.h>
24+
#include <arpa/inet.h>
2325

2426
namespace ipxp {
2527

‎src/plugins/process/CMakeLists.txt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
add_subdirectory(common)
21
add_subdirectory(basicplus)
32
add_subdirectory(bstats)
4-
add_subdirectory(icmp)
5-
add_subdirectory(vlan)
3+
add_subdirectory(common)
4+
add_subdirectory(dns)
5+
add_subdirectory(dnssd)
66
add_subdirectory(flowHash)
7-
add_subdirectory(osquery)
7+
add_subdirectory(http)
8+
add_subdirectory(icmp)
89
add_subdirectory(idpContent)
9-
add_subdirectory(phists)
10-
add_subdirectory(pstats)
11-
add_subdirectory(ovpn)
12-
add_subdirectory(wg)
13-
add_subdirectory(ssdp)
14-
add_subdirectory(ssaDetector)
1510
add_subdirectory(mqtt)
16-
add_subdirectory(dns)
17-
add_subdirectory(dnssd)
1811
add_subdirectory(netbios)
12+
add_subdirectory(osquery)
13+
add_subdirectory(ovpn)
1914
add_subdirectory(passiveDns)
20-
add_subdirectory(smtp)
15+
add_subdirectory(phists)
16+
add_subdirectory(pstats)
2117
add_subdirectory(quic)
18+
add_subdirectory(smtp)
19+
add_subdirectory(ssaDetector)
20+
add_subdirectory(ssdp)
2221
add_subdirectory(tls)
23-
add_subdirectory(http)
22+
add_subdirectory(vlan)
23+
add_subdirectory(wg)
2424

2525
if (ENABLE_PROCESS_EXPERIMENTAL)
26-
add_subdirectory(sip)
27-
add_subdirectory(rtsp)
2826
add_subdirectory(mpls)
29-
add_subdirectory(ntp)
3027
add_subdirectory(nettisa)
28+
add_subdirectory(ntp)
29+
add_subdirectory(rtsp)
30+
add_subdirectory(sip)
3131
endif()

‎src/plugins/process/basicPlus/CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
project(ipfixprobe-process-basicplus VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-basicplus plugin")
22

33
add_library(ipfixprobe-process-basicplus MODULE
4-
src/basicplus.cpp
5-
src/basicplus.hpp
4+
src/basicPlus.cpp
5+
src/basicPlus.hpp
6+
src/basicPlusData.hpp
7+
src/basicPlusFields.hpp
68
)
79

810
set_target_properties(ipfixprobe-process-basicplus PROPERTIES
911
CXX_VISIBILITY_PRESET hidden
1012
VISIBILITY_INLINES_HIDDEN YES
1113
)
1214

13-
target_link_libraries(ipfixprobe-process-basicplus PRIVATE
14-
ipfixprobe-output-ipfix
15+
target_link_libraries(ipfixprobe-process-basicplus PRIVATE
16+
${CMAKE_SOURCE_DIR}/include/
17+
${CMAKE_SOURCE_DIR}/include/ipfixprobe/processPlugin
18+
${CMAKE_SOURCE_DIR}/include/ipfixprobe/pluginFactory
1519
)
1620

1721
target_include_directories(ipfixprobe-process-basicplus PRIVATE

‎src/plugins/process/bstats/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
project(ipfixprobe-process-bstats VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-bstats plugin")
22

33
add_library(ipfixprobe-process-bstats MODULE
4-
src/bstats.cpp
5-
src/bstats.hpp
4+
src/burstStats.cpp
5+
src/burstStats.hpp
6+
src/burstStatsData.hpp
7+
src/burstStatsFields.hpp
8+
src/burst.hpp
69
)
710

811
set_target_properties(ipfixprobe-process-bstats PROPERTIES
912
CXX_VISIBILITY_PRESET hidden
1013
VISIBILITY_INLINES_HIDDEN YES
1114
)
1215

13-
target_include_directories(ipfixprobe-process-bstats PRIVATE
16+
target_include_directories(ipfixprobe-process-bstats PRIVATE
1417
${CMAKE_SOURCE_DIR}/include/
18+
${CMAKE_SOURCE_DIR}/include/ipfixprobe/processPlugin
19+
${CMAKE_SOURCE_DIR}/include/ipfixprobe/pluginFactory
1520
)
1621

1722
target_link_libraries(ipfixprobe-process-bstats PRIVATE

‎src/plugins/process/common/CMakeLists.txt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
add_library(ipfixprobe-process-tls-parser STATIC
2-
tlsParser/tls_parser.hpp
3-
tlsParser/tls_parser.cpp
2+
tlsParser/tlsParser.hpp
3+
tlsParser/tlsParser.cpp
44
)
55

66
target_include_directories(ipfixprobe-process-tls-parser PUBLIC
77
${CMAKE_SOURCE_DIR}/include
8+
${CMAKE_SOURCE_DIR}/include/ipfixprobe/processPlugin
9+
${CMAKE_SOURCE_DIR}/src/plugins/process/common
10+
${Boost_INCLUDE_DIRS}
811
)
912

13+
target_link_libraries(ipfixprobe-process-tls-parser PRIVATE ${Boost_LIBRARIES})
14+
15+
1016
set_property(TARGET ipfixprobe-process-tls-parser
1117
PROPERTY POSITION_INDEPENDENT_CODE ON
1218
)

‎src/plugins/process/dns/CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@ project(ipfixprobe-process-dns VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-dns
33
add_library(ipfixprobe-process-dns MODULE
44
src/dns.cpp
55
src/dns.hpp
6+
src/dnsData.hpp
7+
src/dnsFields.hpp
68
)
79

810
set_target_properties(ipfixprobe-process-dns PROPERTIES
911
CXX_VISIBILITY_PRESET hidden
1012
VISIBILITY_INLINES_HIDDEN YES
1113
)
1214

13-
target_include_directories(ipfixprobe-process-dns PRIVATE
15+
target_include_directories(ipfixprobe-process-dns PRIVATE
1416
${CMAKE_SOURCE_DIR}/include/
17+
${CMAKE_SOURCE_DIR}/include/ipfixprobe/processPlugin
18+
${CMAKE_SOURCE_DIR}/include/ipfixprobe/pluginFactory
1519
${CMAKE_SOURCE_DIR}/src/plugins/process/common
1620
)
1721

0 commit comments

Comments
 (0)