From nobody Tue Aug 20 04:58:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wny083qFpz5VFx4; Tue, 20 Aug 2024 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wny082sLrz4NbS; Tue, 20 Aug 2024 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724129896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywdYdfdLBgc5K/ES/RBZGDrjQQZnZF4NSO2YcallinE=; b=rhL5G+oTMAUQ3x6Azda24coU4FhVcBAMk2MPCJ+yNFxuV3FH2X9fduzCMna9ZtZdtDkeQk G2r5UOMIHjYvmOjpIi6/5SeJDmzvinAYR/oz5h9Bs60RfPBC4ujs+H+FbS0GKvL+6vw7K0 IbZH0hLHrQXKHdx6Hz2UVgghsZJODRqc3+Ui1RWRVKnPJMtjabtabZ457EMFyBwd8reE7r mgBAvdpObvUOpQ+G7cELy0sjwJQ6na8iJBLqv0WcwupRjhrdSyrBZHpFO2t3VyUF8SIhD6 tyUKu0h21Zihwph+VIdOh6hV1kjWs/aOU4JiHgDCJnXaCperKssEa3Ma6IR1wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724129896; a=rsa-sha256; cv=none; b=aehAtBvo+VhJXW/H8tZo7/p4WtpJQfaNEEas+dmwR4sLR6c0d35wo04HEduRl1W3dSKNAt 5CDGP19F4xcIc232Df6vtFGgRcoMUZkereceLgr2THZZLGkFzaPmiqThHW1Zb9XIuX03Hq w1iqSW3/Sk7q7J25vWbCCatDuK0n2SzN2448a/xPpVSWLRiN0J086wPZGbs+iZ0v/lUwi2 AL7UDVfsoM02EywDf37H7DBRAolaT74swwKKrXMrGZ0f5FQ2Io7IyGieA/zQd5uIl0qcWi 9U4FFBv9OLEctTS+ImdXj7vQXSo/p/SCyLooOKTu+Pcb28h8UpYUcbc6YbKQgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724129896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywdYdfdLBgc5K/ES/RBZGDrjQQZnZF4NSO2YcallinE=; b=KWdeSUBNBvcHtycSynmnI2JU9vh/Jm1avsG2p9PiZZNDg7DpFATOwme3hXlxI+xkJ4CBE+ L0ODsIXHNtF/uAUec4rjuqTg3YXZMWeHp4NFgeFXEFXNULwtR6fNQ6gEqVFQz/oHDG2c+P p1uLF8HNy+mXu2MRMT4JGdW95qQjWBQCU16tPdYQiIE89cwrTCOp4yY96OB1E7UVcq5wIN YEes2j6Al9iBRkpefURiWX/VKrlPoiHkRj5dMIVe8uCILmEm7r1mc06bF1tjYZPtLEFyJI gkvFPxK0xHUw+7dCJ474zxv5XD0Ab4YjmCAMR6H5MuPc6v5XAAqdyH5kwj4A7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wny082SZKzn1P; Tue, 20 Aug 2024 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47K4wG8m054161; Tue, 20 Aug 2024 04:58:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K4wGpp054158; Tue, 20 Aug 2024 04:58:16 GMT (envelope-from git) Date: Tue, 20 Aug 2024 04:58:16 GMT Message-Id: <202408200458.47K4wGpp054158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 49be9c8b0029 - stable/14 - dhclient: Timeouts for entering state_selecting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 49be9c8b00298a219c3b8a5271d0e8969e82a47d Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=49be9c8b00298a219c3b8a5271d0e8969e82a47d commit 49be9c8b00298a219c3b8a5271d0e8969e82a47d Author: Isaac Cilia Attard AuthorDate: 2024-07-08 06:11:08 +0000 Commit: Colin Percival CommitDate: 2024-08-20 04:57:08 +0000 dhclient: Timeouts for entering state_selecting Use the new add_timeout_timespec() API to handle timeouts for state_selecting within dhclient.c. No functional change intended. Sponsored by: Google LLC (GSoC 2024) Signed-off-by: Isaac Cilia Attard MFC after: 10 days Reviwed by: cperciva, brooks, Tom Hukins, Alexander Ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/1368 (cherry picked from commit 76e0ffd9f8fd09f8790a4d96581782225d9019ea) --- sbin/dhclient/dhclient.c | 38 ++++++++++++++++++++++++++++---------- sbin/dhclient/dhcpd.h | 1 + sbin/dhclient/dispatch.c | 3 ++- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 62e55eb4d01f..b53a6f6c892f 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -91,6 +91,7 @@ cap_channel_t *capsyslog; time_t cur_time; +struct timespec time_now; static time_t default_lease_time = 43200; /* 12 hours... */ const char *path_dhclient_conf = _PATH_DHCLIENT_CONF; @@ -120,6 +121,8 @@ struct pidfh *pidfile; */ #define TIME_MAX ((((time_t) 1 << (sizeof(time_t) * CHAR_BIT - 2)) - 1) * 2 + 1) +static struct timespec arp_timeout = { .tv_sec = 2, .tv_nsec = 0 }; +static const struct timespec zero_timespec = { .tv_sec = 0, .tv_nsec = 0 }; int log_priority; static int no_daemon; static int unknown_ok = 1; @@ -1022,7 +1025,11 @@ dhcpoffer(struct packet *packet) struct interface_info *ip = packet->interface; struct client_lease *lease, *lp; int i; - int arp_timeout_needed, stop_selecting; + struct timespec arp_timeout_needed; + struct timespec stop_selecting = { .tv_sec = 0, .tv_nsec = 0 }; + time_now.tv_sec = cur_time; + time_now.tv_nsec = 0; + const char *name = packet->options[DHO_DHCP_MESSAGE_TYPE].len ? "DHCPOFFER" : "BOOTREPLY"; @@ -1078,12 +1085,13 @@ dhcpoffer(struct packet *packet) /* If the script can't send an ARP request without waiting, we'll be waiting when we do the ARPCHECK, so don't wait now. */ if (script_go()) - arp_timeout_needed = 0; + arp_timeout_needed = zero_timespec; + else - arp_timeout_needed = 2; + arp_timeout_needed = arp_timeout; /* Figure out when we're supposed to stop selecting. */ - stop_selecting = + stop_selecting.tv_sec = ip->client->first_sending + ip->client->config->select_interval; /* If this is the lease we asked for, put it at the head of the @@ -1099,9 +1107,13 @@ dhcpoffer(struct packet *packet) offer would take us past the selection timeout, then don't extend the timeout - just hope for the best. */ + + struct timespec interm_struct; + timespecadd(&time_now, &arp_timeout_needed, &interm_struct); + if (ip->client->offered_leases && - (cur_time + arp_timeout_needed) > stop_selecting) - arp_timeout_needed = 0; + timespeccmp(&interm_struct, &stop_selecting, >)) + arp_timeout_needed = zero_timespec; /* Put the lease at the end of the list. */ lease->next = NULL; @@ -1118,16 +1130,22 @@ dhcpoffer(struct packet *packet) /* If we're supposed to stop selecting before we've had time to wait for the ARPREPLY, add some delay to wait for the ARPREPLY. */ - if (stop_selecting - cur_time < arp_timeout_needed) - stop_selecting = cur_time + arp_timeout_needed; + struct timespec time_left; + timespecsub(&stop_selecting, &time_now, &time_left); + + if (timespeccmp(&time_left, &arp_timeout_needed, <)) { + timespecadd(&time_now, &arp_timeout_needed, &stop_selecting); + } /* If the selecting interval has expired, go immediately to state_selecting(). Otherwise, time out into state_selecting at the select interval. */ - if (stop_selecting <= 0) + + + if (timespeccmp(&stop_selecting, &zero_timespec, <=)) state_selecting(ip); else { - add_timeout(stop_selecting, state_selecting, ip); + add_timeout_timespec(stop_selecting, state_selecting, ip); cancel_timeout(send_discover, ip); } } diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 56a38d733501..c375d4087367 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -362,6 +362,7 @@ char *piaddr(struct iaddr); extern cap_channel_t *capsyslog; extern const char *path_dhclient_conf; extern char *path_dhclient_db; +extern struct timespec time_now; extern time_t cur_time; extern int log_priority; extern int log_perror; diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c index aa15c35a9f15..fecc9a5fa5b4 100644 --- a/sbin/dhclient/dispatch.c +++ b/sbin/dhclient/dispatch.c @@ -156,7 +156,8 @@ dispatch(void) struct protocol *l; struct pollfd *fds; struct timespec howlong; - struct timespec time_now = { .tv_sec = cur_time, .tv_nsec = 0 }; + time_now.tv_sec = cur_time; + time_now.tv_nsec = 0; for (l = protocols; l; l = l->next) nfds++;