rename xxx_create() / xxx_destory() -> xxx_new() / xxx_free()
This commit is contained in:
@@ -139,7 +139,7 @@ uint64_t session_get_s2c_packets(const struct session *sess)
|
||||
}
|
||||
|
||||
// session timestamp
|
||||
void session_set_create_time(struct session *sess, uint64_t timestamp)
|
||||
void session_set_new_time(struct session *sess, uint64_t timestamp)
|
||||
{
|
||||
sess->create_time = timestamp;
|
||||
}
|
||||
@@ -149,7 +149,7 @@ void session_set_last_time(struct session *sess, uint64_t timestamp)
|
||||
sess->last_time = timestamp;
|
||||
}
|
||||
|
||||
uint64_t session_get_create_time(const struct session *sess)
|
||||
uint64_t session_get_new_time(const struct session *sess)
|
||||
{
|
||||
return sess->create_time;
|
||||
}
|
||||
@@ -563,7 +563,7 @@ void session_dump(struct session *sess)
|
||||
printf("session c2s bytes : %" PRIu64 "\n", session_get_c2s_bytes(sess));
|
||||
printf("session s2c packets : %" PRIu64 "\n", session_get_s2c_packets(sess));
|
||||
printf("session s2c bytes : %" PRIu64 "\n", session_get_s2c_bytes(sess));
|
||||
printf("session create time : %" PRIu64 "\n", session_get_create_time(sess));
|
||||
printf("session create time : %" PRIu64 "\n", session_get_new_time(sess));
|
||||
printf("session last time : %" PRIu64 "\n", session_get_last_time(sess));
|
||||
if (session_get_type(sess) == SESSION_TYPE_TCP)
|
||||
{
|
||||
|
||||
@@ -115,9 +115,9 @@ uint64_t session_get_c2s_packets(const struct session *sess);
|
||||
uint64_t session_get_s2c_packets(const struct session *sess);
|
||||
|
||||
// session timestamp
|
||||
void session_set_create_time(struct session *sess, uint64_t timestamp);
|
||||
void session_set_new_time(struct session *sess, uint64_t timestamp);
|
||||
void session_set_last_time(struct session *sess, uint64_t timestamp);
|
||||
uint64_t session_get_create_time(const struct session *sess);
|
||||
uint64_t session_get_new_time(const struct session *sess);
|
||||
uint64_t session_get_last_time(const struct session *sess);
|
||||
|
||||
// session tcp state
|
||||
|
||||
@@ -466,7 +466,7 @@ on opening update session
|
||||
[*] session_set_key
|
||||
[*] session_set_key_dir
|
||||
[*] session_set_type
|
||||
[*] session_set_create_time
|
||||
[*] session_set_new_time
|
||||
[*] session_set_state
|
||||
|
||||
on packet update session
|
||||
@@ -603,7 +603,7 @@ static inline void session_manager_update_session_base(struct session_manager *m
|
||||
{
|
||||
session_set_type(sess, SESSION_TYPE_TCP);
|
||||
}
|
||||
session_set_create_time(sess, timestamp_get_sec());
|
||||
session_set_new_time(sess, timestamp_get_sec());
|
||||
}
|
||||
|
||||
static inline void session_manager_update_session_packet(struct session_manager *mgr, struct session *sess, const struct packet *pkt, enum session_dir curr_dir)
|
||||
@@ -1029,7 +1029,7 @@ static inline void session_manager_evicte_session(struct session_manager *mgr, s
|
||||
* Public API
|
||||
******************************************************************************/
|
||||
|
||||
struct session_manager *session_manager_create(struct session_manager_config *config)
|
||||
struct session_manager *session_manager_new(struct session_manager_config *config)
|
||||
{
|
||||
if (session_manager_check_config(config))
|
||||
{
|
||||
@@ -1043,49 +1043,49 @@ struct session_manager *session_manager_create(struct session_manager_config *co
|
||||
}
|
||||
|
||||
memcpy(&mgr->config, config, sizeof(struct session_manager_config));
|
||||
mgr->sess_pool = session_pool_create(mgr->config.max_tcp_session_num + mgr->config.max_udp_session_num);
|
||||
mgr->sess_pool = session_pool_new(mgr->config.max_tcp_session_num + mgr->config.max_udp_session_num);
|
||||
if (mgr->sess_pool == NULL)
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
mgr->tcp_sess_table = session_table_create();
|
||||
mgr->tcp_sess_table = session_table_new();
|
||||
if (mgr->tcp_sess_table == NULL)
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
mgr->udp_sess_table = session_table_create();
|
||||
mgr->udp_sess_table = session_table_new();
|
||||
if (mgr->udp_sess_table == NULL)
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
mgr->sess_timer = session_timer_create();
|
||||
mgr->sess_timer = session_timer_new();
|
||||
if (mgr->sess_timer == NULL)
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
mgr->sess_evicted_queue = session_queue_create();
|
||||
mgr->sess_evicted_queue = session_queue_new();
|
||||
if (mgr->sess_evicted_queue == NULL)
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
mgr->sess_toclosed_queue = session_queue_create();
|
||||
mgr->sess_toclosed_queue = session_queue_new();
|
||||
if (mgr->sess_toclosed_queue == NULL)
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
mgr->tcp_dupkt_filter = dupkt_filter_create(mgr->config.tcp_dupkt_filter_enable, mgr->config.tcp_dupkt_filter_capacity, mgr->config.tcp_dupkt_filter_error_rate, mgr->config.tcp_dupkt_filter_timeout);
|
||||
mgr->tcp_dupkt_filter = dupkt_filter_new(mgr->config.tcp_dupkt_filter_enable, mgr->config.tcp_dupkt_filter_capacity, mgr->config.tcp_dupkt_filter_error_rate, mgr->config.tcp_dupkt_filter_timeout);
|
||||
if (mgr->tcp_dupkt_filter == NULL)
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
mgr->udp_eviction_filter = eviction_filter_create(mgr->config.udp_eviction_filter_enable, mgr->config.udp_eviction_filter_capacity, mgr->config.udp_eviction_filter_error_rate, mgr->config.udp_eviction_filter_timeout);
|
||||
mgr->udp_eviction_filter = eviction_filter_new(mgr->config.udp_eviction_filter_enable, mgr->config.udp_eviction_filter_capacity, mgr->config.udp_eviction_filter_error_rate, mgr->config.udp_eviction_filter_timeout);
|
||||
if (mgr->udp_eviction_filter == NULL)
|
||||
{
|
||||
goto error;
|
||||
@@ -1094,11 +1094,11 @@ struct session_manager *session_manager_create(struct session_manager_config *co
|
||||
return mgr;
|
||||
|
||||
error:
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void session_manager_destroy(struct session_manager *mgr)
|
||||
void session_manager_free(struct session_manager *mgr)
|
||||
{
|
||||
struct session *sess;
|
||||
if (mgr)
|
||||
@@ -1126,14 +1126,14 @@ void session_manager_destroy(struct session_manager *mgr)
|
||||
session_manager_free_session(mgr, sess);
|
||||
}
|
||||
|
||||
eviction_filter_destroy(mgr->udp_eviction_filter);
|
||||
dupkt_filter_destroy(mgr->tcp_dupkt_filter);
|
||||
session_queue_destroy(mgr->sess_toclosed_queue);
|
||||
session_queue_destroy(mgr->sess_evicted_queue);
|
||||
session_timer_destroy(mgr->sess_timer);
|
||||
session_table_destroy(mgr->udp_sess_table);
|
||||
session_table_destroy(mgr->tcp_sess_table);
|
||||
session_pool_destroy(mgr->sess_pool);
|
||||
eviction_filter_free(mgr->udp_eviction_filter);
|
||||
dupkt_filter_free(mgr->tcp_dupkt_filter);
|
||||
session_queue_free(mgr->sess_toclosed_queue);
|
||||
session_queue_free(mgr->sess_evicted_queue);
|
||||
session_timer_free(mgr->sess_timer);
|
||||
session_table_free(mgr->udp_sess_table);
|
||||
session_table_free(mgr->tcp_sess_table);
|
||||
session_pool_free(mgr->sess_pool);
|
||||
free(mgr);
|
||||
mgr = NULL;
|
||||
}
|
||||
|
||||
@@ -47,8 +47,8 @@ struct session_manager_config
|
||||
};
|
||||
|
||||
struct session_manager;
|
||||
struct session_manager *session_manager_create(struct session_manager_config *config);
|
||||
void session_manager_destroy(struct session_manager *mgr);
|
||||
struct session_manager *session_manager_new(struct session_manager_config *config);
|
||||
void session_manager_free(struct session_manager *mgr);
|
||||
|
||||
// only use the packet six-tuple to find the session, not update it
|
||||
struct session *session_manager_lookup_sesssion(struct session_manager *mgr, const struct packet *pkt);
|
||||
|
||||
@@ -7,7 +7,7 @@ struct session_pool
|
||||
struct session *sess;
|
||||
};
|
||||
|
||||
struct session_pool *session_pool_create(uint64_t count)
|
||||
struct session_pool *session_pool_new(uint64_t count)
|
||||
{
|
||||
struct session_pool *pool = (struct session_pool *)calloc(1, sizeof(struct session_pool) + count * sizeof(struct session));
|
||||
if (pool == NULL)
|
||||
@@ -27,7 +27,7 @@ struct session_pool *session_pool_create(uint64_t count)
|
||||
return pool;
|
||||
}
|
||||
|
||||
void session_pool_destroy(struct session_pool *pool)
|
||||
void session_pool_free(struct session_pool *pool)
|
||||
{
|
||||
if (pool)
|
||||
{
|
||||
|
||||
@@ -9,8 +9,8 @@ extern "C"
|
||||
#include "session.h"
|
||||
|
||||
struct session_pool;
|
||||
struct session_pool *session_pool_create(uint64_t count);
|
||||
void session_pool_destroy(struct session_pool *pool);
|
||||
struct session_pool *session_pool_new(uint64_t count);
|
||||
void session_pool_free(struct session_pool *pool);
|
||||
|
||||
struct session *session_pool_alloc(struct session_pool *pool);
|
||||
void session_pool_free(struct session_pool *pool, struct session *sess);
|
||||
|
||||
@@ -8,7 +8,7 @@ struct session_queue
|
||||
int count;
|
||||
};
|
||||
|
||||
struct session_queue *session_queue_create()
|
||||
struct session_queue *session_queue_new()
|
||||
{
|
||||
struct session_queue *queue = (struct session_queue *)calloc(1, sizeof(struct session_queue));
|
||||
if (queue == NULL)
|
||||
@@ -18,7 +18,7 @@ struct session_queue *session_queue_create()
|
||||
return queue;
|
||||
}
|
||||
|
||||
void session_queue_destroy(struct session_queue *queue)
|
||||
void session_queue_free(struct session_queue *queue)
|
||||
{
|
||||
if (queue)
|
||||
{
|
||||
|
||||
@@ -9,8 +9,8 @@ extern "C"
|
||||
#include "session.h"
|
||||
|
||||
struct session_queue;
|
||||
struct session_queue *session_queue_create();
|
||||
void session_queue_destroy(struct session_queue *queue);
|
||||
struct session_queue *session_queue_new();
|
||||
void session_queue_free(struct session_queue *queue);
|
||||
|
||||
void session_queue_push(struct session_queue *queue, struct session *sess);
|
||||
struct session *session_queue_pop(struct session_queue *queue);
|
||||
|
||||
@@ -103,7 +103,7 @@ static void session_table_del_session_from_linklist(struct session_table *table,
|
||||
* Public API
|
||||
******************************************************************************/
|
||||
|
||||
struct session_table *session_table_create()
|
||||
struct session_table *session_table_new()
|
||||
{
|
||||
struct session_table *table = (struct session_table *)calloc(1, sizeof(struct session_table));
|
||||
table->count = 0;
|
||||
@@ -113,7 +113,7 @@ struct session_table *session_table_create()
|
||||
return table;
|
||||
}
|
||||
|
||||
void session_table_destroy(struct session_table *table)
|
||||
void session_table_free(struct session_table *table)
|
||||
{
|
||||
if (table)
|
||||
{
|
||||
|
||||
@@ -9,8 +9,8 @@ extern "C"
|
||||
#include "session.h"
|
||||
|
||||
struct session_table;
|
||||
struct session_table *session_table_create();
|
||||
void session_table_destroy(struct session_table *table);
|
||||
struct session_table *session_table_new();
|
||||
void session_table_free(struct session_table *table);
|
||||
uint64_t session_table_get_count(struct session_table *table);
|
||||
|
||||
typedef void (*session_free_cb)(struct session *sess, void *arg);
|
||||
|
||||
@@ -6,7 +6,7 @@ struct session_timer
|
||||
struct timeouts *timeouts;
|
||||
};
|
||||
|
||||
struct session_timer *session_timer_create()
|
||||
struct session_timer *session_timer_new()
|
||||
{
|
||||
timeout_error_t err;
|
||||
struct session_timer *timer = (struct session_timer *)calloc(1, sizeof(struct session_timer));
|
||||
@@ -24,11 +24,11 @@ struct session_timer *session_timer_create()
|
||||
return timer;
|
||||
|
||||
error:
|
||||
session_timer_destroy(timer);
|
||||
session_timer_free(timer);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void session_timer_destroy(struct session_timer *timer)
|
||||
void session_timer_free(struct session_timer *timer)
|
||||
{
|
||||
if (timer)
|
||||
{
|
||||
|
||||
@@ -9,8 +9,8 @@ extern "C"
|
||||
#include "session.h"
|
||||
|
||||
struct session_timer;
|
||||
struct session_timer *session_timer_create();
|
||||
void session_timer_destroy(struct session_timer *timer);
|
||||
struct session_timer *session_timer_new();
|
||||
void session_timer_free(struct session_timer *timer);
|
||||
void session_timer_add_session(struct session_timer *timer, struct session *sess);
|
||||
void session_timer_del_session(struct session_timer *timer, struct session *sess);
|
||||
/*
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYN_DUP)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -48,7 +48,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYN_DUP)
|
||||
__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
|
||||
|
||||
@@ -61,7 +61,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, S2C_DUP)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// S2C SYNACK Packet
|
||||
@@ -100,7 +100,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, S2C_DUP)
|
||||
__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
|
||||
|
||||
@@ -116,7 +116,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SKIP_FILTER)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -168,7 +168,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SKIP_FILTER)
|
||||
__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
|
||||
|
||||
@@ -184,7 +184,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, C2S_DUPKT)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&_config);
|
||||
mgr = session_manager_new(&_config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -223,7 +223,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, C2S_DUPKT)
|
||||
__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
|
||||
|
||||
@@ -239,7 +239,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, S2C_DUP)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&_config);
|
||||
mgr = session_manager_new(&_config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// S2C SYNACK Packet
|
||||
@@ -278,7 +278,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, S2C_DUP)
|
||||
__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
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(UDP_EVICTION_FILTER_ENABLE, HIT_FILTER_THEN_EVICT_SESS)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S REQ Packet
|
||||
@@ -33,7 +33,7 @@ TEST(UDP_EVICTION_FILTER_ENABLE, HIT_FILTER_THEN_EVICT_SESS)
|
||||
EXPECT_TRUE(sess == NULL);
|
||||
__session_dispatch(sess);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -49,7 +49,7 @@ TEST(UDP_EVICTION_FILTER_ENABLE, MISS_FILTER_THEN_NEW_SESS)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&_config);
|
||||
mgr = session_manager_new(&_config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S REQ Packet
|
||||
@@ -81,7 +81,7 @@ TEST(UDP_EVICTION_FILTER_ENABLE, MISS_FILTER_THEN_NEW_SESS)
|
||||
__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
|
||||
|
||||
@@ -97,7 +97,7 @@ TEST(UDP_EVICTION_FILTER_DISABLE, MISS_FILTER_THEN_NEW_SESS)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&_config);
|
||||
mgr = session_manager_new(&_config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S REQ Packet
|
||||
@@ -125,7 +125,7 @@ TEST(UDP_EVICTION_FILTER_DISABLE, MISS_FILTER_THEN_NEW_SESS)
|
||||
__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
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ TEST(OVERLOAD, EVICT_TCP_OLD_SESS)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
for (uint64_t i = 0; i < config.max_tcp_session_num; i++)
|
||||
@@ -80,7 +80,7 @@ TEST(OVERLOAD, EVICT_TCP_OLD_SESS)
|
||||
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,
|
||||
0, 1, // tcp_overload_evict_new_sess_num, tcp_overload_evict_old_sess_num,
|
||||
0, 0); // udp_overload_evict_new_sess_num, udp_overload_evict_old_sess_num,
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -97,7 +97,7 @@ TEST(OVERLOAD, EVICT_TCP_NEW_SESS)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&_config);
|
||||
mgr = session_manager_new(&_config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
for (uint64_t i = 0; i <= _config.max_tcp_session_num; i++)
|
||||
@@ -145,7 +145,7 @@ TEST(OVERLOAD, EVICT_TCP_NEW_SESS)
|
||||
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,
|
||||
1, 0, // tcp_overload_evict_new_sess_num, tcp_overload_evict_old_sess_num,
|
||||
0, 0); // udp_overload_evict_new_sess_num, udp_overload_evict_old_sess_num,
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ TEST(OVERLOAD, EVICT_UDP_OLD_SESS)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
for (uint64_t i = 0; i < config.max_udp_session_num; i++)
|
||||
@@ -80,7 +80,7 @@ TEST(OVERLOAD, EVICT_UDP_OLD_SESS)
|
||||
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,
|
||||
0, 0, // tcp_overload_evict_new_sess_num, tcp_overload_evict_old_sess_num,
|
||||
0, 1); // udp_overload_evict_new_sess_num, udp_overload_evict_old_sess_num,
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -97,7 +97,7 @@ TEST(OVERLOAD, EVICT_UDP_NEW_SESS)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&_config);
|
||||
mgr = session_manager_new(&_config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
for (uint64_t i = 0; i <= _config.max_udp_session_num; i++)
|
||||
@@ -145,7 +145,7 @@ TEST(OVERLOAD, EVICT_UDP_NEW_SESS)
|
||||
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,
|
||||
0, 0, // tcp_overload_evict_new_sess_num, tcp_overload_evict_old_sess_num,
|
||||
1, 0); // udp_overload_evict_new_sess_num, udp_overload_evict_old_sess_num,
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ TEST(SESSION_POOL, POP_PUSH)
|
||||
struct session *sess4 = NULL;
|
||||
struct session_pool *sess_pool = NULL;
|
||||
|
||||
sess_pool = session_pool_create(3);
|
||||
sess_pool = session_pool_new(3);
|
||||
EXPECT_TRUE(sess_pool != NULL);
|
||||
EXPECT_TRUE(session_pool_get_count(sess_pool) == 3);
|
||||
|
||||
@@ -52,7 +52,7 @@ TEST(SESSION_POOL, POP_PUSH)
|
||||
session_pool_free(sess_pool, sess3);
|
||||
EXPECT_TRUE(session_pool_get_count(sess_pool) == 3);
|
||||
|
||||
session_pool_destroy(sess_pool);
|
||||
session_pool_free(sess_pool);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(SESSION_QUEUE, POP_PUSH)
|
||||
struct session sess2;
|
||||
struct session_queue *queue = NULL;
|
||||
|
||||
queue = session_queue_create();
|
||||
queue = session_queue_new();
|
||||
EXPECT_TRUE(queue != NULL);
|
||||
|
||||
EXPECT_TRUE(session_queue_pop(queue) == NULL);
|
||||
@@ -19,7 +19,7 @@ TEST(SESSION_QUEUE, POP_PUSH)
|
||||
EXPECT_TRUE(session_queue_pop(queue) == &sess2);
|
||||
EXPECT_TRUE(session_queue_pop(queue) == NULL);
|
||||
|
||||
session_queue_destroy(queue);
|
||||
session_queue_free(queue);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
|
||||
@@ -67,9 +67,9 @@ TEST(SESSION_TABLE, OP_SESSION)
|
||||
tuple6_reverse(&tuple_3, &reversed_tuple_3);
|
||||
|
||||
// Create
|
||||
sess_pool = session_pool_create(3);
|
||||
sess_pool = session_pool_new(3);
|
||||
EXPECT_TRUE(sess_pool != NULL);
|
||||
sess_table = session_table_create();
|
||||
sess_table = session_table_new();
|
||||
EXPECT_TRUE(sess_table != NULL);
|
||||
session_table_set_freecb(sess_table, session_free_callback, sess_pool);
|
||||
|
||||
@@ -122,8 +122,8 @@ TEST(SESSION_TABLE, OP_SESSION)
|
||||
EXPECT_TRUE(session_table_find_session(sess_table, &reversed_tuple_3) == NULL);
|
||||
|
||||
// Destroy
|
||||
session_table_destroy(sess_table);
|
||||
session_pool_destroy(sess_pool);
|
||||
session_table_free(sess_table);
|
||||
session_pool_free(sess_pool);
|
||||
}
|
||||
|
||||
TEST(SESSION_TABLE, FIND_OLDEST_NEWEST)
|
||||
@@ -139,9 +139,9 @@ TEST(SESSION_TABLE, FIND_OLDEST_NEWEST)
|
||||
SESSION_KEY_IPV6_TCP(tuple_3);
|
||||
|
||||
// Create
|
||||
sess_pool = session_pool_create(3);
|
||||
sess_pool = session_pool_new(3);
|
||||
EXPECT_TRUE(sess_pool != NULL);
|
||||
sess_table = session_table_create();
|
||||
sess_table = session_table_new();
|
||||
EXPECT_TRUE(sess_table != NULL);
|
||||
session_table_set_freecb(sess_table, session_free_callback, sess_pool);
|
||||
|
||||
@@ -189,8 +189,8 @@ TEST(SESSION_TABLE, FIND_OLDEST_NEWEST)
|
||||
EXPECT_TRUE(session_table_find_least_recently_used_session(sess_table) == NULL);
|
||||
|
||||
// Destroy
|
||||
session_table_destroy(sess_table);
|
||||
session_pool_destroy(sess_pool);
|
||||
session_table_free(sess_table);
|
||||
session_pool_free(sess_pool);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
|
||||
@@ -11,7 +11,7 @@ static void session_expire(struct session *sess, void *arg)
|
||||
TEST(SESSION_TIMER, ADD_DEL)
|
||||
{
|
||||
struct session sess;
|
||||
struct session_timer *timer = session_timer_create();
|
||||
struct session_timer *timer = session_timer_new();
|
||||
EXPECT_TRUE(timer != NULL);
|
||||
|
||||
session_init(&sess);
|
||||
@@ -21,7 +21,7 @@ TEST(SESSION_TIMER, ADD_DEL)
|
||||
session_timer_add_session(timer, &sess);
|
||||
session_timer_del_session(timer, &sess);
|
||||
|
||||
session_timer_destroy(timer);
|
||||
session_timer_free(timer);
|
||||
}
|
||||
|
||||
TEST(SESSION_TIMER, EXPIRE)
|
||||
@@ -30,7 +30,7 @@ TEST(SESSION_TIMER, EXPIRE)
|
||||
struct session sess1;
|
||||
struct session sess2;
|
||||
struct session sess3;
|
||||
struct session_timer *timer = session_timer_create();
|
||||
struct session_timer *timer = session_timer_new();
|
||||
EXPECT_TRUE(timer != NULL);
|
||||
|
||||
session_init(&sess1);
|
||||
@@ -60,7 +60,7 @@ TEST(SESSION_TIMER, EXPIRE)
|
||||
} while (sess);
|
||||
}
|
||||
|
||||
session_timer_destroy(timer);
|
||||
session_timer_free(timer);
|
||||
}
|
||||
|
||||
TEST(SESSION_TIMER, BEFORE_EXPIRE_DEL)
|
||||
@@ -69,7 +69,7 @@ TEST(SESSION_TIMER, BEFORE_EXPIRE_DEL)
|
||||
struct session sess1;
|
||||
struct session sess2;
|
||||
struct session sess3;
|
||||
struct session_timer *timer = session_timer_create();
|
||||
struct session_timer *timer = session_timer_new();
|
||||
EXPECT_TRUE(timer != NULL);
|
||||
|
||||
session_init(&sess1);
|
||||
@@ -104,7 +104,7 @@ TEST(SESSION_TIMER, BEFORE_EXPIRE_DEL)
|
||||
} while (sess);
|
||||
}
|
||||
|
||||
session_timer_destroy(timer);
|
||||
session_timer_free(timer);
|
||||
}
|
||||
|
||||
TEST(SESSION_TIMER, BEFORE_EXPIRE_UPDATE)
|
||||
@@ -113,7 +113,7 @@ TEST(SESSION_TIMER, BEFORE_EXPIRE_UPDATE)
|
||||
struct session sess1;
|
||||
struct session sess2;
|
||||
struct session sess3;
|
||||
struct session_timer *timer = session_timer_create();
|
||||
struct session_timer *timer = session_timer_new();
|
||||
EXPECT_TRUE(timer != NULL);
|
||||
|
||||
session_init(&sess1);
|
||||
@@ -150,14 +150,14 @@ TEST(SESSION_TIMER, BEFORE_EXPIRE_UPDATE)
|
||||
} while (sess);
|
||||
}
|
||||
|
||||
session_timer_destroy(timer);
|
||||
session_timer_free(timer);
|
||||
}
|
||||
|
||||
TEST(SESSION_TIMER, NEXT_EXPIRE_INTERVAL)
|
||||
{
|
||||
struct session sess1;
|
||||
struct session sess2;
|
||||
struct session_timer *timer = session_timer_create();
|
||||
struct session_timer *timer = session_timer_new();
|
||||
EXPECT_TRUE(timer != NULL);
|
||||
|
||||
session_init(&sess1);
|
||||
@@ -191,7 +191,7 @@ TEST(SESSION_TIMER, NEXT_EXPIRE_INTERVAL)
|
||||
EXPECT_TRUE(session_timer_expire_session(timer, 1010));
|
||||
EXPECT_TRUE(session_timer_next_expire_interval(timer) == UINT64_MAX);
|
||||
|
||||
session_timer_destroy(timer);
|
||||
session_timer_free(timer);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -35,7 +35,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
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);
|
||||
@@ -71,7 +71,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
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);
|
||||
@@ -106,7 +106,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
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);
|
||||
@@ -141,7 +141,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74);
|
||||
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_C2S);
|
||||
@@ -176,7 +176,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1);
|
||||
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);
|
||||
@@ -211,7 +211,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66 + 1354);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 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);
|
||||
@@ -246,7 +246,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66 + 1354 + 385);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 1 + 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);
|
||||
@@ -281,7 +281,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66 + 1354 + 385);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 1 + 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_C2S);
|
||||
@@ -316,7 +316,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66 + 1354 + 385);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 1 + 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_C2S);
|
||||
@@ -351,7 +351,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66 + 1354 + 385 + 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 1 + 1 + 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);
|
||||
@@ -386,7 +386,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 66 + 1354 + 385 + 66);
|
||||
EXPECT_TRUE(session_get_c2s_packets(sess) == 1 + 1 + 1 + 1 + 1 + 1);
|
||||
EXPECT_TRUE(session_get_s2c_packets(sess) == 1 + 1 + 1 + 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_C2S);
|
||||
@@ -400,7 +400,7 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
|
||||
__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
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA)
|
||||
|
||||
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_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA)
|
||||
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);
|
||||
@@ -73,7 +73,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA)
|
||||
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);
|
||||
@@ -87,7 +87,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA)
|
||||
__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
|
||||
|
||||
@@ -105,7 +105,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// SYNACK Packet
|
||||
@@ -127,7 +127,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA)
|
||||
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);
|
||||
@@ -162,7 +162,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 74 + 1354);
|
||||
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);
|
||||
@@ -176,7 +176,7 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA)
|
||||
__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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S REQ Packet
|
||||
@@ -42,7 +42,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
|
||||
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);
|
||||
@@ -77,7 +77,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 550);
|
||||
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);
|
||||
@@ -91,7 +91,7 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
|
||||
__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
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S REQ Packet
|
||||
@@ -40,7 +40,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S)
|
||||
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);
|
||||
@@ -55,7 +55,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S)
|
||||
__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
|
||||
|
||||
@@ -75,7 +75,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// S2C RESP Packet
|
||||
@@ -97,7 +97,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C)
|
||||
EXPECT_TRUE(session_get_s2c_bytes(sess) == 550);
|
||||
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);
|
||||
@@ -112,7 +112,7 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C)
|
||||
__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
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_DATA)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -33,7 +33,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_DATA)
|
||||
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_HALF_CLOSED1)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -33,7 +33,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_HALF_CLOSED1)
|
||||
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -46,7 +46,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_HALF_CLOSED2)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -77,7 +77,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_HALF_CLOSED2)
|
||||
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_HANDSHAKE)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// SYNACK Packet
|
||||
@@ -26,7 +26,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_HANDSHAKE)
|
||||
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_INIT1)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S SYN Packet
|
||||
@@ -26,7 +26,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_INIT1)
|
||||
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -39,7 +39,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_INIT2)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// S2C SYNACK Packet
|
||||
@@ -56,7 +56,7 @@ TEST(TIMEOUT, TCP_TIMEOUT_INIT2)
|
||||
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ TEST(TIMEOUT, UDP_TIMEOUT_DATA1)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S REQ Packet
|
||||
@@ -26,7 +26,7 @@ TEST(TIMEOUT, UDP_TIMEOUT_DATA1)
|
||||
EXPECT_TRUE(session_manager_get_expired_session(mgr) == NULL);
|
||||
__session_manager_check_counter(mgr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
session_manager_destroy(mgr);
|
||||
session_manager_free(mgr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -39,7 +39,7 @@ TEST(TIMEOUT, UDP_TIMEOUT_DATA2)
|
||||
|
||||
timestamp_update();
|
||||
|
||||
mgr = session_manager_create(&config);
|
||||
mgr = session_manager_new(&config);
|
||||
EXPECT_TRUE(mgr != NULL);
|
||||
|
||||
// C2S REQ Packet
|
||||
@@ -63,7 +63,7 @@ TEST(TIMEOUT, UDP_TIMEOUT_DATA2)
|
||||
EXPECT_TRUE(session_manager_get_expired_session(mgr) == NULL);
|
||||
__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