From nobody Fri Apr 17 18:33:11 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 4fy3RC5ldfz6Wq4D for ; Fri, 17 Apr 2026 18:33:11 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fy3RC58SFz3wFt for ; Fri, 17 Apr 2026 18:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776450791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsbeXnxmLoqI5pn6i3zZLCcLphyMJ3NLqxaTotI5T2Q=; b=RxG/XsYsRuPTNy5iNUiPyxLlhs9k8F4yOtwrN0z/eaCb5r5Rn0ebsSbXKcKtQHZAtjyQt+ 4//nipGPOLAABqY0tpk/PdCKCo6+/fMVRjW32yyy58Do+sy8+yqWZvOYr8Gsu6RpRBWPzk kA/JWLhdjWGdTfg9NxOCVyfhf9tRDObK71yqLr5+wJO5tYInrflAGnnTUiTHQhlO/FEr77 pkcz456WBNAL0OYZ7xVEAVQ3UaGD9fXEuZVnPaL2QMcKL6regh126av4KfjW2xx7L+JblB 9w9jS/lAYOMk5shV/jvRpq6cHgpjWPr3yEn1j0BVYsOn0NqhXzM+RQEHWmjDYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776450791; a=rsa-sha256; cv=none; b=t6vLmnXLbbx3v2OyDES0iWb4PVdi2rkqMPawvU1HfqumxPGmkQhREcTElR/eP18MzDKRNd +fcu4FrT/RICI1v0Vi2VxtHukx8rLg/pa+lhWrA+Fji19fE+5klAYhqfo/srm6kjNN8eXJ gVTeaHIe8MYWlt8nC1rDWSyW6aNREE9y5RL2gl/WFTsKjG2a7jA3B8KV65yWNctvlfCBR7 DuQ7dm0BNqPJGQDnufOe3N41hvXgMlKnaTF00B5v/so69aGDRnODU9BjTYl8m87lpQnNv+ VdCOQIojyiVM5nuUmMgH21hR71pFKM4ZrLpwcS0cqvgfikcNVtVB3cC99UP7ww== 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=1776450791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsbeXnxmLoqI5pn6i3zZLCcLphyMJ3NLqxaTotI5T2Q=; b=a71PmmDougPqeo7enSB2tfcwACMP4vI+azWDllwcTsnG2fhkU6M2gK+o8xqsECm+WaaXKu sHitG4fPz6KR+r3i3PQU5ZNwrDpuq1Pa5r0OyfVLSJzw+l4KVXySvV7ULsAF5Wb/ugrlhR JMd1ZyUAxtUOWfjVPuHkbO0zO8zvb2RkQ3CFv9stqPvAcT0keeKj17oIGCXbjTor5B+pry 4shaLc4p+ei0uRq5E4s6MngBjldNJ4sr2lMMliv1VdeJqY3l5mpOTFPN/lqk/dw9nBYLRp jM8z7r0lyVAEpEY/GFnXRTGhij2W1ry7AaBij0gCJtZCiZv7s+hczMz5mtdK4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fy3RC4hLgz15CL for ; Fri, 17 Apr 2026 18:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ccf6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 18:33:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Gleb Smirnoff Subject: git: d9e7dd4a19b8 - main - carp: define CARP_AUTHLEN for carp_authlen field 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9e7dd4a19b81a78a801973f8f5231f46a6d20b8 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 18:33:11 +0000 Message-Id: <69e27ce7.3ccf6.6d4c9395@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d9e7dd4a19b81a78a801973f8f5231f46a6d20b8 commit d9e7dd4a19b81a78a801973f8f5231f46a6d20b8 Author: Christos Longros AuthorDate: 2026-04-17 18:32:01 +0000 Commit: Gleb Smirnoff CommitDate: 2026-04-17 18:32:01 +0000 carp: define CARP_AUTHLEN for carp_authlen field Replace the bare 7 with a named constant. --- sys/netinet/ip_carp.c | 2 +- sys/netinet/ip_carp.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 32823c6c4a87..9a97c1a19525 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1216,7 +1216,7 @@ carp_send_ad_locked(struct carp_softc *sc) ch.carp_vhid = sc->sc_vhid; ch.carp_advbase = sc->sc_advbase; ch.carp_advskew = advskew; - ch.carp_authlen = 7; /* XXX DEFINE */ + ch.carp_authlen = CARP_AUTHLEN; ch.carp_pad1 = 0; /* must be zero */ ch.carp_cksum = 0; diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h index 8d82286feb7d..97040403b41e 100644 --- a/sys/netinet/ip_carp.h +++ b/sys/netinet/ip_carp.h @@ -80,6 +80,12 @@ struct carp_header { CTASSERT(sizeof(struct carp_header) == 36); +/* + * CARP authentication length in 32-bit chunks: + * counter[2] (8 bytes) + SHA1 HMAC (20 bytes) = 28 bytes = 7 chunks. + */ +#define CARP_AUTHLEN 7 + /* * The VRRPv3 header layout is as follows: * See RFC9568, 5.1. VRRP Packet Format