d/iperf3-tls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better fix for the -u/-l argument parsing mixup. This one avoids

Browse Source 
the problem of explicitly setting the UDP block size to the TCP default
and getting ignored.
This commit is contained in:
Jef Poskanzer 2013-01-28 14:19:07 -08:00
parent 1ac282ccdd
commit 1f4b249abb
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/iperf_api.c
View File

@ -367,7 +367,9 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
{NULL, 0, NULL, 0}
};
char ch;
int blksize;
blksize = 0;
while ((ch = getopt_long(argc, argv, "c:p:st:uP:B:b:l:w:i:n:RS:Nvh6VdM:f:", longopts, NULL)) != -1) {
switch (ch) {
case 'c':
@ -411,8 +413,6 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
*/
}
set_protocol(test, Pudp);
if (test->settings->blksize == DEFAULT_TCP_BLKSIZE)
test->settings->blksize = DEFAULT_UDP_BLKSIZE;
break;
case 'P':
if (test->role == 's') {
@ -441,11 +441,7 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
i_errno = IECLIENTONLY;
return -1;
}
test->settings->blksize = unit_atoi(optarg);
if (test->settings->blksize > MAX_BLOCKSIZE) {
i_errno = IEBLOCKSIZE;
return -1;
}
blksize = unit_atoi(optarg);
break;
case 'w':
// XXX: This is a socket buffer, not specific to TCP
@ -531,6 +527,19 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
exit(1);
}
}
if (blksize == 0) {
if (test->protocol->id == Pudp)
blksize = DEFAULT_UDP_BLKSIZE;
else
blksize = DEFAULT_TCP_BLKSIZE;
}
if (blksize <= 0 || blksize > MAX_BLOCKSIZE) {
i_errno = IEBLOCKSIZE;
return -1;
}
test->settings->blksize = blksize;
/* For subsequent calls to getopt */
#ifdef __APPLE__
optreset = 1;