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

rename config -> options

Browse Source
This commit is contained in:
luwenpeng
2024-03-08 14:51:21 +08:00
parent d0914483bb
commit 734f6a5135
32 changed files with 336 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ip_reassembly/ip_reassembly.cpp
View File

@@ -110,7 +110,7 @@ struct ip_flow
struct ip_reassembly
{
// config
// options
bool enable;
uint32_t timeout;
uint32_t bucket_entries;
@@ -189,29 +189,29 @@ static inline int is_power_of_2(uint32_t n)
return n && !(n & (n - 1));
}
static inline int ip_reassembly_check_config(const struct ip_reassembly_config *config)
static inline int ip_reassembly_check_options(const struct ip_reassembly_options *opts)
{
if (config == NULL)
if (opts == NULL)
{
IP_REASSEMBLE_DEBUG("invalid config");
IP_REASSEMBLE_DEBUG("invalid options");
return -1;
}
if (config->enable)
if (opts->enable)
{
if (config->timeout == 0)
if (opts->timeout == 0)
{
IP_REASSEMBLE_DEBUG("invalid timeout");
return -1;
}
if (config->bucket_entries == 0 || is_power_of_2(config->bucket_entries) == 0)
if (opts->bucket_entries == 0 || is_power_of_2(opts->bucket_entries) == 0)
{
IP_REASSEMBLE_DEBUG("invalid bucket entries, must be power of 2");
return -1;
}
if (config->bucket_num == 0)
if (opts->bucket_num == 0)
{
IP_REASSEMBLE_DEBUG("invalid bucket num");
return -1;
@@ -752,9 +752,9 @@ error_out_overlap:
* Public API
******************************************************************************/
struct ip_reassembly *ip_reassembly_new(const struct ip_reassembly_config *config)
struct ip_reassembly *ip_reassembly_new(const struct ip_reassembly_options *opts)
{
if (ip_reassembly_check_config(config) != 0)
if (ip_reassembly_check_options(opts) != 0)
{
return NULL;
}
@@ -765,10 +765,10 @@ struct ip_reassembly *ip_reassembly_new(const struct ip_reassembly_config *confi
IP_REASSEMBLE_ERROR("unable to allocate memory");
return NULL;
}
mgr->enable = config->enable;
mgr->timeout = config->timeout;
mgr->bucket_entries = config->bucket_entries;
mgr->bucket_num = config->bucket_num;
mgr->enable = opts->enable;
mgr->timeout = opts->timeout;
mgr->bucket_entries = opts->bucket_entries;
mgr->bucket_num = opts->bucket_num;
if (!mgr->enable)
{

4
src/ip_reassembly/ip_reassembly.h
View File

@@ -12,7 +12,7 @@ extern "C"
#define IP_REASSEMBLE_DEBUG(format, ...) LOG_DEBUG("ip_reassembly", format, ##__VA_ARGS__)
#define IP_REASSEMBLE_ERROR(format, ...) LOG_ERROR("ip_reassembly", format, ##__VA_ARGS__)
struct ip_reassembly_config
struct ip_reassembly_options
{
bool enable;
@@ -50,7 +50,7 @@ struct ip_reassembly_stat
uint64_t ip6_flow_bypass_dup_last_frag;
};
struct ip_reassembly *ip_reassembly_new(const struct ip_reassembly_config *config);
struct ip_reassembly *ip_reassembly_new(const struct ip_reassembly_options *opts);
void ip_reassembly_free(struct ip_reassembly *mgr);
void ip_reassembly_expire(struct ip_reassembly *mgr);
void ip_reassembly_print_stat(struct ip_reassembly *mgr);

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

@@ -198,7 +198,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
struct packet *new_pkt;
const struct layer_record *layer;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -207,7 +207,7 @@ TEST(IPV4_REASSEMBLE, PADDING_ORDER)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -293,7 +293,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
struct packet *new_pkt;
const struct layer_record *layer;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -302,7 +302,7 @@ TEST(IPV4_REASSEMBLE, PADDING_UNORDER)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -387,7 +387,7 @@ TEST(IPV4_REASSEMBLE, EXPIRE)
struct packet pkt;
struct packet *new_pkt;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -396,7 +396,7 @@ TEST(IPV4_REASSEMBLE, EXPIRE)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -445,7 +445,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
struct packet *new_pkt;
const struct layer_record *layer;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -454,7 +454,7 @@ TEST(IPV4_REASSEMBLE, DUP_FIRST_FRAG)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -551,7 +551,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
struct packet *new_pkt;
const struct layer_record *layer;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -560,7 +560,7 @@ TEST(IPV4_REASSEMBLE, DUP_LAST_FRAG)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -656,7 +656,7 @@ TEST(IPV4_REASSEMBLE, FULL)
struct packet pkt;
struct packet *new_pkt;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 1,
@@ -665,7 +665,7 @@ TEST(IPV4_REASSEMBLE, FULL)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),

24
src/ip_reassembly/test/gtest_ipv6_reassembly.cpp
View File

@@ -609,7 +609,7 @@ TEST(IPV6_REASSEMBLE, NORMAL)
struct packet *new_pkt;
const struct layer_record *layer;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -618,7 +618,7 @@ TEST(IPV6_REASSEMBLE, NORMAL)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -719,7 +719,7 @@ TEST(IPV6_REASSEMBLE, EXPIRE)
struct packet pkt;
struct packet *new_pkt;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -728,7 +728,7 @@ TEST(IPV6_REASSEMBLE, EXPIRE)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -777,7 +777,7 @@ TEST(IPV6_REASSEMBLE, DUP_FIRST_FRAG)
struct packet *new_pkt;
const struct layer_record *layer;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -786,7 +786,7 @@ TEST(IPV6_REASSEMBLE, DUP_FIRST_FRAG)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -899,7 +899,7 @@ TEST(IPV6_REASSEMBLE, DUP_LAST_FRAG)
struct packet *new_pkt;
const struct layer_record *layer;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -908,7 +908,7 @@ TEST(IPV6_REASSEMBLE, DUP_LAST_FRAG)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -1021,7 +1021,7 @@ TEST(IPV6_REASSEMBLE, FULL)
struct packet *new_pkt;
struct in6_addr src_addr;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 1,
@@ -1030,7 +1030,7 @@ TEST(IPV6_REASSEMBLE, FULL)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),
@@ -1092,7 +1092,7 @@ TEST(IPV6_REASSEMBLE, OVERLAP)
struct packet pkt;
struct packet *new_pkt;
struct ip_reassembly *mgr;
struct ip_reassembly_config config = {
struct ip_reassembly_options opts = {
.enable = true,
.timeout = 1,
.bucket_entries = 16,
@@ -1101,7 +1101,7 @@ TEST(IPV6_REASSEMBLE, OVERLAP)
timestamp_update();
mgr = ip_reassembly_new(&config);
mgr = ip_reassembly_new(&opts);
EXPECT_TRUE(mgr != NULL);
// ip_reassembly_print_stat(mgr);
check_stat(ip_reassembly_get_stat(mgr),