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

rename session_get0_readable_addr() to session_get_readable_addr()

Browse Source
This commit is contained in:
luwenpeng
2024-11-01 15:37:26 +08:00
parent da9e15264d
commit f9de6019a8
16 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
decoders/session_flags/session_flags.cpp
View File

@@ -598,7 +598,7 @@ static void session_flags_calculate_randomness_by_sts(struct session_flags_plugi
stat->result.identify[session_flags_random_looking_mask] = all_pkts; stat->result.identify[session_flags_random_looking_mask] = all_pkts;
} }
STELLAR_LOG_DEBUG(sf_plugin_info->log_handle, SESSION_FLAGS_LOG_MODULE, "[%s] calculate random looking flags, flags:0x%x, pkts_num:%d", session_get0_readable_addr(session), stat->result.random_looking_flags, all_pkts); STELLAR_LOG_DEBUG(sf_plugin_info->log_handle, SESSION_FLAGS_LOG_MODULE, "[%s] calculate random looking flags, flags:0x%x, pkts_num:%d", session_get_readable_addr(session), stat->result.random_looking_flags, all_pkts);
} }
static void session_flags_calculate_random_looking(struct session_flags_plugin_info *sf_plugin_info, struct session_flags_stat *stat, struct session *session, int topic_id, uint64_t all_pkts) static void session_flags_calculate_random_looking(struct session_flags_plugin_info *sf_plugin_info, struct session_flags_stat *stat, struct session *session, int topic_id, uint64_t all_pkts)

4
decoders/session_flags/session_flags_plugin.cpp
View File

@@ -122,7 +122,7 @@ void session_flags_entry(struct session *session, int topic_id, const void *msg,
{ {
session_flags_topic_free_cb(flags_msg, NULL); session_flags_topic_free_cb(flags_msg, NULL);
STELLAR_LOG_FATAL(sf_plugin_info->log_handle, SESSION_FLAGS_LOG_MODULE, "[%s] publish session flags message failed, flags:0x%x, pkts_num:%d", session_get0_readable_addr(session), flags_result->flags, pkts_num); STELLAR_LOG_FATAL(sf_plugin_info->log_handle, SESSION_FLAGS_LOG_MODULE, "[%s] publish session flags message failed, flags:0x%x, pkts_num:%d", session_get_readable_addr(session), flags_result->flags, pkts_num);
return; return;
} }
@@ -132,7 +132,7 @@ void session_flags_entry(struct session *session, int topic_id, const void *msg,
"[%s] flags:0x%x, pkts_num:%d\n \ "[%s] flags:0x%x, pkts_num:%d\n \
c2s_iter: bulky: %f, CBR: %f, download: %f, interactive: %f, pseudo_unidirectional: %f, streaming: %f, CBR_CV: %f\n \ c2s_iter: bulky: %f, CBR: %f, download: %f, interactive: %f, pseudo_unidirectional: %f, streaming: %f, CBR_CV: %f\n \
s2c_iter: bulky: %f, CBR: %f, download: %f, interactive: %f, pseudo_unidirectional: %f, streaming: %f, CBR_CV: %f\n \ s2c_iter: bulky: %f, CBR: %f, download: %f, interactive: %f, pseudo_unidirectional: %f, streaming: %f, CBR_CV: %f\n \
iter_cnt: %d, bidirectional: %f\n", session_get0_readable_addr(session), ctx->history_flags, pkts_num, iter_cnt: %d, bidirectional: %f\n", session_get_readable_addr(session), ctx->history_flags, pkts_num,
stat->iter.c2s.bulky, stat->iter.c2s.CBR, stat->iter.c2s.download, stat->iter.c2s.interactive, stat->iter.c2s.pseudo_unidirectional, stat->iter.c2s.streaming, session_flags_calculate_CV(&stat->iter.c2s.omean), stat->iter.c2s.bulky, stat->iter.c2s.CBR, stat->iter.c2s.download, stat->iter.c2s.interactive, stat->iter.c2s.pseudo_unidirectional, stat->iter.c2s.streaming, session_flags_calculate_CV(&stat->iter.c2s.omean),
stat->iter.s2c.bulky, stat->iter.s2c.CBR, stat->iter.s2c.download, stat->iter.s2c.interactive, stat->iter.s2c.pseudo_unidirectional, stat->iter.s2c.streaming, session_flags_calculate_CV(&stat->iter.s2c.omean), stat->iter.s2c.bulky, stat->iter.s2c.CBR, stat->iter.s2c.download, stat->iter.s2c.interactive, stat->iter.s2c.pseudo_unidirectional, stat->iter.s2c.streaming, session_flags_calculate_CV(&stat->iter.s2c.omean),
stat->iter.iter_cnt, stat->iter.bidirectional); stat->iter.iter_cnt, stat->iter.bidirectional);

