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

rename session_get0_current_packet() to session_get_current_packet()

Browse Source
This commit is contained in:
luwenpeng
2024-11-01 15:36:18 +08:00
parent c05d3fe2d5
commit da9e15264d
20 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
decoders/lpi_plus/lpip_module.c
View File

@@ -62,7 +62,7 @@ static void lpi_plus_get_host_order_port(struct session *sess __unused, unsigned
*dport=0;
//get host order port from stellar session api
const struct packet *pkt = session_get0_current_packet(sess);
const struct packet *pkt = session_get_current_packet(sess);
enum flow_type flow_type=session_get_flow_type(sess);
if(pkt && (flow_type==FLOW_TYPE_C2S || flow_type==FLOW_TYPE_S2C))
{

4
decoders/session_flags/session_flags.cpp
View File

@@ -281,7 +281,7 @@ static void flow_stat_update(struct session *session, struct flow_stat *flow, ui
flow->delta_pkts++;
flow->delta_bytes += bytes;
const struct packet *pkt = session_get0_current_packet(session);
const struct packet *pkt = session_get_current_packet(session);
size_t payload_len = packet_get_payload_len(pkt);
if (payload_len > 0)
@@ -610,7 +610,7 @@ static void session_flags_calculate_random_looking(struct session_flags_plugin_i
int udp_topic_id = sf_plugin_info->udp_topic_id;
const struct packet *pkt = session_get0_current_packet(session);
const struct packet *pkt = session_get_current_packet(session);
size_t payload_len = packet_get_payload_len(pkt);
const char *payload = packet_get_payload(pkt);

2
decoders/socks/socks_decoder.cpp
View File

@@ -456,7 +456,7 @@ void socks_decoder_on_message(struct session *sess, int topic_id, const void *ms
session_exdata_set(sess, socks_decoder_info->sess_exdata_idx, socks_tunel_stream);
}
pkt = session_get0_current_packet(sess);
pkt = session_get_current_packet(sess);
payload = packet_get_payload(pkt);
payload_len = packet_get_payload_len(pkt);

2
decoders/stratum/stratum_decoder.cpp
View File

@@ -236,7 +236,7 @@ void stratum_decoder_tcp_on_msg_cb(struct session *sess, int topic_id, const voi
struct stratum_decoder_info *stratum_decoder_info = (struct stratum_decoder_info *)plugin_env;
const struct packet *pkt = session_get0_current_packet(sess);
const struct packet *pkt = session_get_current_packet(sess);
const char *payload = packet_get_payload(pkt);
size_t payload_len = packet_get_payload_len(pkt);

2
include/stellar/session.h
View File

@@ -130,7 +130,7 @@ int session_has_duplicate_traffic(const struct session *sess);
enum session_type session_get_type(const struct session *sess);
enum session_state session_get_current_state(const struct session *sess);
const struct packet *session_get0_current_packet(const struct session *sess);
const struct packet *session_get_current_packet(const struct session *sess);
enum closing_reason session_get_closing_reason(const struct session *sess);
enum session_direction session_get_direction(const struct session *sess);

2
infra/session_manager/session_internal.h
View File

@@ -120,7 +120,7 @@ void session_set_first_packet(struct session *sess, enum flow_type type, const s
// const struct packet *session_get_first_packet(const struct session *sess, enum flow_type type);
void session_set_current_packet(struct session *sess, const struct packet *pkt);
// const struct packet *session_get0_current_packet(const struct session *sess);
// const struct packet *session_get_current_packet(const struct session *sess);
// int session_is_symmetric(const struct session *sess, unsigned char *flag);

2
infra/session_manager/session_manager.c
View File

@@ -72,7 +72,7 @@ static void clean_closed_session(struct session_manager *sess_mgr, uint16_t thre
static void on_sess_msg_dispatch(int sess_msg_id, void *msg, on_msg_cb_func *msg_cb, void *msg_cb_args, void *dispatch_args)
{
struct session *sess = (struct session *)msg;
struct packet *pkt = (struct packet *)session_get0_current_packet(sess);
struct packet *pkt = (struct packet *)session_get_current_packet(sess);
enum session_state state = session_get_current_state(sess);
((on_session_message_callback *)(void *)msg_cb)(sess, state, pkt, msg_cb_args);

4
infra/session_manager/session_utils.c
View File

@@ -160,7 +160,7 @@ void session_set_current_packet(struct session *sess, const struct packet *pkt)
sess->curr_pkt = pkt;
}
const struct packet *session_get0_current_packet(const struct session *sess)
const struct packet *session_get_current_packet(const struct session *sess)
{
return sess->curr_pkt;
}
@@ -386,7 +386,7 @@ int session_to_str(const struct session *sess, int bref, char *buff, int size)
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, "\"duplicate_traffic\":%d,", session_has_duplicate_traffic(sess));
used += snprintf(buff + used, size - used, "\"current_packet\":\"%p\",", session_get0_current_packet(sess));
used += snprintf(buff + used, size - used, "\"current_packet\":\"%p\",", session_get_current_packet(sess));
const char *str[] = {"c2s", "s2c"};
enum flow_type type[] = {FLOW_TYPE_C2S, FLOW_TYPE_S2C};

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

@@ -289,7 +289,7 @@ TEST(CASE, TCP_FAST_OPEN)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);

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

@@ -90,7 +90,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -177,7 +177,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -264,7 +264,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -393,7 +393,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -474,7 +474,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);

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

@@ -43,7 +43,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -122,7 +122,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) == NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -214,7 +214,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -319,7 +319,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -418,7 +418,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -518,7 +518,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) == NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -610,7 +610,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -702,7 +702,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) == NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);

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

