Resolve merge conflicts

This commit is contained in:
luwenpeng
2024-05-20 11:12:24 +08:00
parent ccaddf7fdb
commit 0e33a1b647
24 changed files with 172 additions and 183 deletions

View File

@@ -322,7 +322,7 @@ TEST(CASE, TCP_FAST_OPEN)
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_tuple6_direction(sess) == FLOW_DIRECTION_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_current_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
EXPECT_TRUE(session_get_closing_reason(sess) == 0);
@@ -332,7 +332,7 @@ TEST(CASE, TCP_FAST_OPEN)
EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_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_get_current_packet(sess) == &pkt);
EXPECT_TRUE(session_get0_current_packet(sess) == &pkt);
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);
@@ -396,7 +396,7 @@ TEST(CASE, TCP_FAST_OPEN)
EXPECT_TRUE(session_manager_get_expired_session(mgr, 1 + opts.tcp_init_timeout) == NULL); // opening -> closing
sess = session_manager_get_expired_session(mgr, 1 + opts.tcp_init_timeout + opts.tcp_data_timeout); // closing -> closed
EXPECT_TRUE(sess);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSED);
EXPECT_TRUE(session_get_current_state(sess) == SESSION_STATE_CLOSED);
EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_TIMEOUT);
session_print(sess);
// free session