diff --git a/infra/CMakeLists.txt b/infra/CMakeLists.txt index aec3d43..5d73a33 100644 --- a/infra/CMakeLists.txt +++ b/infra/CMakeLists.txt @@ -1,4 +1,4 @@ -set(INFRA exdata mq tuple packet_parser packet_io ip_reassembly tcp_reassembly session_manager plugin_manager) +set(INFRA exdata mq tuple packet_manager packet_io ip_reassembly tcp_reassembly session_manager plugin_manager) set(DEPS bitmap dablooms interval_tree logger nmx_pool rbtree timeout toml) #set(DECODERS http lpi) set(WHOLE_ARCHIVE ${DEPS} ${INFRA} ${DECODERS}) diff --git a/infra/ip_reassembly/CMakeLists.txt b/infra/ip_reassembly/CMakeLists.txt index 5403fd7..0bcc4be 100644 --- a/infra/ip_reassembly/CMakeLists.txt +++ b/infra/ip_reassembly/CMakeLists.txt @@ -1,6 +1,6 @@ add_library(ip_reassembly ip_reassembly.c) target_include_directories(ip_reassembly PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_include_directories(ip_reassembly PUBLIC ${CMAKE_SOURCE_DIR}/deps/crc32) -target_link_libraries(ip_reassembly packet_parser) +target_link_libraries(ip_reassembly packet_manager) add_subdirectory(test) \ No newline at end of file diff --git a/infra/packet_io/CMakeLists.txt b/infra/packet_io/CMakeLists.txt index 4d0baa9..8edf21d 100644 --- a/infra/packet_io/CMakeLists.txt +++ b/infra/packet_io/CMakeLists.txt @@ -1,3 +1,3 @@ add_library(packet_io pcap_io.c marsio_io.c packet_io.c) target_include_directories(packet_io PUBLIC ${CMAKE_CURRENT_LIST_DIR}) -target_link_libraries(packet_io marsio pcap packet_parser) \ No newline at end of file +target_link_libraries(packet_io marsio pcap packet_manager) \ No newline at end of file diff --git a/infra/packet_manager/CMakeLists.txt b/infra/packet_manager/CMakeLists.txt new file mode 100644 index 0000000..5a3949f --- /dev/null +++ b/infra/packet_manager/CMakeLists.txt @@ -0,0 +1,15 @@ +add_library(packet_manager + packet_utils.c + packet_parser.c + packet_builder.c + packet_filter.c + packet_dump.c + checksum.c) +target_include_directories(packet_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR}) +target_include_directories(packet_manager PUBLIC ${CMAKE_SOURCE_DIR}/deps/uthash) +target_include_directories(packet_manager PUBLIC ${CMAKE_SOURCE_DIR}/deps/logger) +target_include_directories(packet_manager PUBLIC ${CMAKE_SOURCE_DIR}/include) +target_include_directories(packet_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra) +target_link_libraries(packet_manager tuple logger dablooms) + +add_subdirectory(test) \ No newline at end of file diff --git a/infra/packet_parser/checksum.c b/infra/packet_manager/checksum.c similarity index 100% rename from infra/packet_parser/checksum.c rename to infra/packet_manager/checksum.c diff --git a/infra/packet_parser/checksum.h b/infra/packet_manager/checksum.h similarity index 100% rename from infra/packet_parser/checksum.h rename to infra/packet_manager/checksum.h diff --git a/infra/packet_parser/packet_builder.c b/infra/packet_manager/packet_builder.c similarity index 100% rename from infra/packet_parser/packet_builder.c rename to infra/packet_manager/packet_builder.c diff --git a/infra/packet_parser/packet_dump.c b/infra/packet_manager/packet_dump.c similarity index 100% rename from infra/packet_parser/packet_dump.c rename to infra/packet_manager/packet_dump.c diff --git a/infra/packet_parser/packet_dump.h b/infra/packet_manager/packet_dump.h similarity index 100% rename from infra/packet_parser/packet_dump.h rename to infra/packet_manager/packet_dump.h diff --git a/infra/packet_parser/packet_filter.c b/infra/packet_manager/packet_filter.c similarity index 100% rename from infra/packet_parser/packet_filter.c rename to infra/packet_manager/packet_filter.c diff --git a/infra/packet_parser/packet_filter.h b/infra/packet_manager/packet_filter.h similarity index 100% rename from infra/packet_parser/packet_filter.h rename to infra/packet_manager/packet_filter.h diff --git a/infra/packet_parser/packet_helper.h b/infra/packet_manager/packet_helper.h similarity index 100% rename from infra/packet_parser/packet_helper.h rename to infra/packet_manager/packet_helper.h diff --git a/infra/packet_parser/packet_parser.c b/infra/packet_manager/packet_parser.c similarity index 100% rename from infra/packet_parser/packet_parser.c rename to infra/packet_manager/packet_parser.c diff --git a/infra/packet_parser/packet_parser.h b/infra/packet_manager/packet_parser.h similarity index 100% rename from infra/packet_parser/packet_parser.h rename to infra/packet_manager/packet_parser.h diff --git a/infra/packet_parser/packet_private.h b/infra/packet_manager/packet_private.h similarity index 100% rename from infra/packet_parser/packet_private.h rename to infra/packet_manager/packet_private.h diff --git a/infra/packet_parser/packet_utils.c b/infra/packet_manager/packet_utils.c similarity index 100% rename from infra/packet_parser/packet_utils.c rename to infra/packet_manager/packet_utils.c diff --git a/infra/packet_parser/test/CMakeLists.txt b/infra/packet_manager/test/CMakeLists.txt similarity index 60% rename from infra/packet_parser/test/CMakeLists.txt rename to infra/packet_manager/test/CMakeLists.txt index f68a294..3d12184 100644 --- a/infra/packet_parser/test/CMakeLists.txt +++ b/infra/packet_manager/test/CMakeLists.txt @@ -1,59 +1,59 @@ add_executable(gtest_tunnel gtest_tunnel.cpp) -target_link_libraries(gtest_tunnel packet_parser gtest) +target_link_libraries(gtest_tunnel packet_manager gtest) add_executable(gtest_udp_utils gtest_udp_utils.cpp) -target_link_libraries(gtest_udp_utils packet_parser gtest) +target_link_libraries(gtest_udp_utils packet_manager gtest) add_executable(gtest_tcp_utils gtest_tcp_utils.cpp) -target_link_libraries(gtest_tcp_utils packet_parser gtest) +target_link_libraries(gtest_tcp_utils packet_manager gtest) add_executable(gtest_ip4_utils gtest_ip4_utils.cpp) -target_link_libraries(gtest_ip4_utils packet_parser gtest) +target_link_libraries(gtest_ip4_utils packet_manager gtest) add_executable(gtest_ip6_utils gtest_ip6_utils.cpp) -target_link_libraries(gtest_ip6_utils packet_parser gtest) +target_link_libraries(gtest_ip6_utils packet_manager gtest) add_executable(gtest_mpls_utils gtest_mpls_utils.cpp) -target_link_libraries(gtest_mpls_utils packet_parser gtest) +target_link_libraries(gtest_mpls_utils packet_manager gtest) add_executable(gtest_eth_utils gtest_eth_utils.cpp) -target_link_libraries(gtest_eth_utils packet_parser gtest) +target_link_libraries(gtest_eth_utils packet_manager gtest) add_executable(gtest_vlan_utils gtest_vlan_utils.cpp) -target_link_libraries(gtest_vlan_utils packet_parser gtest) +target_link_libraries(gtest_vlan_utils packet_manager gtest) add_executable(gtest_vxlan_utils gtest_vxlan_utils.cpp) -target_link_libraries(gtest_vxlan_utils packet_parser gtest) +target_link_libraries(gtest_vxlan_utils packet_manager gtest) add_executable(gtest_gre0_utils gtest_gre0_utils.cpp) -target_link_libraries(gtest_gre0_utils packet_parser gtest) +target_link_libraries(gtest_gre0_utils packet_manager gtest) add_executable(gtest_gre1_utils gtest_gre1_utils.cpp) -target_link_libraries(gtest_gre1_utils packet_parser gtest) +target_link_libraries(gtest_gre1_utils packet_manager gtest) add_executable(gtest_l2tp_utils gtest_l2tp_utils.cpp) -target_link_libraries(gtest_l2tp_utils packet_parser gtest) +target_link_libraries(gtest_l2tp_utils packet_manager gtest) add_executable(gtest_gtp1_utils gtest_gtp1_utils.cpp) -target_link_libraries(gtest_gtp1_utils packet_parser gtest) +target_link_libraries(gtest_gtp1_utils packet_manager gtest) add_executable(gtest_gtp2_utils gtest_gtp2_utils.cpp) -target_link_libraries(gtest_gtp2_utils packet_parser gtest) +target_link_libraries(gtest_gtp2_utils packet_manager gtest) add_executable(gtest_packet_frag gtest_packet_frag.cpp) -target_link_libraries(gtest_packet_frag packet_parser gtest) +target_link_libraries(gtest_packet_frag packet_manager gtest) add_executable(gtest_packet_parser gtest_packet_parser.cpp) -target_link_libraries(gtest_packet_parser packet_parser gtest) +target_link_libraries(gtest_packet_parser packet_manager gtest) add_executable(gtest_packet_builder gtest_packet_builder.cpp) -target_link_libraries(gtest_packet_builder packet_parser gtest) +target_link_libraries(gtest_packet_builder packet_manager gtest) add_executable(gtest_packet_filter gtest_packet_filter.cpp) -target_link_libraries(gtest_packet_filter packet_parser gtest) +target_link_libraries(gtest_packet_filter packet_manager gtest) add_executable(gtest_packet_ldbc gtest_packet_ldbc.cpp) -target_link_libraries(gtest_packet_ldbc packet_parser gtest) +target_link_libraries(gtest_packet_ldbc packet_manager gtest) include(GoogleTest) gtest_discover_tests(gtest_tunnel) diff --git a/infra/packet_parser/test/gtest_eth_utils.cpp b/infra/packet_manager/test/gtest_eth_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_eth_utils.cpp rename to infra/packet_manager/test/gtest_eth_utils.cpp diff --git a/infra/packet_parser/test/gtest_gre0_utils.cpp b/infra/packet_manager/test/gtest_gre0_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_gre0_utils.cpp rename to infra/packet_manager/test/gtest_gre0_utils.cpp diff --git a/infra/packet_parser/test/gtest_gre1_utils.cpp b/infra/packet_manager/test/gtest_gre1_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_gre1_utils.cpp rename to infra/packet_manager/test/gtest_gre1_utils.cpp diff --git a/infra/packet_parser/test/gtest_gtp1_utils.cpp b/infra/packet_manager/test/gtest_gtp1_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_gtp1_utils.cpp rename to infra/packet_manager/test/gtest_gtp1_utils.cpp diff --git a/infra/packet_parser/test/gtest_gtp2_utils.cpp b/infra/packet_manager/test/gtest_gtp2_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_gtp2_utils.cpp rename to infra/packet_manager/test/gtest_gtp2_utils.cpp diff --git a/infra/packet_parser/test/gtest_ip4_utils.cpp b/infra/packet_manager/test/gtest_ip4_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_ip4_utils.cpp rename to infra/packet_manager/test/gtest_ip4_utils.cpp diff --git a/infra/packet_parser/test/gtest_ip6_utils.cpp b/infra/packet_manager/test/gtest_ip6_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_ip6_utils.cpp rename to infra/packet_manager/test/gtest_ip6_utils.cpp diff --git a/infra/packet_parser/test/gtest_l2tp_utils.cpp b/infra/packet_manager/test/gtest_l2tp_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_l2tp_utils.cpp rename to infra/packet_manager/test/gtest_l2tp_utils.cpp diff --git a/infra/packet_parser/test/gtest_mpls_utils.cpp b/infra/packet_manager/test/gtest_mpls_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_mpls_utils.cpp rename to infra/packet_manager/test/gtest_mpls_utils.cpp diff --git a/infra/packet_parser/test/gtest_packet_builder.cpp b/infra/packet_manager/test/gtest_packet_builder.cpp similarity index 100% rename from infra/packet_parser/test/gtest_packet_builder.cpp rename to infra/packet_manager/test/gtest_packet_builder.cpp diff --git a/infra/packet_parser/test/gtest_packet_filter.cpp b/infra/packet_manager/test/gtest_packet_filter.cpp similarity index 100% rename from infra/packet_parser/test/gtest_packet_filter.cpp rename to infra/packet_manager/test/gtest_packet_filter.cpp diff --git a/infra/packet_parser/test/gtest_packet_frag.cpp b/infra/packet_manager/test/gtest_packet_frag.cpp similarity index 100% rename from infra/packet_parser/test/gtest_packet_frag.cpp rename to infra/packet_manager/test/gtest_packet_frag.cpp diff --git a/infra/packet_parser/test/gtest_packet_ldbc.cpp b/infra/packet_manager/test/gtest_packet_ldbc.cpp similarity index 100% rename from infra/packet_parser/test/gtest_packet_ldbc.cpp rename to infra/packet_manager/test/gtest_packet_ldbc.cpp diff --git a/infra/packet_parser/test/gtest_packet_parser.cpp b/infra/packet_manager/test/gtest_packet_parser.cpp similarity index 100% rename from infra/packet_parser/test/gtest_packet_parser.cpp rename to infra/packet_manager/test/gtest_packet_parser.cpp diff --git a/infra/packet_parser/test/gtest_tcp_utils.cpp b/infra/packet_manager/test/gtest_tcp_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_tcp_utils.cpp rename to infra/packet_manager/test/gtest_tcp_utils.cpp diff --git a/infra/packet_parser/test/gtest_tunnel.cpp b/infra/packet_manager/test/gtest_tunnel.cpp similarity index 100% rename from infra/packet_parser/test/gtest_tunnel.cpp rename to infra/packet_manager/test/gtest_tunnel.cpp diff --git a/infra/packet_parser/test/gtest_udp_utils.cpp b/infra/packet_manager/test/gtest_udp_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_udp_utils.cpp rename to infra/packet_manager/test/gtest_udp_utils.cpp diff --git a/infra/packet_parser/test/gtest_vlan_utils.cpp b/infra/packet_manager/test/gtest_vlan_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_vlan_utils.cpp rename to infra/packet_manager/test/gtest_vlan_utils.cpp diff --git a/infra/packet_parser/test/gtest_vxlan_utils.cpp b/infra/packet_manager/test/gtest_vxlan_utils.cpp similarity index 100% rename from infra/packet_parser/test/gtest_vxlan_utils.cpp rename to infra/packet_manager/test/gtest_vxlan_utils.cpp diff --git a/infra/packet_parser/CMakeLists.txt b/infra/packet_parser/CMakeLists.txt deleted file mode 100644 index f9e4995..0000000 --- a/infra/packet_parser/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -add_library(packet_parser - packet_utils.c - packet_parser.c - packet_builder.c - packet_filter.c - packet_dump.c - checksum.c) -target_include_directories(packet_parser PUBLIC ${CMAKE_CURRENT_LIST_DIR}) -target_include_directories(packet_parser PUBLIC ${CMAKE_SOURCE_DIR}/deps/uthash) -target_include_directories(packet_parser PUBLIC ${CMAKE_SOURCE_DIR}/deps/logger) -target_include_directories(packet_parser PUBLIC ${CMAKE_SOURCE_DIR}/include) -target_include_directories(packet_parser PUBLIC ${CMAKE_SOURCE_DIR}/infra) -target_link_libraries(packet_parser tuple logger dablooms) - -add_subdirectory(test) \ No newline at end of file diff --git a/infra/plugin_manager/CMakeLists.txt b/infra/plugin_manager/CMakeLists.txt index 313b56d..fed928c 100644 --- a/infra/plugin_manager/CMakeLists.txt +++ b/infra/plugin_manager/CMakeLists.txt @@ -2,7 +2,7 @@ add_library(plugin_manager plugin_manager.c) target_include_directories(plugin_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/include/) target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/) -target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/packet_parser) +target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/packet_manager) target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/session_manager) target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/tuple) target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/deps/) diff --git a/infra/session_manager/CMakeLists.txt b/infra/session_manager/CMakeLists.txt index 2df7c74..5404fde 100644 --- a/infra/session_manager/CMakeLists.txt +++ b/infra/session_manager/CMakeLists.txt @@ -10,6 +10,6 @@ add_library(session_manager target_include_directories(session_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/) target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/include) -target_link_libraries(session_manager timeout packet_parser tcp_reassembly) +target_link_libraries(session_manager timeout packet_manager tcp_reassembly) add_subdirectory(test) \ No newline at end of file diff --git a/test/debug_plugin/CMakeLists.txt b/test/debug_plugin/CMakeLists.txt index 38be076..707044e 100644 --- a/test/debug_plugin/CMakeLists.txt +++ b/test/debug_plugin/CMakeLists.txt @@ -1,6 +1,6 @@ # build libdebug_plugin.so add_library(debug_plugin SHARED debug_plugin.c) -target_link_libraries(debug_plugin stellar_lib session_manager packet_parser) +target_link_libraries(debug_plugin stellar_lib session_manager packet_manager) target_include_directories(debug_plugin PUBLIC ${CMAKE_SOURCE_DIR}/include/) target_include_directories(debug_plugin PUBLIC ${CMAKE_SOURCE_DIR}/infra) set_target_properties(debug_plugin PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/version.map") diff --git a/test/decoders/session_flags/CMakeLists.txt b/test/decoders/session_flags/CMakeLists.txt index 2ed5407..7e76d4a 100644 --- a/test/decoders/session_flags/CMakeLists.txt +++ b/test/decoders/session_flags/CMakeLists.txt @@ -41,7 +41,7 @@ set_target_properties(session_flags_test_main ) set(LINK_FLAGS "-rdynamic") -target_link_libraries(session_flags_test_main PUBLIC gtest cjson-static stellar_lib -Wl,--whole-archive packet_parser -Wl,--no-whole-archive) +target_link_libraries(session_flags_test_main PUBLIC gtest cjson-static stellar_lib -Wl,--whole-archive packet_manager -Wl,--no-whole-archive) add_subdirectory(test_based_on_stellar) diff --git a/test/packet_tool/CMakeLists.txt b/test/packet_tool/CMakeLists.txt index 981c32a..c008e95 100644 --- a/test/packet_tool/CMakeLists.txt +++ b/test/packet_tool/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(packet_tool packet_tool.c) -target_link_libraries(packet_tool packet_parser pcap) +target_link_libraries(packet_tool packet_manager pcap) file(COPY split_pcap.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY cmp_layers.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file