gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename packet_private.h to packet_internal.h

Browse Source
This commit is contained in:
luwenpeng
2024-09-19 16:10:59 +08:00
parent d9c3ac2448
commit bf8ba97165
38 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
infra/ip_reassembly/ip_reassembly.c
View File

@@ -10,7 +10,7 @@
#include "ip_reassembly.h" #include "ip_reassembly.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_helper.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_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__) #define IP_REASSEMBLE_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "ip_reassembly", format, ##__VA_ARGS__)

2
infra/ip_reassembly/test/gtest_utils.h
View File

@@ -9,7 +9,7 @@ extern "C"
#include "packet_helper.h" #include "packet_helper.h"
#include "ip_reassembly.h" #include "ip_reassembly.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_dump.h" #include "packet_dump.h"
#include "packet_parser.h" #include "packet_parser.h"

2
infra/packet_io/marsio_io.c
View File

@@ -8,7 +8,7 @@
#include "marsio_io.h" #include "marsio_io.h"
#include "log_private.h" #include "log_private.h"
#include "packet_parser.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__) #define MARSIO_IO_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "marsio", format, ##__VA_ARGS__)

2
infra/packet_io/pcap_io.c
View File

@@ -15,7 +15,7 @@
#include "pcap_io.h" #include "pcap_io.h"
#include "packet_dump.h" #include "packet_dump.h"
#include "packet_parser.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_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__) #define PCAP_IO_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "pcap io", format, ##__VA_ARGS__)

2
infra/packet_manager/packet_builder.c
View File

@@ -4,7 +4,7 @@
#include "log_private.h" #include "log_private.h"
#include "packet_helper.h" #include "packet_helper.h"
#include "packet_parser.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_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__) #define PACKET_CRAFT_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet craft", format, ##__VA_ARGS__)

2
infra/packet_manager/packet_dump.c
View File

@@ -9,7 +9,7 @@
#include "packet_dump.h" #include "packet_dump.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_helper.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__) #define PACKET_DUMP_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet dump", format, ##__VA_ARGS__)

2
infra/packet_manager/packet_filter.c
View File

