rename xxx_create() / xxx_destory() -> xxx_new() / xxx_free()
This commit is contained in:
@@ -26,7 +26,7 @@ static void build_opening_tcp_session(struct session_manager *mgr, struct sessio
|
||||
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);
|
||||
@@ -57,7 +57,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -82,7 +82,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN)
|
||||
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);
|
||||
@@ -116,7 +116,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN)
|
||||
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);
|
||||
@@ -130,7 +130,7 @@ TEST(TCP_OPENING_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
|
||||
|
||||
@@ -148,7 +148,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -180,7 +180,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST)
|
||||
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);
|
||||
@@ -194,7 +194,7 @@ TEST(TCP_OPENING_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
|
||||
|
||||
@@ -212,7 +212,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -244,7 +244,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 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);
|
||||
@@ -258,7 +258,7 @@ TEST(TCP_OPENING_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
|
||||
|
||||
@@ -274,7 +274,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_INIT_TIMEOUT)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -284,7 +284,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_INIT_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
|
||||
|
||||
@@ -302,7 +302,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_TIMEOUT)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -327,7 +327,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_TIMEOUT)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 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);
|
||||
@@ -342,7 +342,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_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
|
||||
|
||||
@@ -360,7 +360,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -385,7 +385,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 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);
|
||||
@@ -420,7 +420,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74);
|
||||
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_C2S);
|
||||
@@ -434,7 +434,7 @@ TEST(TCP_OPENING_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
|
||||
|
||||
@@ -452,7 +452,7 @@ TEST(TCP_OPENING_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
|
||||
@@ -477,7 +477,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT)
|
||||
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);
|
||||
@@ -491,7 +491,7 @@ TEST(TCP_OPENING_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
|
||||
|
||||
@@ -509,7 +509,7 @@ TEST(TCP_OPENING_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
|
||||
@@ -534,7 +534,7 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 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);
|
||||
@@ -548,7 +548,7 @@ TEST(TCP_OPENING_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