From nobody Tue Aug 25 18:17:45 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 4hTwxQ1p42z6pln3 for ; Tue, 25 Aug 2026 18:17:46 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTwxQ0tWcz3n7h for ; Tue, 25 Aug 2026 18:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787681866; 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=PmK6oRa+ytnEUdwrC5+0ActtTpzaNDw4yjpOD4Jydvw=; b=qLlaJWdwGc6Pn2XiPFY6AImolFGPM3pmoBTqgETBOLCTq5UhCsftSRE5gcM0vjku2eeHkR OiqqKm4SfeqtQjO7yFKT8Yt1l8+H8TCd5KQ/le1uNlgUCtVO1u+h9C4Xd8qSrs6VH8h7Zj Xv5EAwYjVwsSpFg4/9ZnX97bzs7i2agsO0QK10cZWpFnVXG/Pj/tm1Owl61Zf+71yBljdo 9O2tsx/SuGYEAE2e/GfNbgA6Is35hlHufy5J+4x+yIL0wH7P2cptHLdGiL5wgM34AUv0Dv uYGQlxeiST4zNo2ZBg1iKrfFLBSwgXDd9LxFe7m5h391KqnlkaK3jIMfqkXF9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787681866; a=rsa-sha256; cv=none; b=g57IkMnprO/DeoJcm9nXKmNTWVdnZabuHN1RXLptJmN4Y+07uL402WBOIPhguPtto+ej0E Yi8mO7WLFuNOjr+HiSZKfTOKbnQpxRmlzQHKQUKI4JnQjfXalaGJjn1KcDGZ63YIxBA8GJ hlihMlert3DVfJyZxwus3ouw8CTRtmsAum8W4kOuSmt/1q3wDLnk/QsfAPWxqwayJf7JPn gDSalUDMWJyd47j6WJIAsZG2uKAooQIQ+k9WqnXe41rt5ULiXckIiOCbjpF8WQ7dcRYwFE MhWR8uEPZ5AUtK9Kkr6Fso6KzChA0UBfReMB3xjyldgHNcjTU8sWSN7AIbVtQQ== 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=1787681866; 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=PmK6oRa+ytnEUdwrC5+0ActtTpzaNDw4yjpOD4Jydvw=; b=wNPGfr7fTyn25uT+eyuMqxQnF4sqHLhWvErJMj6yvIY0F9Vqu7YScMWAzqmm4PXAkXv3MT hTEPuMiBoeWgPCCZGSu9R9fks5Sr+g78VEerU2BJCYU7sRUzm3oqnZ/lD3ENXyQ7cEjoKs sYFY6fPRxoeIRcZnEpNtoTRIxU/bNoMjj5vvM6QEFLPH4eYHA6rmkOQeMczkGRz3FTD92I VpOAYrvvcNsT3iy7xwQLyFHB+QPdnP0vQD4BwqRGIlAOPdZoKSrBaY85JC2SEveAnht1W2 TGUCN3aZAmka3BvgrlcwAc7EBT63mBgukDEivwNzbS7c3WCBp/MWmEV1ddRvhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTwxP6GQxz12MV for ; Tue, 25 Aug 2026 18:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 415a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 18:17:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cb7009867ae6 - main - socket: Restore handling of IPPROTO_DIVERT 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb7009867ae6b33aa39cb6cb1453b69073144b44 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 18:17:45 +0000 Message-Id: <6a8ddc49.415a8.4a8f8c61@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cb7009867ae6b33aa39cb6cb1453b69073144b44 commit cb7009867ae6b33aa39cb6cb1453b69073144b44 Author: Mark Johnston AuthorDate: 2026-08-25 18:09:09 +0000 Commit: Mark Johnston CommitDate: 2026-08-25 18:09:09 +0000 socket: Restore handling of IPPROTO_DIVERT Python scripts which use divert sockets no longer work after commit e967a2a03677; even if one patches socket() calls, getaddrlen() doesn't work on divert sockets, needed to use recvfrom(). Restore compatibility when COMPAT_FREEBSD15 is defined. Reviewed by: kib Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D59018 --- sys/kern/uipc_socket.c | 7 +++++++ sys/netinet/in.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index dc4db57c07e2..17f36ae69125 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -989,6 +989,13 @@ socreate(int dom, struct socket **aso, int type, int proto, struct socket *so; int error; +#ifdef COMPAT_FREEBSD15 + /* divert(4) historically abuses PF_INET. Use PF_DIVERT instead. */ + if (__predict_false(dom == PF_INET && type == SOCK_RAW && + proto == __IPPROTO_DIVERT)) + dom = PF_DIVERT; +#endif + prp = pffindproto(dom, type, proto); if (prp == NULL) { /* No support for domain. */ diff --git a/sys/netinet/in.h b/sys/netinet/in.h index c4698b7056eb..8838bdbdb416 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -253,6 +253,8 @@ __END_DECLS /* last return value of *_input(), meaning "all job for this pkt is done". */ #define IPPROTO_DONE 257 +#define __IPPROTO_DIVERT 258 /* Deprecated, use PF_DIVERT */ + /* Only used internally, so can be outside the range of valid IP protocols. */ #define IPPROTO_SEND 259 /* SeND pseudo-protocol */