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