diff options
| author | luwenpeng <[email protected]> | 2024-09-19 16:10:59 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2024-09-20 16:59:19 +0800 |
| commit | bf8ba9716552b81e4d4ae6b0fe8950ec6f113665 (patch) | |
| tree | 9668a6d1ae2af1c3bce75e96665a60d461edcca4 | |
| parent | d9c3ac24489d68aae8b43148aec0b1e90fa0ea00 (diff) | |
rename packet_private.h to packet_internal.h
38 files changed, 41 insertions, 44 deletions
diff --git a/infra/ip_reassembly/ip_reassembly.c b/infra/ip_reassembly/ip_reassembly.c index fa4f314..72bb472 100644 --- a/infra/ip_reassembly/ip_reassembly.c +++ b/infra/ip_reassembly/ip_reassembly.c @@ -10,7 +10,7 @@ #include "ip_reassembly.h" #include "packet_parser.h" #include "packet_helper.h" -#include "packet_private.h" +#include "packet_internal.h" #define IP_REASSEMBLE_DEBUG(format, ...) STELLAR_LOG_DEBUG(__thread_local_logger, "ip_reassembly", format, ##__VA_ARGS__) #define IP_REASSEMBLE_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "ip_reassembly", format, ##__VA_ARGS__) diff --git a/infra/ip_reassembly/test/gtest_utils.h b/infra/ip_reassembly/test/gtest_utils.h index ede80af..a499403 100644 --- a/infra/ip_reassembly/test/gtest_utils.h +++ b/infra/ip_reassembly/test/gtest_utils.h @@ -9,7 +9,7 @@ extern "C" #include "packet_helper.h" #include "ip_reassembly.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_dump.h" #include "packet_parser.h" diff --git a/infra/packet_io/marsio_io.c b/infra/packet_io/marsio_io.c index c7486d2..409b7b3 100644 --- a/infra/packet_io/marsio_io.c +++ b/infra/packet_io/marsio_io.c @@ -8,7 +8,7 @@ #include "marsio_io.h" #include "log_private.h" #include "packet_parser.h" -#include "packet_private.h" +#include "packet_internal.h" #define MARSIO_IO_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "marsio", format, ##__VA_ARGS__) diff --git a/infra/packet_io/pcap_io.c b/infra/packet_io/pcap_io.c index 1bf37a0..cc7372d 100644 --- a/infra/packet_io/pcap_io.c +++ b/infra/packet_io/pcap_io.c @@ -15,7 +15,7 @@ #include "pcap_io.h" #include "packet_dump.h" #include "packet_parser.h" -#include "packet_private.h" +#include "packet_internal.h" #define PCAP_IO_LOG_FATAL(format, ...) STELLAR_LOG_FATAL(__thread_local_logger, "pcap io", format, ##__VA_ARGS__) #define PCAP_IO_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "pcap io", format, ##__VA_ARGS__) diff --git a/infra/packet_manager/packet_builder.c b/infra/packet_manager/packet_builder.c index fc95a81..bd6b100 100644 --- a/infra/packet_manager/packet_builder.c +++ b/infra/packet_manager/packet_builder.c @@ -4,7 +4,7 @@ #include "log_private.h" #include "packet_helper.h" #include "packet_parser.h" -#include "packet_private.h" +#include "packet_internal.h" #define PACKET_CRAFT_LOG_DEBUG(format, ...) STELLAR_LOG_DEBUG(__thread_local_logger, "packet craft", format, ##__VA_ARGS__) #define PACKET_CRAFT_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet craft", format, ##__VA_ARGS__) diff --git a/infra/packet_manager/packet_dump.c b/infra/packet_manager/packet_dump.c index 8f12d2d..e1c3ece 100644 --- a/infra/packet_manager/packet_dump.c +++ b/infra/packet_manager/packet_dump.c @@ -9,7 +9,7 @@ #include "packet_dump.h" #include "packet_parser.h" #include "packet_helper.h" -#include "packet_private.h" +#include "packet_internal.h" #define PACKET_DUMP_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet dump", format, ##__VA_ARGS__) diff --git a/infra/packet_manager/packet_filter.c b/infra/packet_manager/packet_filter.c index 6167dbc..cf9181c 100644 --- a/infra/packet_manager/packet_filter.c +++ b/infra/packet_manager/packet_filter.c @@ -1,6 +1,6 @@ #include "dablooms.h" #include "packet_filter.h" -#include "packet_private.h" +#include "packet_internal.h" struct packet_key { diff --git a/infra/packet_manager/packet_private.h b/infra/packet_manager/packet_internal.h index e312e1b..e312e1b 100644 --- a/infra/packet_manager/packet_private.h +++ b/infra/packet_manager/packet_internal.h diff --git a/infra/packet_manager/packet_manager.c b/infra/packet_manager/packet_manager.c index 9555c18..ffc5771 100644 --- a/infra/packet_manager/packet_manager.c +++ b/infra/packet_manager/packet_manager.c @@ -2,7 +2,7 @@ #include "utils.h" #include "stellar/mq.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_manager_private.h" #define PACKET_MANAGER_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet manager", format, ##__VA_ARGS__) diff --git a/infra/packet_manager/packet_parser.c b/infra/packet_manager/packet_parser.c index c206f19..d41b93a 100644 --- a/infra/packet_manager/packet_parser.c +++ b/infra/packet_manager/packet_parser.c @@ -6,7 +6,7 @@ #include "log_private.h" #include "packet_helper.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #define PACKET_PARSE_LOG_DEBUG(format, ...) // STELLAR_LOG_DEBUG(__thread_local_logger, "packet parse", format, ##__VA_ARGS__) diff --git a/infra/packet_manager/packet_utils.c b/infra/packet_manager/packet_utils.c index 86cc00b..cf546db 100644 --- a/infra/packet_manager/packet_utils.c +++ b/infra/packet_manager/packet_utils.c @@ -4,7 +4,7 @@ #include "uthash.h" #include "log_private.h" #include "packet_helper.h" -#include "packet_private.h" +#include "packet_internal.h" #define PACKET_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet", format, ##__VA_ARGS__) diff --git a/infra/packet_manager/test/gtest_packet_builder.cpp b/infra/packet_manager/test/gtest_packet_builder.cpp index 0bbf2bb..18c8aac 100644 --- a/infra/packet_manager/test/gtest_packet_builder.cpp +++ b/infra/packet_manager/test/gtest_packet_builder.cpp @@ -3,7 +3,7 @@ #include "checksum.h" #include "packet_helper.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_dump.h" #include "packet_parser.h" diff --git a/infra/packet_manager/test/gtest_packet_filter.cpp b/infra/packet_manager/test/gtest_packet_filter.cpp index 3263b90..dd76720 100644 --- a/infra/packet_manager/test/gtest_packet_filter.cpp +++ b/infra/packet_manager/test/gtest_packet_filter.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "packet_filter.h" diff --git a/infra/packet_manager/test/gtest_packet_frag.cpp b/infra/packet_manager/test/gtest_packet_frag.cpp index 222925b..ce82312 100644 --- a/infra/packet_manager/test/gtest_packet_frag.cpp +++ b/infra/packet_manager/test/gtest_packet_frag.cpp @@ -1,6 +1,6 @@ #include <gtest/gtest.h> -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" /****************************************************************************** diff --git a/infra/packet_manager/test/gtest_packet_ldbc.cpp b/infra/packet_manager/test/gtest_packet_ldbc.cpp index e2dd430..f124ff9 100644 --- a/infra/packet_manager/test/gtest_packet_ldbc.cpp +++ b/infra/packet_manager/test/gtest_packet_ldbc.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include <arpa/inet.h> -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "packet_dump.h" diff --git a/infra/packet_manager/test/gtest_packet_manager.cpp b/infra/packet_manager/test/gtest_packet_manager.cpp index 062a782..4b9a7b3 100644 --- a/infra/packet_manager/test/gtest_packet_manager.cpp +++ b/infra/packet_manager/test/gtest_packet_manager.cpp @@ -2,7 +2,7 @@ #include "stellar/mq.h" #include "packet_parser.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_manager_private.h" /****************************************************************************** diff --git a/infra/packet_manager/test/gtest_packet_parser.cpp b/infra/packet_manager/test/gtest_packet_parser.cpp index 4fa3985..ef31564 100644 --- a/infra/packet_manager/test/gtest_packet_parser.cpp +++ b/infra/packet_manager/test/gtest_packet_parser.cpp @@ -2,7 +2,7 @@ #include <arpa/inet.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "packet_dump.h" diff --git a/infra/packet_manager/test/gtest_tunnel.cpp b/infra/packet_manager/test/gtest_tunnel.cpp index 6d92cf0..8b5653d 100644 --- a/infra/packet_manager/test/gtest_tunnel.cpp +++ b/infra/packet_manager/test/gtest_tunnel.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "packet_helper.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "packet_dump.h" diff --git a/infra/session_manager/session_private.h b/infra/session_manager/session_private.h index 3afca43..be0ef21 100644 --- a/infra/session_manager/session_private.h +++ b/infra/session_manager/session_private.h @@ -10,7 +10,7 @@ extern "C" #include "tuple.h" #include "uthash.h" #include "timeout.h" -#include "packet_private.h" +#include "packet_internal.h" #include "stellar/session.h" #include "tcp_reassembly.h" diff --git a/infra/session_manager/test/gtest_case_tcp_fast_open.cpp b/infra/session_manager/test/gtest_case_tcp_fast_open.cpp index 22f5908..e3aff50 100644 --- a/infra/session_manager/test/gtest_case_tcp_fast_open.cpp +++ b/infra/session_manager/test/gtest_case_tcp_fast_open.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_filter_tcp_dupkt.cpp b/infra/session_manager/test/gtest_filter_tcp_dupkt.cpp index 0d70b48..a3586de 100644 --- a/infra/session_manager/test/gtest_filter_tcp_dupkt.cpp +++ b/infra/session_manager/test/gtest_filter_tcp_dupkt.cpp @@ -1,6 +1,6 @@ #include <gtest/gtest.h> -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_overload_evict_tcp_sess.cpp b/infra/session_manager/test/gtest_overload_evict_tcp_sess.cpp index 27d9e16..c667a77 100644 --- a/infra/session_manager/test/gtest_overload_evict_tcp_sess.cpp +++ b/infra/session_manager/test/gtest_overload_evict_tcp_sess.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "utils.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_overload_evict_udp_sess.cpp b/infra/session_manager/test/gtest_overload_evict_udp_sess.cpp index 9dd0312..88a4ade 100644 --- a/infra/session_manager/test/gtest_overload_evict_udp_sess.cpp +++ b/infra/session_manager/test/gtest_overload_evict_udp_sess.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "utils.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_sess_mgr_scan.cpp b/infra/session_manager/test/gtest_sess_mgr_scan.cpp index 8266471..dd5adbc 100644 --- a/infra/session_manager/test/gtest_sess_mgr_scan.cpp +++ b/infra/session_manager/test/gtest_sess_mgr_scan.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "session_private.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "default_config.h" #include "test_packets.h" diff --git a/infra/session_manager/test/gtest_sess_mgr_tcp_reassembly.cpp b/infra/session_manager/test/gtest_sess_mgr_tcp_reassembly.cpp index 802a3cd..02806df 100644 --- a/infra/session_manager/test/gtest_sess_mgr_tcp_reassembly.cpp +++ b/infra/session_manager/test/gtest_sess_mgr_tcp_reassembly.cpp @@ -1,6 +1,6 @@ #include <gtest/gtest.h> -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp b/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp index 8e07351..2ee46be 100644 --- a/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp +++ b/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp @@ -2,7 +2,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp b/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp index 98f3be5..d719f23 100644 --- a/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp +++ b/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp @@ -2,7 +2,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp b/infra/session_manager/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp index 8335559..f68c568 100644 --- a/infra/session_manager/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp +++ b/infra/session_manager/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp @@ -2,7 +2,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_state_tcp_opening_to_active.cpp b/infra/session_manager/test/gtest_state_tcp_opening_to_active.cpp index 7bf2a32..fa9b08d 100644 --- a/infra/session_manager/test/gtest_state_tcp_opening_to_active.cpp +++ b/infra/session_manager/test/gtest_state_tcp_opening_to_active.cpp @@ -2,7 +2,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp b/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp index c7c1831..30d10a0 100644 --- a/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp +++ b/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp @@ -2,7 +2,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp index 759e921..9bb8345 100644 --- a/infra/session_manager/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp +++ b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp @@ -2,7 +2,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_state_udp_init_to_opening_to_closing.cpp b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_closing.cpp index 2387521..fc35b7b 100644 --- a/infra/session_manager/test/gtest_state_udp_init_to_opening_to_closing.cpp +++ b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_closing.cpp @@ -2,7 +2,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_timeout_tcp_data.cpp b/infra/session_manager/test/gtest_timeout_tcp_data.cpp index d7800ef..5132265 100644 --- a/infra/session_manager/test/gtest_timeout_tcp_data.cpp +++ b/infra/session_manager/test/gtest_timeout_tcp_data.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_timeout_tcp_handshake.cpp b/infra/session_manager/test/gtest_timeout_tcp_handshake.cpp index df5044d..74963f4 100644 --- a/infra/session_manager/test/gtest_timeout_tcp_handshake.cpp +++ b/infra/session_manager/test/gtest_timeout_tcp_handshake.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_timeout_tcp_init.cpp b/infra/session_manager/test/gtest_timeout_tcp_init.cpp index bf68b3c..547e4bb 100644 --- a/infra/session_manager/test/gtest_timeout_tcp_init.cpp +++ b/infra/session_manager/test/gtest_timeout_tcp_init.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/session_manager/test/gtest_timeout_udp_data.cpp b/infra/session_manager/test/gtest_timeout_udp_data.cpp index 2874849..b9d8548 100644 --- a/infra/session_manager/test/gtest_timeout_udp_data.cpp +++ b/infra/session_manager/test/gtest_timeout_udp_data.cpp @@ -1,7 +1,7 @@ #include <gtest/gtest.h> #include "tuple.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "session_private.h" #include "default_config.h" diff --git a/infra/stellar_core.c b/infra/stellar_core.c index 136c200..bec285c 100644 --- a/infra/stellar_core.c +++ b/infra/stellar_core.c @@ -15,12 +15,10 @@ #include "packet_io.h" #include "log_private.h" #include "stellar_stat.h" -#include "packet_private.h" +#include "packet_internal.h" #include "session_private.h" #include "session_manager.h" - - #define CORE_LOG_FATAL(format, ...) STELLAR_LOG_FATAL(__thread_local_logger, "core", format, ##__VA_ARGS__) #define CORE_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "core", format, ##__VA_ARGS__) #define CORE_LOG_DEBUG(format, ...) STELLAR_LOG_DEBUG(__thread_local_logger, "core", format, ##__VA_ARGS__) @@ -113,7 +111,7 @@ static inline void clean_session(struct session_manager *sess_mgr, uint64_t now_ for (uint64_t j = 0; j < nr_sess_cleaned; j++) { sess = cleaned_sess[j]; - //session_exdata_runtime_free(session_get_user_data(sess)); + // session_exdata_runtime_free(session_get_user_data(sess)); session_manager_free_session(sess_mgr, sess); } } @@ -212,8 +210,8 @@ static void *worker_thread(void *arg) { goto fast_path; } - //struct exdata_runtime *per_sess_exdata=session_exdata_runtime_new(st); - //session_set_user_data(sess, per_sess_exdata); + // struct exdata_runtime *per_sess_exdata=session_exdata_runtime_new(st); + // session_set_user_data(sess, per_sess_exdata); } else { @@ -452,7 +450,7 @@ struct stellar *stellar_new(const char *stellar_cfg_file, const char *plugin_cfg CORE_LOG_ERROR("unable to create stellar stat"); goto error_out; } - runtime->mq_schema=mq_schema_new(); + runtime->mq_schema = mq_schema_new(); runtime->mod_mgr = stellar_module_manager_new(plugin_cfg_file, config->pkt_io_cfg->nr_worker_thread, runtime->mq_schema); if (runtime->mod_mgr == NULL) { @@ -570,7 +568,6 @@ void stellar_reload_log_level(struct stellar *st) * Stellar Utility Function ******************************************************************************/ - // only send user build packet, can't send packet which come from network void stellar_send_build_packet(struct stellar *st, struct packet *pkt) { diff --git a/test/packet_tool/packet_tool.c b/test/packet_tool/packet_tool.c index 2fa2541..65753fd 100644 --- a/test/packet_tool/packet_tool.c +++ b/test/packet_tool/packet_tool.c @@ -2,7 +2,7 @@ #include <pcap/pcap.h> #include "packet_helper.h" -#include "packet_private.h" +#include "packet_internal.h" #include "packet_parser.h" #include "packet_dump.h" |
