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

rename security_zone to domain

Browse Source
This commit is contained in:
luwenpeng
2024-01-15 14:31:38 +08:00
parent a045c04f8d
commit 8f685bc018
10 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/packet/packet.cpp
View File

@@ -49,7 +49,7 @@ static inline const char *layer_type_tostring(enum layer_type type);
static inline void set_tuple2(const char *data, enum layer_type type, struct tuple2 *tuple);
static inline void set_tuple4(const char *data, enum layer_type type, struct tuple4 *tuple);
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t zone_id);
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t domain);
static inline struct layer_record *get_free_layer(struct packet *handler);
@@ -368,14 +368,14 @@ static inline void set_tuple4(const char *data, enum layer_type type, struct tup
}
}
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t zone_id)
static inline void set_tuple6(const char *data, enum layer_type type, struct tuple6 *tuple, uint64_t domain)
{
const struct ip *ipv4 = NULL;
const struct ip6_hdr *ipv6 = NULL;
const struct tcphdr *tcp = NULL;
const struct udphdr *udp = NULL;
tuple->security_zone = zone_id;
tuple->domain = domain;
switch (type)
{
@@ -1100,7 +1100,7 @@ const char *packet_parse(struct packet *handler, const char *data, uint16_t len)
handler->layers_size = PACKET_MAX_LAYERS;
handler->data_ptr = data;
handler->data_len = len;
handler->zone_id = 0;
handler->domain = 0;
handler->user_data = NULL;
// TESTED
@@ -1273,8 +1273,8 @@ int packet_get_innermost_tuple6(const struct packet *handler, struct tuple6 *tup
if (layer_l3 && layer_l4)
{
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->zone_id);
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->zone_id);
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->domain);
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->domain);
return 0;
}
else
@@ -1312,8 +1312,8 @@ int packet_get_outermost_tuple6(const struct packet *handler, struct tuple6 *tup
if (layer_l3 && layer_l4)
{
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->zone_id);
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->zone_id);
set_tuple6((const char *)handler->data_ptr + layer_l3->hdr_offset, layer_l3->type, tuple, handler->domain);
set_tuple6((const char *)handler->data_ptr + layer_l4->hdr_offset, layer_l4->type, tuple, handler->domain);
return 0;
}
else

2
src/packet/packet.h
View File

@@ -85,7 +85,7 @@ struct packet
const char *data_ptr;
uint16_t data_len;
uint64_t zone_id;
uint64_t domain;
const void *user_data;
};

4
src/packet/packet_helpers.h
View File

@@ -138,9 +138,9 @@ static inline void packet_free(struct packet *pkt)
}
}
static inline uint64_t packet_get_zone_id(const struct packet *pkt)
static inline uint64_t packet_get_domain(const struct packet *pkt)
{
return pkt->zone_id;
return pkt->domain;
}
static inline uint16_t packet_get_raw_len(const struct packet *pkt)

44
src/packet/test/gtest_packet.cpp
View File