@@ -40,7 +40,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -72,7 +72,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -104,7 +104,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -136,7 +136,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -168,7 +168,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -200,7 +200,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -232,7 +232,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -264,7 +264,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -296,7 +296,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -328,7 +328,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -360,7 +360,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);

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

@@ -56,7 +56,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -148,7 +148,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) == NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);

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

@@ -69,7 +69,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -166,7 +166,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -263,7 +263,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -413,7 +413,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_TIMEOUT)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -518,7 +518,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);
@@ -610,7 +610,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_HALF_FIN)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -701,7 +701,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_HALF_FIN)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);

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

@@ -38,7 +38,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -69,7 +69,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);

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

@@ -44,7 +44,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_C2S);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) != NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) == NULL);
@@ -124,7 +124,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C)
EXPECT_TRUE(session_get_stat(sess, FLOW_TYPE_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get_flow_type(sess) == FLOW_TYPE_S2C);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_C2S) == NULL);
EXPECT_TRUE(session_get_first_packet(sess, FLOW_TYPE_S2C) != NULL);

2
infra/version.map
View File

@@ -28,7 +28,7 @@ global:
session_has_duplicate_traffic;
session_get_type;
session_get_current_state;
session_get0_current_packet;
session_get_current_packet;
session_get_closing_reason;
session_get_direction;
session_get_flow_type;

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

@@ -38,7 +38,7 @@ void *session_exdata_get(struct session *sess, int idx)
return NULL;
}
const struct packet *session_get0_current_packet(const struct session *sess)
const struct packet *session_get_current_packet(const struct session *sess)
{
UNUSED(sess);

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

@@ -34,7 +34,7 @@ enum flow_type session_get_flow_type(const struct session *sess)
return direction;
}
const struct packet *session_get0_current_packet(const struct session *sess)
const struct packet *session_get_current_packet(const struct session *sess)
{
UNUSED(sess);

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

@@ -10,7 +10,7 @@ void stellar_session_plugin_dettach_current_session(struct session *sess)
UNUSED(sess);
}
const struct packet *session_get0_current_packet(const struct session *sess)
const struct packet *session_get_current_packet(const struct session *sess)
{
UNUSED(sess);