mirror/xdp-project-bpf-examples
1
0
Fork 0
mirror of https://github.com/xdp-project/bpf-examples.git synced 2024-05-06 15:54:53 +00:00
Code Issues Projects Releases Wiki Activity

pping: Minor cleanup of argument parsing

Browse Source 
The parse_arguments() function used to have a separate variable for
each float (or rather a double) value it would parse from the user. As
only one argument will be parsed at the time this is redudant and will
require more and more variables as new options are added. Replace all
these variables with a single "user_float", which is used for all
options that parse a float from the user.

Signed-off-by: Simon Sundberg <simon.sundberg@kau.se>
This commit is contained in:
Simon Sundberg
2023-03-27 17:23:14 +02:00
parent 22ac4d9192
commit 83a85adb96
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pping/pping.c
View File

@@ -171,7 +171,7 @@ static int parse_bounded_double(double *res, const char *str, double low,
static int parse_arguments(int argc, char *argv[], struct pping_config *config)
{
int err, opt;
double rate_limit_ms, cleanup_interval_s, rtt_rate;
double user_float;
config->ifindex = 0;
config->bpf_config.localfilt = true;
@@ -201,22 +201,21 @@ static int parse_arguments(int argc, char *argv[], struct pping_config *config)
}
break;
case 'r':
err = parse_bounded_double(&rate_limit_ms, optarg, 0,
err = parse_bounded_double(&user_float, optarg, 0,
7 * S_PER_DAY * MS_PER_S,
"rate-limit");
if (err)
return -EINVAL;
config->bpf_config.rate_limit =
rate_limit_ms * NS_PER_MS;
config->bpf_config.rate_limit = user_float * NS_PER_MS;
break;
case 'R':
err = parse_bounded_double(&rtt_rate, optarg, 0, 10000,
"rtt-rate");
err = parse_bounded_double(&user_float, optarg, 0,
10000, "rtt-rate");
if (err)
return -EINVAL;
config->bpf_config.rtt_rate =
DOUBLE_TO_FIXPOINT(rtt_rate);
DOUBLE_TO_FIXPOINT(user_float);
break;
case 't':
if (strcmp(optarg, "min") == 0) {
@@ -230,14 +229,14 @@ static int parse_arguments(int argc, char *argv[], struct pping_config *config)
}
break;
case 'c':
err = parse_bounded_double(&cleanup_interval_s, optarg,
0, 7 * S_PER_DAY,
err = parse_bounded_double(&user_float, optarg, 0,
7 * S_PER_DAY,
"cleanup-interval");
if (err)
return -EINVAL;
config->clean_args.cleanup_interval =
cleanup_interval_s * NS_PER_SECOND;
user_float * NS_PER_SECOND;
break;
case 'F':
if (strcmp(optarg, "standard") == 0) {