@@ -1,6 +1,6 @@
#include "dablooms.h" #include "dablooms.h"
#include "packet_filter.h" #include "packet_filter.h"
#include "packet_private.h" #include "packet_internal.h"
struct packet_key struct packet_key
{ {

0
infra/packet_manager/packet_private.h → infra/packet_manager/packet_internal.h
View File

2
infra/packet_manager/packet_manager.c
View File

@@ -2,7 +2,7 @@
#include "utils.h" #include "utils.h"
#include "stellar/mq.h" #include "stellar/mq.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_manager_private.h" #include "packet_manager_private.h"
#define PACKET_MANAGER_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet manager", format, ##__VA_ARGS__) #define PACKET_MANAGER_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet manager", format, ##__VA_ARGS__)

2
infra/packet_manager/packet_parser.c
View File

@@ -6,7 +6,7 @@
#include "log_private.h" #include "log_private.h"
#include "packet_helper.h" #include "packet_helper.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#define PACKET_PARSE_LOG_DEBUG(format, ...) // STELLAR_LOG_DEBUG(__thread_local_logger, "packet parse", format, ##__VA_ARGS__) #define PACKET_PARSE_LOG_DEBUG(format, ...) // STELLAR_LOG_DEBUG(__thread_local_logger, "packet parse", format, ##__VA_ARGS__)

2
infra/packet_manager/packet_utils.c
View File

@@ -4,7 +4,7 @@
#include "uthash.h" #include "uthash.h"
#include "log_private.h" #include "log_private.h"
#include "packet_helper.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__) #define PACKET_LOG_ERROR(format, ...) STELLAR_LOG_ERROR(__thread_local_logger, "packet", format, ##__VA_ARGS__)

2
infra/packet_manager/test/gtest_packet_builder.cpp
View File

@@ -3,7 +3,7 @@
#include "checksum.h" #include "checksum.h"
#include "packet_helper.h" #include "packet_helper.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_dump.h" #include "packet_dump.h"
#include "packet_parser.h" #include "packet_parser.h"

2
infra/packet_manager/test/gtest_packet_filter.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_filter.h" #include "packet_filter.h"

2
infra/packet_manager/test/gtest_packet_frag.cpp
View File

@@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
/****************************************************************************** /******************************************************************************

2
infra/packet_manager/test/gtest_packet_ldbc.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_dump.h" #include "packet_dump.h"

2
infra/packet_manager/test/gtest_packet_manager.cpp
View File

@@ -2,7 +2,7 @@
#include "stellar/mq.h" #include "stellar/mq.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_manager_private.h" #include "packet_manager_private.h"
/****************************************************************************** /******************************************************************************

2
infra/packet_manager/test/gtest_packet_parser.cpp
View File

@@ -2,7 +2,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_dump.h" #include "packet_dump.h"

2
infra/packet_manager/test/gtest_tunnel.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packet_helper.h" #include "packet_helper.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_dump.h" #include "packet_dump.h"

2
infra/session_manager/session_private.h
View File

@@ -10,7 +10,7 @@ extern "C"
#include "tuple.h" #include "tuple.h"
#include "uthash.h" #include "uthash.h"
#include "timeout.h" #include "timeout.h"
#include "packet_private.h" #include "packet_internal.h"
#include "stellar/session.h" #include "stellar/session.h"
#include "tcp_reassembly.h" #include "tcp_reassembly.h"

2
infra/session_manager/test/gtest_case_tcp_fast_open.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_filter_tcp_dupkt.cpp
View File

@@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_overload_evict_tcp_sess.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "utils.h" #include "utils.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_overload_evict_udp_sess.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "utils.h" #include "utils.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_sess_mgr_scan.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "session_private.h" #include "session_private.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "default_config.h" #include "default_config.h"
#include "test_packets.h" #include "test_packets.h"

2
infra/session_manager/test/gtest_sess_mgr_tcp_reassembly.cpp
View File

@@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp
View File

@@ -2,7 +2,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp
View File

@@ -2,7 +2,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp
View File

@@ -2,7 +2,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_state_tcp_opening_to_active.cpp
View File

@@ -2,7 +2,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp
View File

@@ -2,7 +2,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp
View File

@@ -2,7 +2,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_state_udp_init_to_opening_to_closing.cpp
View File

@@ -2,7 +2,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_timeout_tcp_data.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_timeout_tcp_handshake.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_timeout_tcp_init.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

2
infra/session_manager/test/gtest_timeout_udp_data.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "tuple.h" #include "tuple.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "session_private.h" #include "session_private.h"
#include "default_config.h" #include "default_config.h"

13
infra/stellar_core.c
View File

@@ -15,12 +15,10 @@
#include "packet_io.h" #include "packet_io.h"
#include "log_private.h" #include "log_private.h"
#include "stellar_stat.h" #include "stellar_stat.h"
#include "packet_private.h" #include "packet_internal.h"
#include "session_private.h" #include "session_private.h"
#include "session_manager.h" #include "session_manager.h"
#define CORE_LOG_FATAL(format, ...) STELLAR_LOG_FATAL(__thread_local_logger, "core", format, ##__VA_ARGS__) #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_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__) #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++) for (uint64_t j = 0; j < nr_sess_cleaned; j++)
{ {
sess = cleaned_sess[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); session_manager_free_session(sess_mgr, sess);
} }
} }
@@ -212,8 +210,8 @@ static void *worker_thread(void *arg)
{ {
goto fast_path; goto fast_path;
} }
//struct exdata_runtime *per_sess_exdata=session_exdata_runtime_new(st); // struct exdata_runtime *per_sess_exdata=session_exdata_runtime_new(st);
//session_set_user_data(sess, per_sess_exdata); // session_set_user_data(sess, per_sess_exdata);
} }
else 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"); CORE_LOG_ERROR("unable to create stellar stat");
goto error_out; 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); 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) if (runtime->mod_mgr == NULL)
{ {
@@ -570,7 +568,6 @@ void stellar_reload_log_level(struct stellar *st)
* Stellar Utility Function * Stellar Utility Function
******************************************************************************/ ******************************************************************************/
// only send user build packet, can't send packet which come from network // only send user build packet, can't send packet which come from network
void stellar_send_build_packet(struct stellar *st, struct packet *pkt) void stellar_send_build_packet(struct stellar *st, struct packet *pkt)
{ {

2
test/packet_tool/packet_tool.c
View File

@@ -2,7 +2,7 @@
#include <pcap/pcap.h> #include <pcap/pcap.h>
#include "packet_helper.h" #include "packet_helper.h"
#include "packet_private.h" #include "packet_internal.h"
#include "packet_parser.h" #include "packet_parser.h"
#include "packet_dump.h" #include "packet_dump.h"