Informative comments describing the various timing fields (initial_interval,

reboot_timeout, etc.) when setting them to their defaults.

1 files changed, 9 insertions, 8 deletions

diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index e5c4c0c955f..21e503b6ce8 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clparse.c,v 1.99 2016/08/31 12:57:31 mpi Exp $	*/
+/*	$OpenBSD: clparse.c,v 1.100 2016/09/01 10:29:16 krw Exp $	*/
 
 /* Parser for dhclient config and lease files. */
 
@@ -84,13 +84,14 @@ read_client_conf(struct interface_info *ifi)
 	new_parse(path_dhclient_conf);
 
 	/* Set some defaults. */
-	config->link_timeout = 10;
-	config->timeout = 60;
-	config->select_interval = 0;
-	config->reboot_timeout = 1;
-	config->retry_interval = 300;
-	config->backoff_cutoff = 15;
-	config->initial_interval = 3;
+	config->link_timeout = 10;	/* secs before going daemon w/o link */
+	config->timeout = 60;		/* secs to wait for an OFFER */
+	config->select_interval = 0;	/* secs to wait for other OFFERs */
+	config->reboot_timeout = 1;	/* secs before giving up on reboot */
+	config->retry_interval = 300;	/* secs before asking for OFFER */
+	config->backoff_cutoff = 15;	/* max secs between packet retries */
+	config->initial_interval = 3;	/* secs before 1st retry */
+
 	config->bootp_policy = ACCEPT;
 	config->requested_options
 	    [config->requested_option_count++] = DHO_SUBNET_MASK;