diff options
| author |   krw <krw@openbsd.org> | 2021-03-31 15:32:11 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2021-03-31 15:32:11 +0000 |
| commit | 277a4b78d9d0e4deb15b758846d6051978738b85 (patch) | |
| tree | 0d3b209f6033028c407c61d26d1876afd8189a8b /sbin | |
| parent | Make ddb's dependency on libz explicit. (diff) | |
| download | wireguard-openbsd-277a4b78d9d0e4deb15b758846d6051978738b85.tar.xz wireguard-openbsd-277a4b78d9d0e4deb15b758846d6051978738b85.zip | |
Fix some debug output when running in foreground.
Call tick_msg() at startup so it knows if the link
is up. Don't emit 'link timeout expired' messages
after the link has been up.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index dee2f0e0e9b..97fe48c0174 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.715 2021/03/28 17:25:21 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.716 2021/03/31 15:32:11 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -730,6 +730,8 @@ main(int argc, char *argv[]) fatal("pledge"); } + tick_msg("link", LINK_STATE_IS_UP(ifi->link_state) ? TICK_SUCCESS : + TICK_WAIT); quit = RESTART; dispatch(ifi, routefd); @@ -2708,9 +2710,11 @@ tick_msg(const char *preamble, int action) if (timespeccmp(&now, &stop, >=)) { if (action == TICK_WAIT) action = TICK_DAEMON; - log_debug("%s: link timeout (%lld seconds) expired", - log_procname, (long long)link_intvl.tv_sec); - linkup = 1; + if (linkup == 0) { + log_debug("%s: link timeout (%lld seconds) expired", + log_procname, (long long)link_intvl.tv_sec); + linkup = 1; + } } if (printmsg && preamble_sent == 0) { |