From 7b20747c8fb78b566da91e739e84fb1540d2e4f6 Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Wed, 15 May 2024 16:29:33 +0800 Subject: [PATCH] Update session.h: support get tuple6 by session --- include/stellar/session.h | 9 ++- src/plugin/plugin_manager.cpp | 2 +- src/session/session.cpp | 14 ++-- src/session/session_manager.cpp | 10 +-- src/session/session_priv.h | 3 - src/session/session_transition.cpp | 2 +- src/session/test/gtest_case_tcp_fast_open.cpp | 6 +- .../gtest_state_tcp_active_to_closing.cpp | 30 ++++----- .../test/gtest_state_tcp_init_to_opening.cpp | 48 +++++++------- ...opening_to_active_to_closing_to_closed.cpp | 66 +++++++++---------- .../gtest_state_tcp_opening_to_active.cpp | 12 ++-- .../gtest_state_tcp_opening_to_closing.cpp | 42 ++++++------ ...p_init_to_opening_to_active_to_closing.cpp | 12 ++-- ...t_state_udp_init_to_opening_to_closing.cpp | 12 ++-- src/stellar/inject.cpp | 2 +- src/stellar/stellar.cpp | 2 +- test/packet_injector.cpp | 4 +- 17 files changed, 138 insertions(+), 138 deletions(-) diff --git a/include/stellar/session.h b/include/stellar/session.h index 03b46ca..db027a1 100644 --- a/include/stellar/session.h +++ b/include/stellar/session.h @@ -127,15 +127,18 @@ enum session_type session_get_type(const struct session *sess); enum session_state session_get_state(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); -enum flow_direction session_get_flow_direction(const struct session *sess); +enum flow_direction session_get_current_flow_direction(const struct session *sess); const struct packet *session_get_first_packet(const struct session *sess, enum flow_direction dir); +const struct tuple6 *session_get_tuple6(const struct session *sess); +enum flow_direction session_get_tuple6_direction(const struct session *sess); +// tuple6 str format: "src_addr:src_port -> dst_addr:dst_port, proto: ip_proto, domain: domain" +const char *session_get_tuple6_str(const struct session *sess); + 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_stat(const struct session *sess, enum flow_direction dir, enum session_stat stat); -const char *session_get_tuple_str(const struct session *sess); - #ifdef __cplusplus } #endif diff --git a/src/plugin/plugin_manager.cpp b/src/plugin/plugin_manager.cpp index abcd7ca..df2e920 100644 --- a/src/plugin/plugin_manager.cpp +++ b/src/plugin/plugin_manager.cpp @@ -43,7 +43,7 @@ void plugin_manager_dispatch_session(struct plugin_manager *mgr, struct session struct tcp_segment *seg; enum session_state state = session_get_state(sess); enum session_type type = session_get_type(sess); - PLUGIN_MANAGER_LOG_DEBUG("=> thread [%d] plugin dispatch session: %u %s %s %s", stellar_get_current_thread_index(), session_get_id(sess), session_get_tuple_str(sess), session_type_to_str(type), session_state_to_str(state)); + PLUGIN_MANAGER_LOG_DEBUG("=> thread [%d] plugin dispatch session: %u %s %s %s", stellar_get_current_thread_index(), session_get_id(sess), session_get_tuple6_str(sess), session_type_to_str(type), session_state_to_str(state)); // session_print(sess); if (packet_is_ctrl(pkt)) diff --git a/src/session/session.cpp b/src/session/session.cpp index 5b6f127..3ef1226 100644 --- a/src/session/session.cpp +++ b/src/session/session.cpp @@ -45,7 +45,7 @@ void session_set_tuple(struct session *sess, const struct tuple6 *tuple) memcpy(&sess->tuple, tuple, sizeof(struct tuple6)); } -const struct tuple6 *session_get_tuple(const struct session *sess) +const struct tuple6 *session_get_tuple6(const struct session *sess) { return &sess->tuple; } @@ -55,12 +55,12 @@ void session_set_tuple_direction(struct session *sess, enum flow_direction dir) sess->tuple_dir = dir; } -enum flow_direction session_get_tuple_direction(const struct session *sess) +enum flow_direction session_get_tuple6_direction(const struct session *sess) { return sess->tuple_dir; } -const char *session_get_tuple_str(const struct session *sess) +const char *session_get_tuple6_str(const struct session *sess) { return sess->tuple_str; } @@ -80,7 +80,7 @@ void session_set_flow_direction(struct session *sess, enum flow_direction dir) sess->flow_dir = dir; } -enum flow_direction session_get_flow_direction(const struct session *sess) +enum flow_direction session_get_current_flow_direction(const struct session *sess) { return sess->flow_dir; } @@ -207,7 +207,7 @@ void *session_get_user_data(const struct session *sess) struct tcp_segment *session_get_tcp_segment(struct session *sess) { - enum flow_direction dir = session_get_flow_direction(sess); + enum flow_direction dir = session_get_current_flow_direction(sess); struct tcp_half *half = &sess->tcp_halfs[dir]; if (half->in_order.data != NULL && half->in_order.len > 0) @@ -235,7 +235,7 @@ void session_free_tcp_segment(struct session *sess, struct tcp_segment *seg) return; } - enum flow_direction dir = session_get_flow_direction(sess); + enum flow_direction dir = session_get_current_flow_direction(sess); struct tcp_half *half = &sess->tcp_halfs[dir]; if (seg == &half->in_order) @@ -460,7 +460,7 @@ int session_to_json(struct session *sess, char *buff, int size) used += snprintf(buff + used, size - used, "\"id\":%" PRIu64 ",", session_get_id(sess)); used += snprintf(buff + used, size - used, "\"start_timestamp\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_START)); used += snprintf(buff + used, size - used, "\"last_timestamp\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); - used += snprintf(buff + used, size - used, "\"tuple\":\"%s\",", session_get_tuple_str(sess)); + used += snprintf(buff + used, size - used, "\"tuple\":\"%s\",", session_get_tuple6_str(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_state(sess))); used += snprintf(buff + used, size - used, "\"closing_reason\":\"%s\",", closing_reason_to_str(session_get_closing_reason(sess))); diff --git a/src/session/session_manager.cpp b/src/session/session_manager.cpp index d63f4b9..72406d2 100644 --- a/src/session/session_manager.cpp +++ b/src/session/session_manager.cpp @@ -270,7 +270,7 @@ static int tcp_init(struct session_manager *mgr, struct session *sess) } SESSION_LOG_DEBUG("session %lu %s new c2s tcp assembler %p, s2c tcp assembler %p", - session_get_id(sess), session_get_tuple_str(sess), + session_get_id(sess), session_get_tuple6_str(sess), sess->tcp_halfs[FLOW_DIRECTION_C2S].assembler, sess->tcp_halfs[FLOW_DIRECTION_S2C].assembler); @@ -422,13 +422,13 @@ static enum flow_direction identify_direction_by_port(uint16_t src_port, uint16_ static enum flow_direction identify_direction_by_history(const struct session *sess, const struct tuple6 *key) { - if (tuple6_cmp(session_get_tuple(sess), key) == 0) + if (tuple6_cmp(session_get_tuple6(sess), key) == 0) { - return session_get_tuple_direction(sess); + return session_get_tuple6_direction(sess); } else { - return (session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S ? FLOW_DIRECTION_S2C : FLOW_DIRECTION_C2S); + return (session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S ? FLOW_DIRECTION_S2C : FLOW_DIRECTION_C2S); } } @@ -614,7 +614,7 @@ static void session_manager_evicte_session(struct session_manager *mgr, struct s session_table_del(mgr->udp_sess_table, sess); if (mgr->opts.evicted_session_filter_enable) { - evicted_session_filter_add(mgr->evicte_sess_filter, session_get_tuple(sess), now); + evicted_session_filter_add(mgr->evicte_sess_filter, session_get_tuple6(sess), now); } SESS_MGR_STAT_UPDATE(&mgr->stat, curr_state, next_state, udp); mgr->stat.nr_udp_sess_evicted++; diff --git a/src/session/session_priv.h b/src/session/session_priv.h index 7b3079b..7099fff 100644 --- a/src/session/session_priv.h +++ b/src/session/session_priv.h @@ -77,10 +77,7 @@ void session_init(struct session *sess); void session_set_id(struct session *sess, uint64_t id); void session_set_tuple(struct session *sess, const struct tuple6 *key); -const struct tuple6 *session_get_tuple(const struct session *sess); - void session_set_tuple_direction(struct session *sess, enum flow_direction dir); -enum flow_direction session_get_tuple_direction(const struct session *sess); void session_set_direction(struct session *sess, enum session_direction dir); void session_set_flow_direction(struct session *sess, enum flow_direction dir); diff --git a/src/session/session_transition.cpp b/src/session/session_transition.cpp index f337d52..948fced 100644 --- a/src/session/session_transition.cpp +++ b/src/session/session_transition.cpp @@ -159,6 +159,6 @@ void session_transition_log(struct session *sess, enum session_state curr_state, session_inputs_to_str(inputs, reason, sizeof(reason)); SESSION_TRANSITION_LOG_INFO("%s session %lu %s (%s) %s -> %s", session_type_to_str(session_get_type(sess)), - session_get_id(sess), session_get_tuple_str(sess), reason, + session_get_id(sess), session_get_tuple6_str(sess), reason, session_state_to_str(curr_state), session_state_to_str(next_state)); } \ No newline at end of file diff --git a/src/session/test/gtest_case_tcp_fast_open.cpp b/src/session/test/gtest_case_tcp_fast_open.cpp index 9615513..013b786 100644 --- a/src/session/test/gtest_case_tcp_fast_open.cpp +++ b/src/session/test/gtest_case_tcp_fast_open.cpp @@ -317,9 +317,9 @@ TEST(CASE, TCP_FAST_OPEN) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "2400:ac40:620:a4d8:484f:d2b0:d539:bd4c:51682 -> 2001:4860:4860::8844:853, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -331,7 +331,7 @@ TEST(CASE, TCP_FAST_OPEN) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); 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 34513f8..da16c32 100644 --- a/src/session/test/gtest_state_tcp_active_to_closing.cpp +++ b/src/session/test/gtest_state_tcp_active_to_closing.cpp @@ -115,9 +115,9 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -129,7 +129,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -201,9 +201,9 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -215,7 +215,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -287,9 +287,9 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -301,7 +301,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -413,9 +413,9 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -427,7 +427,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -492,9 +492,9 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -506,7 +506,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); 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 75b94b1..506f516 100644 --- a/src/session/test/gtest_state_tcp_init_to_opening.cpp +++ b/src/session/test/gtest_state_tcp_init_to_opening.cpp @@ -74,9 +74,9 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -88,7 +88,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -151,9 +151,9 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -165,7 +165,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) == NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -239,9 +239,9 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -253,7 +253,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -338,9 +338,9 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -352,7 +352,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -433,9 +433,9 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -447,7 +447,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -529,9 +529,9 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -543,7 +543,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) == NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -617,9 +617,9 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -631,7 +631,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -705,9 +705,9 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -719,7 +719,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) == NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); 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 7452f9e..1cd3803 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 @@ -70,9 +70,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -84,7 +84,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); @@ -101,9 +101,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -115,7 +115,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -132,9 +132,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -146,7 +146,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -163,9 +163,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -177,7 +177,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -194,9 +194,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -208,7 +208,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -225,9 +225,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -239,7 +239,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -256,9 +256,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -270,7 +270,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -287,9 +287,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -301,7 +301,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -318,9 +318,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -332,7 +332,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -349,9 +349,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -363,7 +363,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); @@ -380,9 +380,9 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_id(sess) != 0); memset(buffer, 0, sizeof(buffer)); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -394,7 +394,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); 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 bd1d247..c317888 100644 --- a/src/session/test/gtest_state_tcp_opening_to_active.cpp +++ b/src/session/test/gtest_state_tcp_opening_to_active.cpp @@ -84,9 +84,9 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -98,7 +98,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -172,9 +172,9 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -186,7 +186,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) == NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); 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 dd98937..72d69c3 100644 --- a/src/session/test/gtest_state_tcp_opening_to_closing.cpp +++ b/src/session/test/gtest_state_tcp_opening_to_closing.cpp @@ -96,9 +96,9 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -110,7 +110,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -190,9 +190,9 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -204,7 +204,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -284,9 +284,9 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -298,7 +298,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -427,9 +427,9 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_TIMEOUT) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -441,7 +441,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_TIMEOUT) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -526,9 +526,9 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -540,7 +540,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); @@ -614,9 +614,9 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_HALF_FIN) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -628,7 +628,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_HALF_FIN) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -701,9 +701,9 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_HALF_FIN) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -715,7 +715,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_HALF_FIN) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); 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 74dda84..8d6854d 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 @@ -69,9 +69,9 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -83,7 +83,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); @@ -99,9 +99,9 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST) EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -113,7 +113,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); 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 74ca0dc..5339f14 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 @@ -74,9 +74,9 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -88,7 +88,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_C2S); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_C2S); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) != NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL); session_print(sess); @@ -152,9 +152,9 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C) EXPECT_TRUE(sess); EXPECT_TRUE(session_get_id(sess) != 0); - tuple6_to_str(session_get_tuple(sess), buffer, sizeof(buffer)); + tuple6_to_str(session_get_tuple6(sess), buffer, sizeof(buffer)); EXPECT_STREQ(buffer, "121.14.154.93:53 -> 192.168.38.105:61099, proto: 17, domain: 0"); - EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_tuple6_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING); EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP); EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0); @@ -166,7 +166,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C) EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START)); EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST)); EXPECT_TRUE(session_get_current_packet(sess) == &pkt); - EXPECT_TRUE(session_get_flow_direction(sess) == FLOW_DIRECTION_S2C); + EXPECT_TRUE(session_get_current_flow_direction(sess) == FLOW_DIRECTION_S2C); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_C2S) == NULL); EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) != NULL); session_print(sess); diff --git a/src/stellar/inject.cpp b/src/stellar/inject.cpp index 82641da..0e09fcf 100644 --- a/src/stellar/inject.cpp +++ b/src/stellar/inject.cpp @@ -187,7 +187,7 @@ static inline void calc_tcp_seq_ack(const struct session *sess, enum flow_direct * ack = current_packet_ack + current_packet_payload_len + 1 */ - enum flow_direction curr_dir = session_get_flow_direction(sess); + enum flow_direction curr_dir = session_get_current_flow_direction(sess); const struct tcp_half *tcp_curr_half = &sess->tcp_halfs[curr_dir]; if (inject_dir == curr_dir) { diff --git a/src/stellar/stellar.cpp b/src/stellar/stellar.cpp index 61c49d8..219fa22 100644 --- a/src/stellar/stellar.cpp +++ b/src/stellar/stellar.cpp @@ -18,7 +18,7 @@ static void update_session_stat(struct session *sess, struct packet *pkt) { if (sess) { - enum flow_direction dir = session_get_flow_direction(sess); + enum flow_direction dir = session_get_current_flow_direction(sess); int is_ctrl = packet_is_ctrl(pkt); switch (packet_get_action(pkt)) { diff --git a/test/packet_injector.cpp b/test/packet_injector.cpp index f21b084..922fda9 100644 --- a/test/packet_injector.cpp +++ b/test/packet_injector.cpp @@ -51,7 +51,7 @@ struct inject_rule static void inject_packet_plugin(struct session *sess, struct packet *pkt, struct inject_rule *rule) { - const struct tuple6 *tuple = session_get_tuple(sess); + const struct tuple6 *tuple = session_get_tuple6(sess); if (rule->ip_type == 4 && memcmp(&tuple->src_addr.v4, &rule->v4, sizeof(struct in_addr)) && memcmp(&tuple->dst_addr.v4, &rule->v4, sizeof(struct in_addr))) { return; @@ -140,7 +140,7 @@ void plugin_manager_dispatch_session(struct plugin_manager *mgr, struct session enum session_type type = session_get_type(sess); uint16_t thr_idx = stellar_get_current_thread_index(); MOCK_PLUGIN_LOG_DEBUG("=> thread: %d, session: %lu %s, type: %s, state: %s, c2s packet received: %lu, s2c packet received: %lu", thr_idx, - session_get_id(sess), session_get_tuple_str(sess), + session_get_id(sess), session_get_tuple6_str(sess), session_type_to_str(type), session_state_to_str(session_get_state(sess)), session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED), session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED));