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

rename ip_reassembly args name 'mgr' -> 'assembler'

Browse Source
This commit is contained in:
luwenpeng
2024-03-15 09:59:33 +08:00
parent ce00122557
commit 5b8d5610a2
4 changed files with 244 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/ip_reassembly/test/gtest_ipv4_reassembly.cpp
View File

@@ -197,7 +197,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
struct packet pkt;
struct packet *new_pkt;
const struct layer *layer;
struct ip_reassembly *mgr;
struct ip_reassembly *assembler;
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
@@ -205,10 +205,10 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
.bucket_num = 8,
};
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
assembler = ip_reassembly_new(&opts);
EXPECT_TRUE(assembler != NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
0, 0, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -216,10 +216,10 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
// frag1
packet_parse(&pkt, (const char *)frag1, sizeof(frag1));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
1, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -227,10 +227,10 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
// frag2
packet_parse(&pkt, (const char *)frag2, sizeof(frag2));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
2, 1, 1, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -280,7 +280,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
// free packet
packet_free(new_pkt);
ip_reassembly_free(mgr);
ip_reassembly_free(assembler);
}
#endif
@@ -290,7 +290,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
struct packet pkt;
struct packet *new_pkt;
const struct layer *layer;
struct ip_reassembly *mgr;
struct ip_reassembly *assembler;
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
@@ -298,10 +298,10 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
.bucket_num = 8,
};
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
assembler = ip_reassembly_new(&opts);
EXPECT_TRUE(assembler != NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
0, 0, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -309,10 +309,10 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
// frag2
packet_parse(&pkt, (const char *)frag2, sizeof(frag2));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
1, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -320,10 +320,10 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
// frag1
packet_parse(&pkt, (const char *)frag1, sizeof(frag1));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
2, 1, 1, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -373,7 +373,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
// free packet
packet_free(new_pkt);
ip_reassembly_free(mgr);
ip_reassembly_free(assembler);
}
#endif
@@ -382,7 +382,7 @@ TEST(IPV4_REASSEMBLE, EXPIRE)
{
struct packet pkt;
struct packet *new_pkt;
struct ip_reassembly *mgr;
struct ip_reassembly *assembler;
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
@@ -390,10 +390,10 @@ TEST(IPV4_REASSEMBLE, EXPIRE)
.bucket_num = 8,
};
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
assembler = ip_reassembly_new(&opts);
EXPECT_TRUE(assembler != NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
0, 0, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -401,10 +401,10 @@ TEST(IPV4_REASSEMBLE, EXPIRE)
// frag1
packet_parse(&pkt, (const char *)frag1, sizeof(frag1));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
1, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -412,10 +412,10 @@ TEST(IPV4_REASSEMBLE, EXPIRE)
// frag2
packet_parse(&pkt, (const char *)frag2, sizeof(frag2));
new_pkt = ip_reassembly_packet(mgr, &pkt, 2);
new_pkt = ip_reassembly_packet(assembler, &pkt, 2);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
2, 2, 1, 1, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -424,7 +424,7 @@ TEST(IPV4_REASSEMBLE, EXPIRE)
// free packet
packet_free(new_pkt);
ip_reassembly_free(mgr);
ip_reassembly_free(assembler);
}
#endif
@@ -434,7 +434,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
struct packet pkt;
struct packet *new_pkt;
const struct layer *layer;
struct ip_reassembly *mgr;
struct ip_reassembly *assembler;
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
@@ -442,10 +442,10 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
.bucket_num = 8,
};
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
assembler = ip_reassembly_new(&opts);
EXPECT_TRUE(assembler != NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
0, 0, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -453,10 +453,10 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
// frag1
packet_parse(&pkt, (const char *)frag1, sizeof(frag1));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
1, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -464,10 +464,10 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
// frag1
packet_parse(&pkt, (const char *)frag1, sizeof(frag1));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
2, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 1, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -475,10 +475,10 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
// frag2
packet_parse(&pkt, (const char *)frag2, sizeof(frag2));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
3, 1, 1, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 1, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -528,7 +528,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
// free packet
packet_free(new_pkt);
ip_reassembly_free(mgr);
ip_reassembly_free(assembler);
}
#endif
@@ -538,7 +538,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
struct packet pkt;
struct packet *new_pkt;
const struct layer *layer;
struct ip_reassembly *mgr;
struct ip_reassembly *assembler;
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
@@ -546,10 +546,10 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
.bucket_num = 8,
};
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
assembler = ip_reassembly_new(&opts);
EXPECT_TRUE(assembler != NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
0, 0, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -557,10 +557,10 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
// frag2
packet_parse(&pkt, (const char *)frag2, sizeof(frag2));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
1, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -568,10 +568,10 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
// frag2
packet_parse(&pkt, (const char *)frag2, sizeof(frag2));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
2, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 1, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -579,10 +579,10 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
// frag1
packet_parse(&pkt, (const char *)frag1, sizeof(frag1));
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
3, 1, 1, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 1, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -632,7 +632,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
// free packet
packet_free(new_pkt);
ip_reassembly_free(mgr);
ip_reassembly_free(assembler);
}
#endif
@@ -641,7 +641,7 @@ TEST(IPV4_REASSEMBLE, FULL)
{
struct packet pkt;
struct packet *new_pkt;
struct ip_reassembly *mgr;
struct ip_reassembly *assembler;
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
@@ -649,10 +649,10 @@ TEST(IPV4_REASSEMBLE, FULL)
.bucket_num = 1,
};
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
assembler = ip_reassembly_new(&opts);
EXPECT_TRUE(assembler != NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
0, 0, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -664,10 +664,10 @@ TEST(IPV4_REASSEMBLE, FULL)
// flow1
packet_set_ipv4_src_addr(&pkt, 1);
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
1, 1, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -675,10 +675,10 @@ TEST(IPV4_REASSEMBLE, FULL)
// flow2
packet_set_ipv4_src_addr(&pkt, 2);
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
2, 2, 0, 0, // ip4: find, add, del, timeout
0, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -686,10 +686,10 @@ TEST(IPV4_REASSEMBLE, FULL)
// flow3
packet_set_ipv4_src_addr(&pkt, 3);
new_pkt = ip_reassembly_packet(mgr, &pkt, 1);
new_pkt = ip_reassembly_packet(assembler, &pkt, 1);
EXPECT_TRUE(new_pkt == NULL);
check_stat(ip_reassembly_get_stat(mgr),
check_stat(ip_reassembly_get_stat(assembler),
3, 2, 0, 0, // ip4: find, add, del, timeout
1, 0, 0, 0, 0, 0, // ip4: nospace, overlap, many frag, invalid length, dup first frag, dup last frag
0, 0, 0, 0, // ip6: find, add, del, timeout
@@ -698,7 +698,7 @@ TEST(IPV4_REASSEMBLE, FULL)
// free packet
packet_free(new_pkt);
ip_reassembly_free(mgr);
ip_reassembly_free(assembler);
}
#endif