From nobody Fri Jul 31 01:35:42 2026 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 4hB7tq213Pz6m2jc for ; Fri, 31 Jul 2026 01:35:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hB7tq19KBz3nRp for ; Fri, 31 Jul 2026 01:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785461747; 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=55Q80c9AtYVPEj+tSn3ums/XgDj6lkOkLMDZZXdm238=; b=kTHQGikf1j4mUMTic+OUaOaL/3Nu2pETfbJvzH9pdAg7F590YSCmAgUFxSqiVWB7FCFeta aYN0o9LZGLEdtwtetwlhQg3MUI0j1PR/OwYUf8CobIIWtg0SDn3BVwwfEGWM+LU/r+U/ka 5oh33nRMAhD8FPqnM98CrQh37T9kngXZEISNjgaF0Qh5l9To+a0YlsWWpQISkxDDipu1cc efLo7pRlZd2/eD9xaCpuB4B63XbLdqtQsow/oy/9/jRHvIdUVaj4+sZjgMaM/rsaPQYUu7 a+TqBOox6kT4z++ByePVq30hZN/8Ux5fuHocTOprrfEWsytISelqTNYWJQNOow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785461747; a=rsa-sha256; cv=none; b=GXahN+nLpi2cnXHK6iVoBUv3+VHfO9Bawx8ERTOafZ8hkVY1LImFGtI/nM1j8pG3pKlmX1 IKwYWgAUn9c5YzUP+CSqZKSOkHbagWJB2nU9cm5V+CM46lqAAZRNMbkaenHV5u1CMPut8p MONKVeReCQAVqzAkfs2AZGlsh79gO7tOSpRuiK/ayVXekoGBhVFcEkgcI3AX9v7QVNsiV/ 1ETvNRjl5YZ9D9P5a1OsXcvMk3ZHAb1iA0G6d3Ov7nObF+wgQ8K+u16qQzl1TGB2Q4mmmz ljHnAzl47H5VuQpmpRaIVICeQFhT9mcRJwsmsne2JN4gO98fCuecX+Ek5lKDxg== 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=1785461747; 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=55Q80c9AtYVPEj+tSn3ums/XgDj6lkOkLMDZZXdm238=; b=A0OW63iPLV5CN6rtD+08GFKiahaOtP2P3VK/OkTyndkndFj93kFSZpfz7AESUonP+gfj69 ivlN7rcX1Hux8AT9jCUlqjMQGvWBQxguFkePIK+FPAXUxIVbXSWrysiFugV2CIl3AZw+5T hJTEwxgM484FcsZ0tE+nVeV2ZSaQCMF3r89D2DRm0km/6cJFhRlqbIENA6XHxOm11wmBRC oSclkT154aMwtKKpESDFAD9igobuC5h6WtVLlusgd1XiWfIppHtsQoQn3R6UAIDCiyuqgn S3/aY61fN66v+kPwkJAHo04nciHanYJUHOIV5cxTzv+Xv7v/7UR0j4t3ZJ2A+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hB7tq0BVczf6q for ; Fri, 31 Jul 2026 01:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f09a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 31 Jul 2026 01:35:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: f4860c31b6ef - main - stand: Bump DHCP xid between transactions 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4860c31b6eff06161a35a720423bb22d012fd03 Auto-Submitted: auto-generated Date: Fri, 31 Jul 2026 01:35:42 +0000 Message-Id: <6a6bfbee.1f09a.20ac5c8c@gitrepo.freebsd.org> The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f4860c31b6eff06161a35a720423bb22d012fd03 commit f4860c31b6eff06161a35a720423bb22d012fd03 Author: Alexander Motin AuthorDate: 2026-07-31 01:26:23 +0000 Commit: Alexander Motin CommitDate: 2026-07-31 01:35:29 +0000 stand: Bump DHCP xid between transactions Transaction ID should persist only between OFFER and the following REQUEST. In all other cases it should change. --- stand/libsa/bootp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/stand/libsa/bootp.c b/stand/libsa/bootp.c index 5143bc91ff08..51f463d55521 100644 --- a/stand/libsa/bootp.c +++ b/stand/libsa/bootp.c @@ -172,7 +172,12 @@ restart: bootp_response->bp_yiaddr.s_addr != INADDR_ANY) { init_reboot = true; rbootp = bootp_response; - d->xid = ntohl(rbootp->bp_xid); + /* + * INIT-REBOOT is a new DHCP transaction, distinct from + * the firmware's cached DISCOVER/OFFER/REQUEST/ACK. + * Use the firmware's xid just as an entropy source. + */ + d->xid = ntohl(rbootp->bp_xid) + 1; DEBUG_PRINTF(1, ("bootp: using cached DHCP reply " "(INIT-REBOOT), yiaddr=%s xid=0x%08x\n", inet_ntoa(rbootp->bp_yiaddr), (unsigned)d->xid)); @@ -259,6 +264,7 @@ restart: bootp_response = NULL; bootp_response_size = 0; init_reboot = false; + ++d->xid; if (pkt != NULL) { free(pkt); pkt = NULL;