1
1

Merge pull request #640 from esnet/issue-604

Two fixes for a warning for possibly-too-large UDP packets.

1.  Make sure we have a valid TCP MSS on the path when comparing
the UDP block size.

2.  Fix a redundant "warning".

This should fix a bug observed on Windows but not (so far) on any
UNIX-like platforms.  Fixes #604.
Этот коммит содержится в:
Bruce A. Mah 2017-09-20 09:23:12 -07:00 коммит произвёл GitHub
родитель ea72479856 ca954c7668
Коммит cd5d89d36d

Просмотреть файл

@ -382,10 +382,11 @@ iperf_connect(struct iperf_test *test)
* Regardless of whether explicitly or implicitly set, if the
* block size is larger than the MSS, print a warning.
*/
if (test->settings->blksize > test->ctrl_sck_mss) {
if (test->ctrl_sck_mss > 0 &&
test->settings->blksize > test->ctrl_sck_mss) {
char str[128];
snprintf(str, sizeof(str),
"Warning: UDP block size %d exceeds TCP MSS %d, may result in fragmentation / drops", test->settings->blksize, test->ctrl_sck_mss);
"UDP block size %d exceeds TCP MSS %d, may result in fragmentation / drops", test->settings->blksize, test->ctrl_sck_mss);
warning(str);
}
}