check_ping: Fixing "time of day goes back"

by Geoff Oakham <goakham at oanda.com>

Patch of check_ping that allows it to gracefully handle when ping outputs
to stderr "Warning: time of day goes back (-XXXXus), taking countermeasures."

Closes: #809 and #1195
This commit is contained in:
Jan Wagner 2014-01-24 18:33:37 +01:00
parent ccecba33a2
commit 455fe96e7d
2 changed files with 6 additions and 1 deletions

View file

@ -301,4 +301,5 @@ Pall Sigurdsson
Sebastian Schmidt
Simon Kainz
Steve Weinreich
Geoff Oakham
Tim Laszlo

View file

@ -482,7 +482,11 @@ run_ping (const char *cmd, const char *addr)
/* check stderr, setting at least WARNING if there is output here */
/* Add warning into warn_text */
while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) {
if (
! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
&& ! strstr(buf,"Warning: time of day goes back")
) {
if (verbose >= 3) {
printf("Got stderr: %s", buf);
}