@@ -213,10 +213,10 @@ TEST(PACKET, ETH_VLAN_VLAN_IP4_IP4_UDP)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000, proto: 17, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "10.10.100.25:62367 -> 10.10.101.2:17000, proto: 17, domain: 0");
}
#endif
@@ -439,10 +439,10 @@ TEST(PACKET, ETH_IP6_IP4_TCP_SSH)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22, proto: 6, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "1.1.1.1:57639 -> 2.2.2.2:22, proto: 6, domain: 0");
}
#endif
@@ -722,10 +722,10 @@ TEST(PACKET, ETH_VLAN_IP6_IP4_GRE_PPP_IP4_UDP_DNS)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879, proto: 17, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "8.8.8.8:53 -> 172.16.44.3:9879, proto: 17, domain: 0");
}
#endif
@@ -921,10 +921,10 @@ TEST(PACKET, ETH_IP4_IP6_TCP)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80, proto: 6, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "2001:da8:200:900e:200:5efe:d24d:58a3:52556 -> 2600:140e:6::1702:1058:80, proto: 6, domain: 0");
}
#endif
@@ -1100,10 +1100,10 @@ TEST(PACKET, ETH_IP6_IP6_UDP)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000, proto: 17, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "dead::beef:30000 -> cafe::babe:13000, proto: 17, domain: 0");
}
#endif
@@ -1298,10 +1298,10 @@ TEST(PACKET, ETH_MPLS_IP4_TCP)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80, proto: 6, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "119.40.37.65:61853 -> 123.125.29.250:80, proto: 6, domain: 0");
}
#endif
@@ -1509,10 +1509,10 @@ TEST(PACKET, ETH_MPLS_MPLS_IP4_TCP)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23, proto: 6, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "10.31.0.1:11001 -> 10.34.0.1:23, proto: 6, domain: 0");
}
#endif
@@ -1731,10 +1731,10 @@ TEST(PACKET, ETH_VLAN_PPPOE_IP4_TCP)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443, proto: 6, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "100.65.55.0:34532 -> 91.185.14.33:443, proto: 6, domain: 0");
}
#endif
@@ -2011,10 +2011,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP6_TCP_TLS)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "2409:8034:4040:5300::105:2152 -> 2409:8034:4025::60:61:2152, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "2409:8034:4040:5300::105:2152 -> 2409:8034:4025::60:61:2152, proto: 17, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "2409:8c34:4400:700:0:4:0:3:443 -> 2409:8934:5082:2100:ecad:e0e4:530a:c269:46582, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "2409:8c34:4400:700:0:4:0:3:443 -> 2409:8934:5082:2100:ecad:e0e4:530a:c269:46582, proto: 6, domain: 0");
}
#endif
@@ -2304,10 +2304,10 @@ TEST(PACKET, ETH_IP6_UDP_GTP_IP4_TCP_TLS)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "2409:8034:4025::50:a31:2152 -> 2409:8034:4040:5301::204:2152, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "2409:8034:4025::50:a31:2152 -> 2409:8034:4040:5301::204:2152, proto: 17, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "10.49.115.138:50081 -> 121.196.250.66:443, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "10.49.115.138:50081 -> 121.196.250.66:443, proto: 6, domain: 0");
}
#endif
@@ -2536,10 +2536,10 @@ TEST(PACKET, ETH_IP4_UDP_VXLAN_ETH_IP4_UDP_DNS)
EXPECT_TRUE(packet_get_innermost_tuple6(&handler, &inner_tuple6) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&outer_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "10.1.1.1:50709 -> 192.168.1.10:4789, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "10.1.1.1:50709 -> 192.168.1.10:4789, proto: 17, domain: 0");
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(&inner_tuple6, buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.11.193:65290 -> 114.114.114.114:53, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "192.168.11.193:65290 -> 114.114.114.114:53, proto: 17, domain: 0");
}
#endif

6
src/session/test/gtest_session.cpp
View File

