gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: change session key from address list to six tuple

Browse Source
This commit is contained in:
luwenpeng
2023-12-14 15:23:13 +08:00
parent 5620ac211b
commit a232045764
14 changed files with 773 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
src/session/gtest_session_table.cpp
View File

@@ -1,44 +1,40 @@
#include <gtest/gtest.h>
#include "session_address.h"
#include "session_pool.h"
#include "session_table.h"
#define SESSION_ADDRESS_IPV4_TCP(name) \
struct session_address name = {0}; \
(name).layers[0].type = LAYER_IPV4; \
(name).layers[0].tuple.ipv4.src.s_addr = inet_addr("192.168.1.2"); \
(name).layers[0].tuple.ipv4.dst.s_addr = inet_addr("192.168.1.3"); \
(name).layers[1].type = LAYER_TCP; \
(name).layers[1].tuple.tcp.src = htons(1234); \
(name).layers[1].tuple.tcp.dst = htons(5678); \
(name).used = 2;
#define SESSION_KEY_IPV4_TCP(name) \
struct session_key name; \
memset(&name, 0, sizeof(struct session_key)); \
(name).ip_type = IP_TYPE_V4; \
(name).src_addr.v4.s_addr = inet_addr("192.168.1.2"); \
(name).dst_addr.v4.s_addr = inet_addr("192.168.1.3"); \
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_TCP; \
(name).security_zone = 0;
#define SESSION_ADDRESS_IPV6_UDP(name) \
struct session_address name = {0}; \
(name).layers[0].type = LAYER_IPV6; \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:8329", &(name).layers[0].tuple.ipv6.src); \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:832a", &(name).layers[0].tuple.ipv6.dst); \
(name).layers[1].type = LAYER_UDP; \
(name).layers[1].tuple.udp.src = htons(2345); \
(name).layers[1].tuple.udp.dst = htons(443); \
(name).used = 2;
#define SESSION_KEY_IPV6_UDP(name) \
struct session_key name; \
memset(&name, 0, sizeof(struct session_key)); \
(name).ip_type = IP_TYPE_V6; \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:8329", &(name).src_addr.v6); \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:832a", &(name).dst_addr.v6); \
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_UDP; \
(name).security_zone = 0;
#define SESSION_ADDRESS_IPV4_UDP_IPV6_TCP(name) \
struct session_address name = {0}; \
(name).layers[0].type = LAYER_IPV4; \
(name).layers[0].tuple.ipv4.src.s_addr = inet_addr("192.168.1.2"); \
(name).layers[0].tuple.ipv4.dst.s_addr = inet_addr("192.168.1.3"); \
(name).layers[1].type = LAYER_UDP; \
(name).layers[1].tuple.udp.src = htons(1234); \
(name).layers[1].tuple.udp.dst = htons(5678); \
(name).layers[2].type = LAYER_IPV6; \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:8329", &(name).layers[2].tuple.ipv6.src); \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:832a", &(name).layers[2].tuple.ipv6.dst); \
(name).layers[3].type = LAYER_TCP; \
(name).layers[3].tuple.tcp.src = htons(2345); \
(name).layers[3].tuple.tcp.dst = htons(443); \
(name).used = 4;
#define SESSION_KEY_IPV6_TCP(name) \
struct session_key name; \
memset(&name, 0, sizeof(struct session_key)); \
(name).ip_type = IP_TYPE_V6; \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:8329", &(name).src_addr.v6); \
inet_pton(AF_INET6, "2001:db8:0:0:0:ff00:42:832a", &(name).dst_addr.v6); \
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_TCP; \
(name).security_zone = 0;
static void session_free_callback(struct session *sess, void *arg)
{
@@ -58,9 +54,17 @@ TEST(SESSION_TABLE, OP_SESSION)
struct session_pool *sess_pool = NULL;
struct session_table *sess_table = NULL;
SESSION_ADDRESS_IPV4_TCP(sess1_addr);
SESSION_ADDRESS_IPV6_UDP(sess2_addr);
SESSION_ADDRESS_IPV4_UDP_IPV6_TCP(sess3_addr);
SESSION_KEY_IPV4_TCP(sess1_key);
SESSION_KEY_IPV6_UDP(sess2_key);
SESSION_KEY_IPV6_TCP(sess3_key);
struct session_key sess1_key_reversed;
struct session_key sess2_key_reversed;
struct session_key sess3_key_reversed;
session_key_reverse(&sess1_key, &sess1_key_reversed);
session_key_reverse(&sess2_key, &sess2_key_reversed);
session_key_reverse(&sess3_key, &sess3_key_reversed);
// Create
sess_pool = session_pool_create(3);
@@ -69,56 +73,53 @@ TEST(SESSION_TABLE, OP_SESSION)
EXPECT_TRUE(sess_table != NULL);
session_table_set_freecb(sess_table, session_free_callback, sess_pool);
// Add session
// Add
sess1 = session_pool_alloc(sess_pool);
EXPECT_TRUE(sess1 != NULL);
session_set_id(sess1, 1);
session_set_address(sess1, &sess1_addr);
session_set_key(sess1, &sess1_key);
sess2 = session_pool_alloc(sess_pool);
EXPECT_TRUE(sess2 != NULL);
session_set_id(sess2, 2);
session_set_address(sess2, &sess2_addr);
session_set_key(sess2, &sess2_key);
sess3 = session_pool_alloc(sess_pool);
EXPECT_TRUE(sess3 != NULL);
session_set_id(sess3, 3);
session_set_address(sess3, &sess3_addr);
session_set_key(sess3, &sess3_key);
EXPECT_TRUE(session_table_add_session(sess_table, sess1) == 0);
EXPECT_TRUE(session_table_add_session(sess_table, &sess1_key, sess1) == 0);
EXPECT_TRUE(session_table_get_count(sess_table) == 1);
EXPECT_TRUE(session_table_add_session(sess_table, sess2) == 0);
EXPECT_TRUE(session_table_add_session(sess_table, &sess2_key, sess2) == 0);
EXPECT_TRUE(session_table_get_count(sess_table) == 2);
EXPECT_TRUE(session_table_add_session(sess_table, sess3) == 0);
EXPECT_TRUE(session_table_add_session(sess_table, &sess3_key, sess3) == 0);
EXPECT_TRUE(session_table_get_count(sess_table) == 3);
// Search session with id
EXPECT_TRUE(session_table_find_session_by_id(sess_table, 1) == sess1);
EXPECT_TRUE(session_table_find_session_by_id(sess_table, 2) == sess2);
EXPECT_TRUE(session_table_find_session_by_id(sess_table, 3) == sess3);
// Search
EXPECT_TRUE(session_table_find_session(sess_table, &sess1_key) == sess1);
EXPECT_TRUE(session_table_find_session(sess_table, &sess2_key) == sess2);
EXPECT_TRUE(session_table_find_session(sess_table, &sess3_key) == sess3);
// Search session with address
session_address_reverse(&sess3_addr);
EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess1_addr) == sess1);
EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess2_addr) == sess2);
EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess3_addr) == sess3);
EXPECT_TRUE(session_table_find_session(sess_table, &sess1_key_reversed) == sess1);
EXPECT_TRUE(session_table_find_session(sess_table, &sess2_key_reversed) == sess2);
EXPECT_TRUE(session_table_find_session(sess_table, &sess3_key_reversed) == sess3);
// Delete session with id
session_table_delete_session_by_id(sess_table, 1);
// Delete
session_table_delete_session(sess_table, &sess1_key);
EXPECT_TRUE(session_table_get_count(sess_table) == 2);
EXPECT_TRUE(session_table_find_session_by_id(sess_table, 1) == NULL);
EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess1_addr) == NULL);
EXPECT_TRUE(session_table_find_session(sess_table, &sess1_key) == NULL);
EXPECT_TRUE(session_table_find_session(sess_table, &sess1_key_reversed) == NULL);
session_table_delete_session_by_id(sess_table, 2);
session_table_delete_session(sess_table, &sess2_key_reversed);
EXPECT_TRUE(session_table_get_count(sess_table) == 1);
EXPECT_TRUE(session_table_find_session_by_id(sess_table, 2) == NULL);
EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess2_addr) == NULL);
EXPECT_TRUE(session_table_find_session(sess_table, &sess2_key) == NULL);
EXPECT_TRUE(session_table_find_session(sess_table, &sess2_key_reversed) == NULL);
// Delete session with address
session_table_delete_session_by_addr(sess_table, &sess3_addr);
session_table_delete_session(sess_table, &sess3_key);
EXPECT_TRUE(session_table_get_count(sess_table) == 0);
EXPECT_TRUE(session_table_find_session_by_id(sess_table, 3) == NULL);
EXPECT_TRUE(session_table_find_session_by_addr(sess_table, &sess3_addr) == NULL);
EXPECT_TRUE(session_table_find_session(sess_table, &sess3_key) == NULL);
EXPECT_TRUE(session_table_find_session(sess_table, &sess3_key_reversed) == NULL);
// Destroy
session_table_destroy(sess_table);
@@ -133,9 +134,9 @@ TEST(SESSION_TABLE, FIND_OLDEST_NEWEST)
struct session_pool *sess_pool = NULL;
struct session_table *sess_table = NULL;
SESSION_ADDRESS_IPV4_TCP(sess1_addr);
SESSION_ADDRESS_IPV6_UDP(sess2_addr);
SESSION_ADDRESS_IPV4_UDP_IPV6_TCP(sess3_addr);
SESSION_KEY_IPV4_TCP(sess1_key);
SESSION_KEY_IPV6_UDP(sess2_key);
SESSION_KEY_IPV6_TCP(sess3_key);
// Create
sess_pool = session_pool_create(3);
@@ -152,38 +153,38 @@ TEST(SESSION_TABLE, FIND_OLDEST_NEWEST)
sess1 = session_pool_alloc(sess_pool);
EXPECT_TRUE(sess1 != NULL);
session_set_id(sess1, 1);
session_set_address(sess1, &sess1_addr);
EXPECT_TRUE(session_table_add_session(sess_table, sess1) == 0);
session_set_key(sess1, &sess1_key);
EXPECT_TRUE(session_table_add_session(sess_table, &sess1_key, sess1) == 0);
EXPECT_TRUE(session_table_find_oldest_session(sess_table) == sess1);
EXPECT_TRUE(session_table_find_newest_session(sess_table) == sess1);
sess2 = session_pool_alloc(sess_pool);
EXPECT_TRUE(sess2 != NULL);
session_set_id(sess2, 2);
session_set_address(sess2, &sess2_addr);
EXPECT_TRUE(session_table_add_session(sess_table, sess2) == 0);
session_set_key(sess2, &sess2_key);
EXPECT_TRUE(session_table_add_session(sess_table, &sess2_key, sess2) == 0);
EXPECT_TRUE(session_table_find_oldest_session(sess_table) == sess1);
EXPECT_TRUE(session_table_find_newest_session(sess_table) == sess2);
sess3 = session_pool_alloc(sess_pool);
EXPECT_TRUE(sess3 != NULL);
session_set_id(sess3, 3);
session_set_address(sess3, &sess3_addr);
EXPECT_TRUE(session_table_add_session(sess_table, sess3) == 0);
session_set_key(sess3, &sess3_key);
EXPECT_TRUE(session_table_add_session(sess_table, &sess3_key, sess3) == 0);
EXPECT_TRUE(session_table_find_oldest_session(sess_table) == sess1);
EXPECT_TRUE(session_table_find_newest_session(sess_table) == sess3);
// Delete Session
session_table_delete_session_by_id(sess_table, 1);
session_table_delete_session(sess_table, &sess1_key);
EXPECT_TRUE(session_table_find_oldest_session(sess_table) == sess2);
EXPECT_TRUE(session_table_find_newest_session(sess_table) == sess3);
session_table_delete_session_by_id(sess_table, 2);
session_table_delete_session(sess_table, &sess2_key);
EXPECT_TRUE(session_table_find_oldest_session(sess_table) == sess3);
EXPECT_TRUE(session_table_find_newest_session(sess_table) == sess3);
session_table_delete_session_by_id(sess_table, 3);
session_table_delete_session(sess_table, &sess3_key);
EXPECT_TRUE(session_table_find_oldest_session(sess_table) == NULL);
EXPECT_TRUE(session_table_find_newest_session(sess_table) == NULL);