2
include/stellar/session.h
View File

@@ -140,7 +140,7 @@ uint64_t session_get_id(const struct session *sess);
uint64_t session_get_timestamp(const struct session *sess, enum session_timestamp type); uint64_t session_get_timestamp(const struct session *sess, enum session_timestamp type);
uint64_t session_get_stat(const struct session *sess, enum flow_type type, enum session_stat stat); uint64_t session_get_stat(const struct session *sess, enum flow_type type, enum session_stat stat);
const char *session_get0_readable_addr(const struct session *sess); const char *session_get_readable_addr(const struct session *sess);
void session_set_discard(struct session *sess); void session_set_discard(struct session *sess);

2
infra/session_manager/session_internal.h
View File

@@ -82,7 +82,7 @@ void session_set_id(struct session *sess, uint64_t id);
void session_set_tuple6(struct session *sess, const struct tuple6 *tuple); void session_set_tuple6(struct session *sess, const struct tuple6 *tuple);
const struct tuple6 *session_get_tuple6(const struct session *sess); const struct tuple6 *session_get_tuple6(const struct session *sess);
// const char *session_get0_readable_addr(const struct session *sess); // const char *session_get_readable_addr(const struct session *sess);
void session_set_direction(struct session *sess, enum session_direction dir); void session_set_direction(struct session *sess, enum session_direction dir);
enum session_direction session_get_direction(const struct session *sess); enum session_direction session_get_direction(const struct session *sess);

2
infra/session_manager/session_manager_rte.c
View File

@@ -146,7 +146,7 @@ static int tcp_init(struct session_manager_rte *sess_mgr_rte, struct session *se
return -1; return -1;
} }
SESSION_MANAGER_LOG_DEBUG("session %lu %s new c2s tcp tcp_reass %p, s2c tcp tcp_reass %p", session_get_id(sess), session_get0_readable_addr(sess), SESSION_MANAGER_LOG_DEBUG("session %lu %s new c2s tcp tcp_reass %p, s2c tcp tcp_reass %p", session_get_id(sess), session_get_readable_addr(sess),
sess->tcp_halfs[FLOW_TYPE_C2S].tcp_reass, sess->tcp_halfs[FLOW_TYPE_S2C].tcp_reass); sess->tcp_halfs[FLOW_TYPE_C2S].tcp_reass, sess->tcp_halfs[FLOW_TYPE_S2C].tcp_reass);
return 0; return 0;
} }

2
infra/session_manager/session_transition.c
View File

@@ -167,6 +167,6 @@ void session_transition_log(struct session *sess, enum session_state curr_state,
session_inputs_to_str(inputs, reason, sizeof(reason)); session_inputs_to_str(inputs, reason, sizeof(reason));
SESSION_TRANSITION_LOG_INFO("%s session %lu %s (%s) %s -> %s", SESSION_TRANSITION_LOG_INFO("%s session %lu %s (%s) %s -> %s",
session_type_to_str(session_get_type(sess)), session_type_to_str(session_get_type(sess)),
session_get_id(sess), session_get0_readable_addr(sess), reason, session_get_id(sess), session_get_readable_addr(sess), reason,
session_state_to_str(curr_state), session_state_to_str(next_state)); session_state_to_str(curr_state), session_state_to_str(next_state));
} }

6
infra/session_manager/session_utils.c
View File

