diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bd8fc5..e5c51a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,9 @@ fping 4.2 (UNRELEASED) embedded-distro use cases, and not meant to be used generally in place of compiling IPv6-only binary or using '-6', see also the notes in #139, thanks abelbeck) +- Get rid of warning "timeout (-t) value larger than period (-p) produces unexpected results" + (#142, thanks @MrDragon1122) + fping 4.1 (2018-09-17) ====================== diff --git a/ci/test-09-option-r-t.pl b/ci/test-09-option-r-t.pl index 997d019..e182ca3 100755 --- a/ci/test-09-option-r-t.pl +++ b/ci/test-09-option-r-t.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -use Test::Command tests => 23; +use Test::Command tests => 21; use Test::More; # -R random bytes @@ -104,9 +104,3 @@ $cmd->stderr_is_eq("fping: can't parse source address: bla\n"); } # (note: fping -t also tested in test-4-options-a-b.pl) - -{ -my $cmd = Test::Command->new(cmd => "fping -c 2 -p 100 -t 200 127.0.0.1"); -$cmd->exit_is_num(0); -$cmd->stderr_like(qr{^fping: warning: timeout \(-t\) value larger than period \(-p\) produces unexpected results\n.*}); -} diff --git a/src/fping.c b/src/fping.c index d7205f3..4a0c60a 100644 --- a/src/fping.c +++ b/src/fping.c @@ -785,11 +785,6 @@ int main(int argc, char** argv) timeout = AUTOTUNE_TIMEOUT_MAX * 100; } } - else { - if (timeout > perhost_interval && (loop_flag || (count_flag && count > 1))) { - fprintf(stderr, "%s: warning: timeout (-t) value larger than period (-p) produces unexpected results\n", prog); - } - } } #if defined(DEBUG) || defined(_DEBUG)