session table rename

This commit is contained in:
luwenpeng
2023-12-13 14:07:24 +08:00
parent 2d3e182b5a
commit fc5b5857b8
3 changed files with 25 additions and 25 deletions

View File

@@ -93,32 +93,32 @@ TEST(SESSION_TABLE, OP_SESSION)
EXPECT_TRUE(session_table_get_count(sess_table) == 3); EXPECT_TRUE(session_table_get_count(sess_table) == 3);
// Search session with id // Search session with id
EXPECT_TRUE(session_table_search_session_with_id(sess_table, 1) == sess1); EXPECT_TRUE(session_table_find_session_by_id(sess_table, 1) == sess1);
EXPECT_TRUE(session_table_search_session_with_id(sess_table, 2) == sess2); EXPECT_TRUE(session_table_find_session_by_id(sess_table, 2) == sess2);
EXPECT_TRUE(session_table_search_session_with_id(sess_table, 3) == sess3); EXPECT_TRUE(session_table_find_session_by_id(sess_table, 3) == sess3);
// Search session with address // Search session with address
session_address_reverse(&sess3_addr); session_address_reverse(&sess3_addr);
EXPECT_TRUE(session_table_search_session_with_addr(sess_table, &sess1_addr) == sess1); EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess1_addr) == sess1);
EXPECT_TRUE(session_table_search_session_with_addr(sess_table, &sess2_addr) == sess2); EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess2_addr) == sess2);
EXPECT_TRUE(session_table_search_session_with_addr(sess_table, &sess3_addr) == sess3); EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess3_addr) == sess3);
// Delete session with id // Delete session with id
session_table_delete_session_with_id(sess_table, 1); session_table_delete_session_by_id(sess_table, 1);
EXPECT_TRUE(session_table_get_count(sess_table) == 2); EXPECT_TRUE(session_table_get_count(sess_table) == 2);
EXPECT_TRUE(session_table_search_session_with_id(sess_table, 1) == NULL); EXPECT_TRUE(session_table_find_session_by_id(sess_table, 1) == NULL);
EXPECT_TRUE(session_table_search_session_with_addr(sess_table, &sess1_addr) == NULL); EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess1_addr) == NULL);
session_table_delete_session_with_id(sess_table, 2); session_table_delete_session_by_id(sess_table, 2);
EXPECT_TRUE(session_table_get_count(sess_table) == 1); EXPECT_TRUE(session_table_get_count(sess_table) == 1);
EXPECT_TRUE(session_table_search_session_with_id(sess_table, 2) == NULL); EXPECT_TRUE(session_table_find_session_by_id(sess_table, 2) == NULL);
EXPECT_TRUE(session_table_search_session_with_addr(sess_table, &sess2_addr) == NULL); EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess2_addr) == NULL);
// Delete session with address // Delete session with address
session_table_delete_session_with_addr(sess_table, &sess3_addr); session_table_delete_session_by_addr(sess_table, &sess3_addr);
EXPECT_TRUE(session_table_get_count(sess_table) == 0); EXPECT_TRUE(session_table_get_count(sess_table) == 0);
EXPECT_TRUE(session_table_search_session_with_id(sess_table, 3) == NULL); EXPECT_TRUE(session_table_find_session_by_id(sess_table, 3) == NULL);
EXPECT_TRUE(session_table_search_session_with_addr(sess_table, &sess3_addr) == NULL); EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess3_addr) == NULL);
// Destroy // Destroy
session_table_destroy(sess_table); session_table_destroy(sess_table);

View File

@@ -81,14 +81,14 @@ void session_table_add_session(struct session_table *table, struct session *sess
table->count++; table->count++;
} }
void session_table_delete_session_with_id(struct session_table *table, uint64_t id) void session_table_delete_session_by_id(struct session_table *table, uint64_t id)
{ {
if (table == NULL) if (table == NULL)
{ {
return; return;
} }
struct session *sess = session_table_search_session_with_id(table, id); struct session *sess = session_table_find_session_by_id(table, id);
if (sess == NULL) if (sess == NULL)
{ {
return; return;
@@ -105,14 +105,14 @@ void session_table_delete_session_with_id(struct session_table *table, uint64_t
table->count--; table->count--;
} }
void session_table_delete_session_with_addr(struct session_table *table, struct session_address *addr) void session_table_delete_session_by_addr(struct session_table *table, struct session_address *addr)
{ {
if (table == NULL) if (table == NULL)
{ {
return; return;
} }
struct session *sess = session_table_search_session_with_addr(table, addr); struct session *sess = session_table_find_session_by_addr(table, addr);
if (sess == NULL) if (sess == NULL)
{ {
return; return;
@@ -129,7 +129,7 @@ void session_table_delete_session_with_addr(struct session_table *table, struct
table->count--; table->count--;
} }
struct session *session_table_search_session_with_id(struct session_table *table, uint64_t id) struct session *session_table_find_session_by_id(struct session_table *table, uint64_t id)
{ {
if (table == NULL) if (table == NULL)
{ {
@@ -142,7 +142,7 @@ struct session *session_table_search_session_with_id(struct session_table *table
return sess; return sess;
} }
struct session *session_table_search_session_with_addr(struct session_table *table, struct session_address *addr) struct session *session_table_find_session_by_addr(struct session_table *table, struct session_address *addr)
{ {
if (table == NULL) if (table == NULL)
{ {

View File

@@ -21,10 +21,10 @@ void session_table_set_freecb(struct session_table *table, session_free_cb free_
* must not add session with same id or same address. * must not add session with same id or same address.
*/ */
void session_table_add_session(struct session_table *table, struct session *sess); void session_table_add_session(struct session_table *table, struct session *sess);
void session_table_delete_session_with_id(struct session_table *table, uint64_t id); void session_table_delete_session_by_id(struct session_table *table, uint64_t id);
void session_table_delete_session_with_addr(struct session_table *table, struct session_address *addr); void session_table_delete_session_by_addr(struct session_table *table, struct session_address *addr);
struct session *session_table_search_session_with_id(struct session_table *table, uint64_t id); struct session *session_table_find_session_by_id(struct session_table *table, uint64_t id);
struct session *session_table_search_session_with_addr(struct session_table *table, struct session_address *addr); struct session *session_table_find_session_by_addr(struct session_table *table, struct session_address *addr);
#ifdef __cpluscplus #ifdef __cpluscplus
} }