@@ -11,7 +11,7 @@
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_TCP; \
(name).security_zone = 0;
(name).domain = 0;
#define SESSION_KEY_IPV6_UDP(name) \
struct tuple6 name; \
@@ -22,7 +22,7 @@
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_UDP; \
(name).security_zone = 0;
(name).domain = 0;
#define SESSION_KEY_IPV6_TCP(name) \
struct tuple6 name; \
@@ -33,7 +33,7 @@
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_TCP; \
(name).security_zone = 0;
(name).domain = 0;
void free_ex_data(struct session *sess, uint8_t idx, void *ex_ptr, void *arg)
{

58
src/session/test/gtest_session_manager.cpp
View File

@@ -84,7 +84,7 @@ TEST(SESSION_MANAGER, INIT_TO_OPENING_BY_SYN)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -160,7 +160,7 @@ TEST(SESSION_MANAGER, INIT_TO_OPENING_BY_SYNACK)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_S2C);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -240,7 +240,7 @@ TEST(SESSION_MANAGER, INIT_TO_ACTIVE_BY_UDP_C2S)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
@@ -316,7 +316,7 @@ TEST(SESSION_MANAGER, INIT_TO_ACTIVE_BY_UDP_S2C)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "121.14.154.93:53 -> 192.168.38.105:61099, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "121.14.154.93:53 -> 192.168.38.105:61099, proto: 17, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_S2C);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
@@ -403,7 +403,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_C2S_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -441,7 +441,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_C2S_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -531,7 +531,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_S2C_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -569,7 +569,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_S2C_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -657,7 +657,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYNACK_AND_C2S_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_S2C);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -695,7 +695,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYNACK_AND_C2S_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_S2C);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -784,7 +784,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYNACK_AND_S2C_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_S2C);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -822,7 +822,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYNACK_AND_S2C_PAYLOAD)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "93.184.216.34:80 -> 192.168.38.105:60111, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_S2C);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -916,7 +916,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_SYNACK_AND_ACK_AND_C2S_PAYLOA
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -954,7 +954,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_SYNACK_AND_ACK_AND_C2S_PAYLOA
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -992,7 +992,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_SYNACK_AND_ACK_AND_C2S_PAYLOA
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1030,7 +1030,7 @@ TEST(SESSION_MANAGER, OPENING_TO_ACTIVE_BY_SYN_AND_SYNACK_AND_ACK_AND_C2S_PAYLOA
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1219,7 +1219,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1257,7 +1257,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1295,7 +1295,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1333,7 +1333,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1371,7 +1371,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1409,7 +1409,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1447,7 +1447,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1485,7 +1485,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1523,7 +1523,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1561,7 +1561,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1599,7 +1599,7 @@ TEST(SESSION_MANAGER, TCP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:60111 -> 93.184.216.34:80, proto: 6, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
@@ -1688,7 +1688,7 @@ TEST(SESSION_MANAGER, UDP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
@@ -1726,7 +1726,7 @@ TEST(SESSION_MANAGER, UDP_FULL_STREAM)
EXPECT_TRUE(session_get_id(sess) == 0);
memset(buffer, 0, sizeof(buffer));
tuple6_tostring(session_get0_tuple6(sess), buffer, sizeof(buffer));
EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, zone: 0");
EXPECT_STREQ(buffer, "192.168.38.105:61099 -> 121.14.154.93:53, proto: 17, domain: 0");
EXPECT_TRUE(session_get_tuple6_dir(sess) == SESSION_DIR_C2S);
EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);

6
src/session/test/gtest_session_table.cpp
View File

@@ -12,7 +12,7 @@
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_TCP; \
(name).security_zone = 0;
(name).domain = 0;
#define SESSION_KEY_IPV6_UDP(name) \
struct tuple6 name; \
@@ -23,7 +23,7 @@
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_UDP; \
(name).security_zone = 0;
(name).domain = 0;
#define SESSION_KEY_IPV6_TCP(name) \
struct tuple6 name; \
@@ -34,7 +34,7 @@
(name).src_port = htons(1234); \
(name).dst_port = htons(5678); \
(name).ip_proto = IPPROTO_TCP; \
(name).security_zone = 0;
(name).domain = 0;
static void session_free_callback(struct session *sess, void *arg)
{

12
src/tuple/test/gtest_tuple.cpp
View File

@@ -210,7 +210,7 @@ TEST(TUPLE, TUPLE6)
tuple_a.src_port = htons(1234);
tuple_a.dst_port = htons(5678);
tuple_a.ip_proto = IPPROTO_TCP;
tuple_a.security_zone = 0;
tuple_a.domain = 0;
tuple_b.ip_type = IP_TYPE_V6;
inet_pton(AF_INET6, "2001:db8::ff00:42:8329", &tuple_b.src_addr.v6);
@@ -218,25 +218,25 @@ TEST(TUPLE, TUPLE6)
tuple_b.src_port = htons(1234);
tuple_b.dst_port = htons(5678);
tuple_b.ip_proto = IPPROTO_UDP;
tuple_b.security_zone = 0;
tuple_b.domain = 0;
// tostring
memset(buf, 0, sizeof(buf));
tuple6_tostring(&tuple_a, buf, sizeof(buf));
EXPECT_STREQ(buf, "192.168.1.2:1234 -> 192.168.1.3:5678, proto: 6, zone: 0");
EXPECT_STREQ(buf, "192.168.1.2:1234 -> 192.168.1.3:5678, proto: 6, domain: 0");
memset(buf, 0, sizeof(buf));
tuple6_tostring(&tuple_b, buf, sizeof(buf));
EXPECT_STREQ(buf, "2001:db8::ff00:42:8329:1234 -> 2001:db8::ff00:42:832a:5678, proto: 17, zone: 0");
EXPECT_STREQ(buf, "2001:db8::ff00:42:8329:1234 -> 2001:db8::ff00:42:832a:5678, proto: 17, domain: 0");
// reverse
tuple6_reverse(&tuple_a, &reversed_tuple_a);
tuple6_reverse(&tuple_b, &reversed_tuple_b);
memset(buf, 0, sizeof(buf));
tuple6_tostring(&reversed_tuple_a, buf, sizeof(buf));
EXPECT_STREQ(buf, "192.168.1.3:5678 -> 192.168.1.2:1234, proto: 6, zone: 0");
EXPECT_STREQ(buf, "192.168.1.3:5678 -> 192.168.1.2:1234, proto: 6, domain: 0");
memset(buf, 0, sizeof(buf));
tuple6_tostring(&reversed_tuple_b, buf, sizeof(buf));
EXPECT_STREQ(buf, "2001:db8::ff00:42:832a:5678 -> 2001:db8::ff00:42:8329:1234, proto: 17, zone: 0");
EXPECT_STREQ(buf, "2001:db8::ff00:42:832a:5678 -> 2001:db8::ff00:42:8329:1234, proto: 17, domain: 0");
// hash
EXPECT_TRUE(tuple6_hash(&tuple_a) == tuple6_hash(&reversed_tuple_a));

10
src/tuple/tuple.cpp
View File

@@ -88,7 +88,7 @@ uint32_t tuple6_hash(const struct tuple6 *tuple)
uint32_t dst_port_hash = 0;
uint32_t hash = crc32_hash(&tuple->ip_type, sizeof(tuple->ip_type), 0);
hash = crc32_hash(&tuple->ip_proto, sizeof(tuple->ip_proto), hash);
hash = crc32_hash(&tuple->security_zone, sizeof(tuple->security_zone), hash);
hash = crc32_hash(&tuple->domain, sizeof(tuple->domain), hash);
if (tuple->ip_type == IP_TYPE_V4)
{
@@ -241,7 +241,7 @@ int tuple5_cmp(const struct tuple5 *tuple_a, const struct tuple5 *tuple_b)
int tuple6_cmp(const struct tuple6 *tuple_a, const struct tuple6 *tuple_b)
{
if (tuple_a->security_zone != tuple_b->security_zone)
if (tuple_a->domain != tuple_b->domain)
{
return -1;
}
@@ -351,7 +351,7 @@ void tuple6_reverse(const struct tuple6 *in, struct tuple6 *out)
{
out->ip_type = in->ip_type;
out->ip_proto = in->ip_proto;
out->security_zone = in->security_zone;
out->domain = in->domain;
out->src_port = in->dst_port;
out->dst_port = in->src_port;
@@ -445,8 +445,8 @@ void tuple6_tostring(const struct tuple6 *tuple, char *buf, uint32_t size)
inet_ntop(AF_INET6, &tuple->dst_addr.v6, dst_addr, INET6_ADDRSTRLEN);
}
snprintf(buf, size, "%s:%u -> %s:%u, proto: %u, zone: %lu",
snprintf(buf, size, "%s:%u -> %s:%u, proto: %u, domain: %lu",
src_addr, ntohs(tuple->src_port),
dst_addr, ntohs(tuple->dst_port),
tuple->ip_proto, tuple->security_zone);
tuple->ip_proto, tuple->domain);
}

2
src/tuple/tuple.h
View File

@@ -59,7 +59,7 @@ struct tuple6
uint16_t dst_port; /* network order */
uint16_t ip_proto; /* network order */
uint64_t security_zone;
uint64_t domain;
};
uint32_t tuple2_hash(const struct tuple2 *tuple);