diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-02 12:29:06 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-02 12:29:06 +0100 |
commit | ebde6f10fbce0e1843cf1ffa2b1f2697d0139117 (patch) | |
tree | bb162d1c1762f4c06cd144b13cadab369c3f617c /networking/ntpd.c | |
parent | f91e63cbc3aa46ed0ed39d9aa664594f418da255 (diff) | |
download | busybox-w32-ebde6f10fbce0e1843cf1ffa2b1f2697d0139117.tar.gz busybox-w32-ebde6f10fbce0e1843cf1ffa2b1f2697d0139117.tar.bz2 busybox-w32-ebde6f10fbce0e1843cf1ffa2b1f2697d0139117.zip |
ntpd: fix "synced" state detection
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/ntpd.c')
-rw-r--r-- | networking/ntpd.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/networking/ntpd.c b/networking/ntpd.c index 17748b0f1..b100caa09 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c | |||
@@ -469,21 +469,16 @@ slew_time(void) | |||
469 | } else { | 469 | } else { |
470 | if (G.verbose >= 2) | 470 | if (G.verbose >= 2) |
471 | bb_error_msg("old adjust: %d.%06u", (int)tv.tv_sec, (unsigned)tv.tv_usec); | 471 | bb_error_msg("old adjust: %d.%06u", (int)tv.tv_sec, (unsigned)tv.tv_usec); |
472 | if (G.first_adj_done | 472 | if (G.first_adj_done) { |
473 | && tv.tv_sec == 0 | 473 | uint8_t synced = (tv.tv_sec == 0 && tv.tv_usec == 0); |
474 | && tv.tv_usec == 0 // TODO: allow for tiny values? | 474 | if (synced != G.synced) { |
475 | && !G.synced | 475 | G.synced = synced; |
476 | ) { | 476 | bb_error_msg("clock is %ssynced", synced ? "" : "un"); |
477 | G.synced = 1; | 477 | } |
478 | bb_error_msg("clock %ssynced", ""); | ||
479 | } else | ||
480 | if (G.synced) { | ||
481 | G.synced = 0; | ||
482 | bb_error_msg("clock %ssynced", "un"); | ||
483 | } | 478 | } |
479 | G.first_adj_done = 1; | ||
484 | } | 480 | } |
485 | 481 | ||
486 | G.first_adj_done = 1; | ||
487 | G.reftime = gettime1900fp(); | 482 | G.reftime = gettime1900fp(); |
488 | G.scale = updated_scale(offset_median); | 483 | G.scale = updated_scale(offset_median); |
489 | 484 | ||