diff --git a/src/ip_reassembly/ip_reassembly.cpp b/src/ip_reassembly/ip_reassembly.cpp index b325f97..0628377 100644 --- a/src/ip_reassembly/ip_reassembly.cpp +++ b/src/ip_reassembly/ip_reassembly.cpp @@ -10,7 +10,7 @@ #include "crc32_hash.h" #include "packet_def.h" #include "packet_utils.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "ip_reassembly.h" #define IP_REASSEMBLE_DEBUG(format, ...) LOG_DEBUG("ip_reassembly", format, ##__VA_ARGS__) diff --git a/src/ip_reassembly/test/gtest_utils.h b/src/ip_reassembly/test/gtest_utils.h index fcff07a..f05ea17 100644 --- a/src/ip_reassembly/test/gtest_utils.h +++ b/src/ip_reassembly/test/gtest_utils.h @@ -15,7 +15,7 @@ extern "C" #include "packet_def.h" #include "packet_dump.h" #include "packet_utils.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" static inline void packet_set_ipv4_src_addr(struct packet *pkt, uint32_t saddr) diff --git a/src/packet/CMakeLists.txt b/src/packet/CMakeLists.txt index 7ce8900..29498a0 100644 --- a/src/packet/CMakeLists.txt +++ b/src/packet/CMakeLists.txt @@ -1,5 +1,5 @@ add_library(packet - packet_parse.cpp + packet_parser.cpp packet_craft.cpp packet_filter.cpp packet_dump.cpp diff --git a/src/packet/packet_craft.cpp b/src/packet/packet_craft.cpp index 47b6de4..b334d37 100644 --- a/src/packet/packet_craft.cpp +++ b/src/packet/packet_craft.cpp @@ -11,7 +11,7 @@ #include "packet_def.h" #include "packet_utils.h" #include "packet_layer.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_craft.h" #define PACKET_CRAFT_LOG_DEBUG(format, ...) LOG_DEBUG("packet craft", format, ##__VA_ARGS__) diff --git a/src/packet/packet_dump.cpp b/src/packet/packet_dump.cpp index a4ccfd7..3095b56 100644 --- a/src/packet/packet_dump.cpp +++ b/src/packet/packet_dump.cpp @@ -19,7 +19,7 @@ #include "vxlan_utils.h" #include "packet_def.h" #include "packet_dump.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_utils.h" #define PACKET_DUMP_LOG_ERROR(format, ...) LOG_ERROR("packet dump", format, ##__VA_ARGS__) diff --git a/src/packet/packet_parse.cpp b/src/packet/packet_parser.cpp similarity index 99% rename from src/packet/packet_parse.cpp rename to src/packet/packet_parser.cpp index 204c981..d32c2e8 100644 --- a/src/packet/packet_parse.cpp +++ b/src/packet/packet_parser.cpp @@ -17,7 +17,7 @@ #include "vlan_utils.h" #include "vxlan_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #define likely(expr) __builtin_expect((expr), 1) #define unlikely(expr) __builtin_expect((expr), 0) diff --git a/src/packet/packet_parse.h b/src/packet/packet_parser.h similarity index 100% rename from src/packet/packet_parse.h rename to src/packet/packet_parser.h diff --git a/src/packet/test/CMakeLists.txt b/src/packet/test/CMakeLists.txt index 1308737..b8acc77 100644 --- a/src/packet/test/CMakeLists.txt +++ b/src/packet/test/CMakeLists.txt @@ -43,8 +43,8 @@ target_link_libraries(gtest_gtp2_utils packet gtest) add_executable(gtest_packet_frag gtest_packet_frag.cpp) target_link_libraries(gtest_packet_frag packet gtest) -add_executable(gtest_packet_parse gtest_packet_parse.cpp) -target_link_libraries(gtest_packet_parse packet gtest) +add_executable(gtest_packet_parser gtest_packet_parser.cpp) +target_link_libraries(gtest_packet_parser packet gtest) add_executable(gtest_packet_craft gtest_packet_craft.cpp) target_link_libraries(gtest_packet_craft packet gtest) @@ -68,6 +68,6 @@ gtest_discover_tests(gtest_l2tp_utils) gtest_discover_tests(gtest_gtp1_utils) gtest_discover_tests(gtest_gtp2_utils) gtest_discover_tests(gtest_packet_frag) -gtest_discover_tests(gtest_packet_parse) +gtest_discover_tests(gtest_packet_parser) gtest_discover_tests(gtest_packet_craft) gtest_discover_tests(gtest_packet_ldbc) \ No newline at end of file diff --git a/src/packet/test/gtest_packet_craft.cpp b/src/packet/test/gtest_packet_craft.cpp index fa954c2..ec5fbd5 100644 --- a/src/packet/test/gtest_packet_craft.cpp +++ b/src/packet/test/gtest_packet_craft.cpp @@ -11,7 +11,7 @@ #include "packet_def.h" #include "packet_dump.h" #include "packet_layer.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_craft.h" #include "packet_utils.h" diff --git a/src/packet/test/gtest_packet_filter.cpp b/src/packet/test/gtest_packet_filter.cpp index f625628..02fbe7a 100644 --- a/src/packet/test/gtest_packet_filter.cpp +++ b/src/packet/test/gtest_packet_filter.cpp @@ -2,7 +2,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_filter.h" /****************************************************************************** diff --git a/src/packet/test/gtest_packet_frag.cpp b/src/packet/test/gtest_packet_frag.cpp index 82ad3c1..80d18f4 100644 --- a/src/packet/test/gtest_packet_frag.cpp +++ b/src/packet/test/gtest_packet_frag.cpp @@ -2,7 +2,7 @@ #include "packet_def.h" #include "packet_utils.h" -#include "packet_parse.h" +#include "packet_parser.h" /****************************************************************************** * [Protocols in frame: eth:ethertype:ip:data] diff --git a/src/packet/test/gtest_packet_ldbc.cpp b/src/packet/test/gtest_packet_ldbc.cpp index 2f74c77..ece3623 100644 --- a/src/packet/test/gtest_packet_ldbc.cpp +++ b/src/packet/test/gtest_packet_ldbc.cpp @@ -3,7 +3,7 @@ #include "packet_def.h" #include "packet_ldbc.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_dump.h" /****************************************************************************** diff --git a/src/packet/test/gtest_packet_parse.cpp b/src/packet/test/gtest_packet_parser.cpp similarity index 99% rename from src/packet/test/gtest_packet_parse.cpp rename to src/packet/test/gtest_packet_parser.cpp index 5d1c1e0..2433281 100644 --- a/src/packet/test/gtest_packet_parse.cpp +++ b/src/packet/test/gtest_packet_parser.cpp @@ -3,7 +3,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_utils.h" #include "packet_layer.h" #include "packet_dump.h" diff --git a/src/packet/test/gtest_tunnel.cpp b/src/packet/test/gtest_tunnel.cpp index 04e1f32..ead8f95 100644 --- a/src/packet/test/gtest_tunnel.cpp +++ b/src/packet/test/gtest_tunnel.cpp @@ -6,7 +6,7 @@ #include "ip6_utils.h" #include "vxlan_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_dump.h" #include "stellar/layer.h" #include "stellar/tunnel.h" diff --git a/src/packet_io/dumpfile_io.cpp b/src/packet_io/dumpfile_io.cpp index 812642b..8c2a5fb 100644 --- a/src/packet_io/dumpfile_io.cpp +++ b/src/packet_io/dumpfile_io.cpp @@ -16,7 +16,7 @@ #include "packet_def.h" #include "packet_ldbc.h" #include "packet_utils.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_dump.h" #include "lock_free_queue.h" diff --git a/src/packet_io/marsio_io.cpp b/src/packet_io/marsio_io.cpp index 0bada37..3f8aa3d 100644 --- a/src/packet_io/marsio_io.cpp +++ b/src/packet_io/marsio_io.cpp @@ -9,7 +9,7 @@ #include "marsio_io.h" #include "packet_def.h" #include "packet_utils.h" -#include "packet_parse.h" +#include "packet_parser.h" #define PACKET_IO_LOG_ERROR(format, ...) LOG_ERROR("marsio", format, ##__VA_ARGS__) diff --git a/src/session/test/gtest_case_tcp_fast_open.cpp b/src/session/test/gtest_case_tcp_fast_open.cpp index d836dfb..2199903 100644 --- a/src/session/test/gtest_case_tcp_fast_open.cpp +++ b/src/session/test/gtest_case_tcp_fast_open.cpp @@ -2,7 +2,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "snowflake.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_filter_tcp_dupkt.cpp b/src/session/test/gtest_filter_tcp_dupkt.cpp index 172bd19..e8926d5 100644 --- a/src/session/test/gtest_filter_tcp_dupkt.cpp +++ b/src/session/test/gtest_filter_tcp_dupkt.cpp @@ -2,7 +2,7 @@ #include "ip4_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_overload_evict_tcp_sess.cpp b/src/session/test/gtest_overload_evict_tcp_sess.cpp index 5e164d8..da0134f 100644 --- a/src/session/test/gtest_overload_evict_tcp_sess.cpp +++ b/src/session/test/gtest_overload_evict_tcp_sess.cpp @@ -3,7 +3,7 @@ #include "utils.h" #include "ip4_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_overload_evict_udp_sess.cpp b/src/session/test/gtest_overload_evict_udp_sess.cpp index 4280e70..66af20d 100644 --- a/src/session/test/gtest_overload_evict_udp_sess.cpp +++ b/src/session/test/gtest_overload_evict_udp_sess.cpp @@ -3,7 +3,7 @@ #include "utils.h" #include "ip4_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_sess_mgr_tcp_reassembly.cpp b/src/session/test/gtest_sess_mgr_tcp_reassembly.cpp index a6a6c32..dd3e7cc 100644 --- a/src/session/test/gtest_sess_mgr_tcp_reassembly.cpp +++ b/src/session/test/gtest_sess_mgr_tcp_reassembly.cpp @@ -2,7 +2,7 @@ #include "ip4_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_state_tcp_active_to_closing.cpp b/src/session/test/gtest_state_tcp_active_to_closing.cpp index f5fc887..8f60c8d 100644 --- a/src/session/test/gtest_state_tcp_active_to_closing.cpp +++ b/src/session/test/gtest_state_tcp_active_to_closing.cpp @@ -4,7 +4,7 @@ #include "tuple.h" #include "tcp_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "snowflake.h" #include "session_utils.h" diff --git a/src/session/test/gtest_state_tcp_init_to_opening.cpp b/src/session/test/gtest_state_tcp_init_to_opening.cpp index 347c9f4..5dc7d39 100644 --- a/src/session/test/gtest_state_tcp_init_to_opening.cpp +++ b/src/session/test/gtest_state_tcp_init_to_opening.cpp @@ -4,7 +4,7 @@ #include "tuple.h" #include "ip4_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "snowflake.h" #include "session_utils.h" diff --git a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp b/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp index 2b11649..7618ca3 100644 --- a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp +++ b/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp @@ -3,7 +3,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "snowflake.h" #include "session_utils.h" diff --git a/src/session/test/gtest_state_tcp_opening_to_active.cpp b/src/session/test/gtest_state_tcp_opening_to_active.cpp index 4a9aed1..1b02e44 100644 --- a/src/session/test/gtest_state_tcp_opening_to_active.cpp +++ b/src/session/test/gtest_state_tcp_opening_to_active.cpp @@ -3,7 +3,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "snowflake.h" #include "session_utils.h" diff --git a/src/session/test/gtest_state_tcp_opening_to_closing.cpp b/src/session/test/gtest_state_tcp_opening_to_closing.cpp index 21087e1..dc16289 100644 --- a/src/session/test/gtest_state_tcp_opening_to_closing.cpp +++ b/src/session/test/gtest_state_tcp_opening_to_closing.cpp @@ -4,7 +4,7 @@ #include "tuple.h" #include "tcp_utils.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "snowflake.h" #include "session_utils.h" diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp b/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp index 890bcda..e221606 100644 --- a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp +++ b/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp @@ -3,7 +3,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "snowflake.h" #include "session_utils.h" diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp b/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp index 69a7f0f..291275f 100644 --- a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp +++ b/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp @@ -3,7 +3,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "snowflake.h" #include "session_utils.h" diff --git a/src/session/test/gtest_timeout_tcp_data.cpp b/src/session/test/gtest_timeout_tcp_data.cpp index 00d1504..16c76ec 100644 --- a/src/session/test/gtest_timeout_tcp_data.cpp +++ b/src/session/test/gtest_timeout_tcp_data.cpp @@ -2,7 +2,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_timeout_tcp_handshake.cpp b/src/session/test/gtest_timeout_tcp_handshake.cpp index 3331a12..3ca59f9 100644 --- a/src/session/test/gtest_timeout_tcp_handshake.cpp +++ b/src/session/test/gtest_timeout_tcp_handshake.cpp @@ -2,7 +2,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_timeout_tcp_init.cpp b/src/session/test/gtest_timeout_tcp_init.cpp index c90b044..0d1edda 100644 --- a/src/session/test/gtest_timeout_tcp_init.cpp +++ b/src/session/test/gtest_timeout_tcp_init.cpp @@ -2,7 +2,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/src/session/test/gtest_timeout_udp_data.cpp b/src/session/test/gtest_timeout_udp_data.cpp index dec7028..9bca188 100644 --- a/src/session/test/gtest_timeout_udp_data.cpp +++ b/src/session/test/gtest_timeout_udp_data.cpp @@ -2,7 +2,7 @@ #include "tuple.h" #include "packet_def.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_layer.h" #include "session_utils.h" #include "session_manager.h" diff --git a/test/packet_tool/packet_tool.cpp b/test/packet_tool/packet_tool.cpp index bcd7868..24d0048 100644 --- a/test/packet_tool/packet_tool.cpp +++ b/test/packet_tool/packet_tool.cpp @@ -9,7 +9,7 @@ #include "udp_utils.h" #include "packet_def.h" #include "packet_layer.h" -#include "packet_parse.h" +#include "packet_parser.h" #include "packet_dump.h" #include "packet_utils.h"