diff options
| author |   krw <krw@openbsd.org> | 2020-11-06 21:15:41 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-11-06 21:15:41 +0000 |
| commit | 9927b455e557bb7f9ac94c1b5ee9f58bc5ed5ab0 (patch) | |
| tree | 867989347add416cbf89a521c0f233b66877e0bb | |
| parent | Set correct netmask on patched addresses for debug printing. (diff) | |
| download | wireguard-openbsd-9927b455e557bb7f9ac94c1b5ee9f58bc5ed5ab0.tar.xz wireguard-openbsd-9927b455e557bb7f9ac94c1b5ee9f58bc5ed5ab0.zip | |
Add some debug output showing the exact network configuration
changes that will be attempted after accepting a lease.
Verbiage enhancement suggested by jmc@.
| -rw-r--r-- | sbin/dhclient/dhclient.8 | 7 | ||||
| -rw-r--r-- | sbin/dhclient/kroute.c | 27 |
2 files changed, 30 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8 index c7d87030dcb..a0e5c5b274f 100644 --- a/sbin/dhclient/dhclient.8 +++ b/sbin/dhclient/dhclient.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhclient.8,v 1.42 2019/07/31 08:23:48 jmc Exp $ +.\" $OpenBSD: dhclient.8,v 1.43 2020/11/06 21:15:41 krw Exp $ .\" .\" Copyright (c) 1997 The Internet Software Consortium. .\" All rights reserved. @@ -35,7 +35,7 @@ .\" Enterprises. To learn more about the Internet Software Consortium, .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. -.Dd $Mdocdate: July 31 2019 $ +.Dd $Mdocdate: November 6 2020 $ .Dt DHCLIENT 8 .Os .Sh NAME @@ -133,7 +133,8 @@ has no active lease configured, no action is performed. .It Fl v Causes .Nm -to log more information. +to show more information about interactions with the DHCP server and what +network configuration changes are attempted after accepting a lease. .Fl v is implied if either .Fl d diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c index d7d541d5904..f40f1b38dfa 100644 --- a/sbin/dhclient/kroute.c +++ b/sbin/dhclient/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.188 2020/06/03 18:15:57 krw Exp $ */ +/* $OpenBSD: kroute.c,v 1.189 2020/11/06 21:15:41 krw Exp $ */ /* * Copyright 2012 Kenneth R Westerback <krw@openbsd.org> @@ -854,8 +854,33 @@ priv_write_resolv_conf(int index, int routefd, int rdomain, char *contents, void propose(struct proposal *proposal) { + struct option_data opt; int rslt; + log_debug("%s: proposing address %s netmask 0x%08x", log_procname, + inet_ntoa(proposal->address), ntohl(proposal->netmask.s_addr)); + + opt.data = (u_int8_t *)proposal + sizeof(struct proposal); + opt.len = proposal->routes_len; + if (opt.len > 0) + log_debug("%s: proposing static route(s) %s", log_procname, + pretty_print_option(DHO_CLASSLESS_STATIC_ROUTES, &opt, 0)); + + opt.data += opt.len; + opt.len = proposal->domains_len; + if (opt.len > 0) + log_debug("%s: proposing search domain(s) %s", log_procname, + pretty_print_option(DHO_DOMAIN_SEARCH, &opt, 0)); + + opt.data += opt.len; + opt.len = proposal->ns_len; + if (opt.len > 0) + log_debug("%s: proposing DNS server(s) %s", log_procname, + pretty_print_option(DHO_DOMAIN_NAME_SERVERS, &opt, 0)); + + if (proposal->mtu != 0) + log_debug("%s: proposing mtu %u", log_procname, proposal->mtu); + rslt = imsg_compose(unpriv_ibuf, IMSG_PROPOSE, 0, 0, -1, proposal, sizeof(*proposal) + proposal->routes_len + proposal->domains_len + proposal->ns_len); |