rename xxx_create() / xxx_destory() -> xxx_new() / xxx_free()
This commit is contained in:
@@ -26,7 +26,7 @@ static void build_active_tcp_session(struct session_manager *mgr, struct session
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 0);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 0);
|
||||
EXPECT_TRUE(session_get_create_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_C2S);
|
||||
@@ -61,7 +61,7 @@ static void build_active_tcp_session(struct session_manager *mgr, struct session
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 0);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 0);
|
||||
EXPECT_TRUE(session_get_create_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_C2S);
|
||||
@@ -91,7 +91,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet & C2S DATA Packet
|
||||
@@ -116,7 +116,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 0);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 0);
|
||||
EXPECT_TRUE(session_get_create_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_C2S);
|
||||
@@ -150,7 +150,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1);
|
||||
EXPECT_TRUE(session_get_create_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_S2C);
|
||||
@@ -164,7 +164,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN)
|
||||
__session_manager_wait(mgr, CLOSING_BY_CLIENT_FIN);
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -182,7 +182,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet & C2S DATA Packet
|
||||
@@ -214,7 +214,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 0);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 0);
|
||||
EXPECT_TRUE(session_get_create_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_C2S);
|
||||
@@ -228,7 +228,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST)
|
||||
__session_manager_wait(mgr, CLOSING_BY_CLIENT_RST);
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -246,7 +246,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet & C2S DATA Packet
|
||||
@@ -278,7 +278,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1);
|
||||
EXPECT_TRUE(session_get_create_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_S2C);
|
||||
@@ -292,7 +292,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST)
|
||||
__session_manager_wait(mgr, CLOSING_BY_SERVER_RST);
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -308,7 +308,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_DATA_TIMEOUT)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet & C2S DATA Packet
|
||||
@@ -318,7 +318,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_DATA_TIMEOUT)
|
||||
__session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -336,7 +336,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet & C2S DATA Packet
|
||||
@@ -361,7 +361,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 0);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 0);
|
||||
EXPECT_TRUE(session_get_create_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_C2S);
|
||||
@@ -375,7 +375,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT)
|
||||
__session_manager_wait(mgr, CLOSING_BY_CLIENT_FIN);
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -393,7 +393,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet & C2S DATA Packet
|
||||
@@ -418,7 +418,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1);
|
||||
EXPECT_TRUE(session_get_create_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_new_time(sess) < timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get_last_time(sess) == timestamp_get_sec());
|
||||
EXPECT_TRUE(session_get0_cur_pkt(sess) == &pkt);
|
||||
EXPECT_TRUE(session_get_cur_dir(sess) == SESSION_DIR_S2C);
|
||||
@@ -432,7 +432,7 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT)
|
||||
__session_manager_wait(mgr, CLOSING_BY_SERVER_FIN);
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user