@@ -30,7 +30,7 @@ const struct tuple6 *session_get_tuple6(const struct session *sess)
return &sess->tuple; return &sess->tuple;
} }
const char *session_get0_readable_addr(const struct session *sess) const char *session_get_readable_addr(const struct session *sess)
{ {
return sess->tuple_str; return sess->tuple_str;
} }
@@ -368,7 +368,7 @@ int session_to_str(const struct session *sess, int bref, char *buff, int size)
{ {
used += snprintf(buff + used, size - used, "session id: %lu, addr: %s, type: %s, state: %s, dir: %s, c2s_rx_pkts: %lu, s2c_rx_pkts: %lu", used += snprintf(buff + used, size - used, "session id: %lu, addr: %s, type: %s, state: %s, dir: %s, c2s_rx_pkts: %lu, s2c_rx_pkts: %lu",
session_get_id(sess), session_get_id(sess),
session_get0_readable_addr(sess), session_get_readable_addr(sess),
session_type_to_str(session_get_type(sess)), session_type_to_str(session_get_type(sess)),
session_state_to_str(session_get_current_state(sess)), session_state_to_str(session_get_current_state(sess)),
flow_direction_to_str(session_get_flow_type(sess)), flow_direction_to_str(session_get_flow_type(sess)),
@@ -381,7 +381,7 @@ int session_to_str(const struct session *sess, int bref, char *buff, int size)
used += snprintf(buff + used, size - used, "\"id\":%" PRIu64 ",", session_get_id(sess)); used += snprintf(buff + used, size - used, "\"id\":%" PRIu64 ",", session_get_id(sess));
used += snprintf(buff + used, size - used, "\"start_timestamp_ms\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_START)); used += snprintf(buff + used, size - used, "\"start_timestamp_ms\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_START));
used += snprintf(buff + used, size - used, "\"last_timestamp_ms\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); used += snprintf(buff + used, size - used, "\"last_timestamp_ms\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
used += snprintf(buff + used, size - used, "\"tuple\":\"%s\",", session_get0_readable_addr(sess)); used += snprintf(buff + used, size - used, "\"tuple\":\"%s\",", session_get_readable_addr(sess));
used += snprintf(buff + used, size - used, "\"type\":\"%s\",", session_type_to_str(session_get_type(sess))); used += snprintf(buff + used, size - used, "\"type\":\"%s\",", session_type_to_str(session_get_type(sess)));
used += snprintf(buff + used, size - used, "\"state\":\"%s\",", session_state_to_str(session_get_current_state(sess))); used += snprintf(buff + used, size - used, "\"state\":\"%s\",", session_state_to_str(session_get_current_state(sess)));
used += snprintf(buff + used, size - used, "\"closing_reason\":\"%s\",", closing_reason_to_str(session_get_closing_reason(sess))); used += snprintf(buff + used, size - used, "\"closing_reason\":\"%s\",", closing_reason_to_str(session_get_closing_reason(sess)));

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

@@ -7,7 +7,7 @@ static inline void mached_session_print(const char *title, struct session_manage
{ {
struct session *sess = session_manager_rte_lookup_session_by_id(sess_mgr_rte, mached_sess_id[i]); struct session *sess = session_manager_rte_lookup_session_by_id(sess_mgr_rte, mached_sess_id[i]);
printf("session id: %lu, addr: %s, type: %s, state: %s, start: %lu, last: %lu\n", printf("session id: %lu, addr: %s, type: %s, state: %s, start: %lu, last: %lu\n",
mached_sess_id[i], session_get0_readable_addr(sess), mached_sess_id[i], session_get_readable_addr(sess),
session_type_to_str(session_get_type(sess)), session_type_to_str(session_get_type(sess)),
session_state_to_str(session_get_current_state(sess)), session_state_to_str(session_get_current_state(sess)),
session_get_timestamp(sess, SESSION_TIMESTAMP_START), session_get_timestamp(sess, SESSION_TIMESTAMP_START),

2
infra/version.map
View File

@@ -36,7 +36,7 @@ global:
session_get_id; session_get_id;
session_get_timestamp; session_get_timestamp;
session_get_stat; session_get_stat;
session_get0_readable_addr; session_get_readable_addr;
session_set_discard; session_set_discard;
session_get_exdata; session_get_exdata;
session_set_exdata; session_set_exdata;

6
test/decoders/http/http_test_plug.cpp
View File

@@ -313,10 +313,10 @@ static void http_decoder_test_update_session_tuple4(struct session *sess, struct
{ {
if (gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION] == NULL) if (gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION] == NULL)
{ {
const char *human_addr_cstr = session_get0_readable_addr(sess); const char *human_addr_cstr = session_get_readable_addr(sess);
if (NULL == human_addr_cstr) if (NULL == human_addr_cstr)
{ {
fprintf(stderr, "can't get readable_addr, to use session_get0_readable_addr() the sapp_log.conf level must <= INFO\n"); fprintf(stderr, "can't get readable_addr, to use session_get_readable_addr() the sapp_log.conf level must <= INFO\n");
return; return;
} }
char result_name[MAX_KEY_STR_LEN] = {0}; char result_name[MAX_KEY_STR_LEN] = {0};
@@ -596,7 +596,7 @@ extern "C" void http_decoder_tunnel_entry(struct session *sess, int topic_id, co
gtest_plug_exdata = (struct gtest_plug_exdata_t *)calloc(1, sizeof(struct gtest_plug_exdata_t)); gtest_plug_exdata = (struct gtest_plug_exdata_t *)calloc(1, sizeof(struct gtest_plug_exdata_t));
session_exdata_set(sess, g_exdata_idx, gtest_plug_exdata); session_exdata_set(sess, g_exdata_idx, gtest_plug_exdata);
} }
const char *human_addr_cstr = session_get0_readable_addr(sess); const char *human_addr_cstr = session_get_readable_addr(sess);
gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_REQ] = cJSON_CreateObject(); gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_REQ] = cJSON_CreateObject();
gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_RES] = cJSON_CreateObject(); gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_RES] = cJSON_CreateObject();
gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION] = cJSON_CreateObject(); gtest_plug_exdata->result_jnode[HTTP_TRANSACTION_SESSION] = cJSON_CreateObject();

2
test/decoders/session_flags/dummy.c
View File

@@ -73,7 +73,7 @@ enum flow_type session_get_flow_type(const struct session *sess)
return FLOW_TYPE_C2S; return FLOW_TYPE_C2S;
} }
const char *session_get0_readable_addr(const struct session *sess) const char *session_get_readable_addr(const struct session *sess)
{ {
UNUSED(sess); UNUSED(sess);

2
test/decoders/socks/dummy.c
View File

@@ -95,7 +95,7 @@ int session_mq_publish_message(struct session *sess, int topic_id, void *msg)
return 0; return 0;
} }
const char *session_get0_readable_addr(const struct session *sess) const char *session_get_readable_addr(const struct session *sess)
{ {
UNUSED(sess); UNUSED(sess);

2
test/decoders/stratum/stratum_test_plugin.cpp
View File

@@ -44,7 +44,7 @@ void test_stratum_decoder_on_message(struct session *session, int topic_id, cons
cJSON *stratum_json = cJSON_CreateObject(); cJSON *stratum_json = cJSON_CreateObject();
cJSON_AddItemToObject(root, "stratum", stratum_json); cJSON_AddItemToObject(root, "stratum", stratum_json);
cJSON_AddStringToObject(stratum_json, "Tuple4", session_get0_readable_addr(session)); cJSON_AddStringToObject(stratum_json, "Tuple4", session_get_readable_addr(session));
cJSON_AddStringToObject(stratum_json, "type", stratum->type == ETH ? "ETH" : "OTHER"); cJSON_AddStringToObject(stratum_json, "type", stratum->type == ETH ? "ETH" : "OTHER");
cJSON_AddStringToObject(stratum_json, "mining_pools", (char *)stratum->mining_pools.iov_base); cJSON_AddStringToObject(stratum_json, "mining_pools", (char *)stratum->mining_pools.iov_base);
cJSON_AddStringToObject(stratum_json, "mining_program", (char *)stratum->mining_program.iov_base); cJSON_AddStringToObject(stratum_json, "mining_program", (char *)stratum->mining_program.iov_base);

2
test/lpi_plus/gtest_lpip_module.c
View File

@@ -58,7 +58,7 @@ static void gtest_lpip_exdata_free(int idx __attribute__((unused)), void *ex_ptr
if(env==NULL || test_appid_exdata ==NULL)return; if(env==NULL || test_appid_exdata ==NULL)return;
cJSON *ctx = cJSON_CreateObject(); cJSON *ctx = cJSON_CreateObject();
cJSON_AddStringToObject(ctx, "Tuple4", session_get0_readable_addr(test_appid_exdata->sess)); cJSON_AddStringToObject(ctx, "Tuple4", session_get_readable_addr(test_appid_exdata->sess));
enum session_type type = session_get_type(test_appid_exdata->sess); enum session_type type = session_get_type(test_appid_exdata->sess);
if (type == SESSION_TYPE_TCP) if (type == SESSION_TYPE_TCP)
{ {

6
test/packet_inject/packet_inject.c
View File

@@ -422,14 +422,14 @@ static void build_and_send_tcp_packet(struct inject_plugin_ctx *ctx, struct sess
static void *on_sess_new(struct session *sess, void *plugin_ctx) static void *on_sess_new(struct session *sess, void *plugin_ctx)
{ {
struct inject_plugin_ctx *ctx = (struct inject_plugin_ctx *)plugin_ctx; struct inject_plugin_ctx *ctx = (struct inject_plugin_ctx *)plugin_ctx;
INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session new: %s", session_get0_readable_addr(sess)); INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session new: %s", session_get_readable_addr(sess));
return NULL; return NULL;
} }
static void on_sess_free(struct session *sess, void *sess_ctx, void *plugin_ctx) static void on_sess_free(struct session *sess, void *sess_ctx, void *plugin_ctx)
{ {
struct inject_plugin_ctx *ctx = (struct inject_plugin_ctx *)plugin_ctx; struct inject_plugin_ctx *ctx = (struct inject_plugin_ctx *)plugin_ctx;
INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session free: %s", session_get0_readable_addr(sess)); INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session free: %s", session_get_readable_addr(sess));
} }
static void on_sess_msg(struct session *sess, int topic_id, const void *msg, void *sess_ctx, void *plugin_ctx) static void on_sess_msg(struct session *sess, int topic_id, const void *msg, void *sess_ctx, void *plugin_ctx)
@@ -445,7 +445,7 @@ static void on_sess_msg(struct session *sess, int topic_id, const void *msg, voi
struct config *config = &ctx->config; struct config *config = &ctx->config;
enum flow_type type = session_get_flow_type(sess); enum flow_type type = session_get_flow_type(sess);
INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session msg: %s (C2S received packets: %lu, S2C received packets: %lu)", INJTECT_PLUGIN_LOG_INFO(ctx->logger, "handle session msg: %s (C2S received packets: %lu, S2C received packets: %lu)",
session_get0_readable_addr(sess), session_get_readable_addr(sess),
session_get_stat(sess, FLOW_TYPE_C2S, STAT_RAW_PACKETS_RECEIVED), session_get_stat(sess, FLOW_TYPE_C2S, STAT_RAW_PACKETS_RECEIVED),
session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED)); session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED));

10
test/session_debugger/session_debugger.c
View File

@@ -109,22 +109,22 @@ static struct session_debugger_exdata *session_debugger_exdata_new(struct sessio
if (session_get_type(sess) == SESSION_TYPE_TCP) if (session_get_type(sess) == SESSION_TYPE_TCP)
{ {
memset(buff, 0, sizeof(buff)); memset(buff, 0, sizeof(buff));
sprintf(buff, "./log/session_debugger.TCP_%s_C2S.hexdump", session_get0_readable_addr(sess)); sprintf(buff, "./log/session_debugger.TCP_%s_C2S.hexdump", session_get_readable_addr(sess));
exdata->c2s_tcp_seg_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644); exdata->c2s_tcp_seg_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
memset(buff, 0, sizeof(buff)); memset(buff, 0, sizeof(buff));
sprintf(buff, "./log/session_debugger.TCP_%s_S2C.hexdump", session_get0_readable_addr(sess)); sprintf(buff, "./log/session_debugger.TCP_%s_S2C.hexdump", session_get_readable_addr(sess));
exdata->s2c_tcp_seg_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644); exdata->s2c_tcp_seg_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
} }
if (session_get_type(sess) == SESSION_TYPE_UDP) if (session_get_type(sess) == SESSION_TYPE_UDP)
{ {
memset(buff, 0, sizeof(buff)); memset(buff, 0, sizeof(buff));
sprintf(buff, "./log/session_debugger.UDP_%s_C2S.hexdump", session_get0_readable_addr(sess)); sprintf(buff, "./log/session_debugger.UDP_%s_C2S.hexdump", session_get_readable_addr(sess));
exdata->c2s_udp_payload_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644); exdata->c2s_udp_payload_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
memset(buff, 0, sizeof(buff)); memset(buff, 0, sizeof(buff));
sprintf(buff, "./log/session_debugger.UDP_%s_S2C.hexdump", session_get0_readable_addr(sess)); sprintf(buff, "./log/session_debugger.UDP_%s_S2C.hexdump", session_get_readable_addr(sess));
exdata->s2c_udp_payload_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644); exdata->s2c_udp_payload_hexdump_fd = open(buff, O_WRONLY | O_APPEND | O_CREAT, 0644);
} }
@@ -198,7 +198,7 @@ static void on_session_closed(struct session *sess, void *arg)
exdata->s2c_rx_tcp_seg, exdata->s2c_rx_tcp_bytes, exdata->s2c_rx_tcp_seg, exdata->s2c_rx_tcp_bytes,
exdata->c2s_rx_udp_payload, exdata->c2s_rx_udp_bytes, exdata->c2s_rx_udp_payload, exdata->c2s_rx_udp_bytes,
exdata->s2c_rx_udp_payload, exdata->s2c_rx_udp_bytes); exdata->s2c_rx_udp_payload, exdata->s2c_rx_udp_bytes);
session_debugger_log(exdata->dbg->fd, "session %lu %s statistics:\n%s", session_get_id(exdata->sess), session_get0_readable_addr(exdata->sess), buff); session_debugger_log(exdata->dbg->fd, "session %lu %s statistics:\n%s", session_get_id(exdata->sess), session_get_readable_addr(exdata->sess), buff);
} }
static void on_session_message(struct session *sess, enum session_state state, struct packet *pkt, void *arg) static void on_session_message(struct session *sess, enum session_state state, struct packet *pkt, void *arg)