rename xxx_create() / xxx_destory() -> xxx_new() / xxx_free()
This commit is contained in:
@@ -16,7 +16,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -38,7 +38,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN)
|
||||
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);
|
||||
@@ -53,7 +53,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN)
|
||||
__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
|
||||
|
||||
@@ -71,7 +71,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// SYNACK Packet
|
||||
@@ -93,7 +93,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 0);
|
||||
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);
|
||||
@@ -108,7 +108,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK)
|
||||
__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
|
||||
|
||||
@@ -126,7 +126,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -148,7 +148,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK)
|
||||
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);
|
||||
@@ -183,7 +183,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK)
|
||||
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);
|
||||
@@ -198,7 +198,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK)
|
||||
__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
|
||||
|
||||
@@ -216,7 +216,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -238,7 +238,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK)
|
||||
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);
|
||||
@@ -273,7 +273,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK)
|
||||
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);
|
||||
@@ -308,7 +308,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK)
|
||||
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);
|
||||
@@ -322,7 +322,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK)
|
||||
__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
|
||||
|
||||
@@ -342,7 +342,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -364,7 +364,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION)
|
||||
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);
|
||||
@@ -405,7 +405,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION)
|
||||
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);
|
||||
@@ -420,7 +420,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION)
|
||||
__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
|
||||
|
||||
@@ -440,7 +440,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// SYNACK Packet
|
||||
@@ -462,7 +462,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 0);
|
||||
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);
|
||||
@@ -503,7 +503,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 74);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 0);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 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);
|
||||
@@ -518,7 +518,7 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION)
|
||||
__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
|
||||
|
||||
@@ -536,7 +536,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -558,7 +558,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC)
|
||||
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);
|
||||
@@ -593,7 +593,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC)
|
||||
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);
|
||||
@@ -608,7 +608,7 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC)
|
||||
__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
|
||||
|
||||
@@ -626,7 +626,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// SYNACK Packet
|
||||
@@ -648,7 +648,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 0);
|
||||
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);
|
||||
@@ -683,7 +683,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 0);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 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);
|
||||
@@ -698,7 +698,7 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC)
|
||||
__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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user