From nobody Thu Dec 11 02:07:22 2025 X-Original-To: dev-commits-src-main@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 4dRbZM09d2z6K6BC for ; Thu, 11 Dec 2025 02:07:23 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRbZL6YzMz3qDx for ; Thu, 11 Dec 2025 02:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765418842; 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=AvYCOTBnlhBuTRTykR64yotPGPh6CXES5CwSrvBnPFs=; b=t+Bj73MAOln7oABRxpYKaJlFpgPBs9JzRwOy2OYRvAXpvRRiOumiOWYH8Ojunh4E900wXT +VvaHl8YNLqpRj+396q6MRZHelVWT5I8TLz3NVuyZGavbYgn28fbcyibZiVTSHVIKPV/Ys yaX7q71e+x5n5kzxCCyKF7p6ml3Eqs6UXUSs8UhDdZjwAd/yvXa06kDY3PhHocTDzyZFt/ FnO/pgLw4CSLFQf+gC60NmlIOWpQHevUMXei599iy2VetuOJGDWngel3CztfNhWLsruQte FCoItScHJJlRWpDzCFvvGyowPVUZAeLBLR/Q18vXkTPH9imLuBBLs5N0YooEtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765418842; 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=AvYCOTBnlhBuTRTykR64yotPGPh6CXES5CwSrvBnPFs=; b=FMmDbD5Bd+R4hLQU756yd0z9DC/mjHX8di6sA2fBOeD5F+z5TESEJEjiWPjGB6Gu3HVI5W 6QnT+D4tAOA10flSMnOCcC219DIcRikr8KidTQgZKEjTE17Txb6Oqa+8/B9SUdIa73iF8s +of6iCkgor0kjC7/3FXQCT1OfXpMAALj/L8FpbqI8DXIfam5X272YHwScbNqUBlMiC7rsh 7MD/kNZZlUKfZQjACqU9ZMhOLGooyDE/bjh5451iNdC+dS91ClRP22R//lsEBoKo6i/RQK 1+v8KPR9pvVrCICLyxZl6LPlj+KCvIS2YiN7m1h3StPBSlNJyneA8arBjZNtXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765418842; a=rsa-sha256; cv=none; b=UAX3t4yDzNTs1Ze2uCQlj4ac1ks4vqNJsoMQnNDFm2P3yZ6z49w7GTHui7JimwOFJkfLnd 5XqR1XTX9phr3mB5/TIMev51TIW8Fkr/ePi/XkfbrxOsAZyxLaLnn4p2+aORUG3cZpWj5k NA2nAMTsUmlq2aGtuAuSKLmP1Angu290jjZuYV1Y1gu8huaXUgF20pmvHBB9m0DUg0Ld5j Rz1HBiuTPfHHcfWZaqAVV4yT0Qj6rDD3sAIzQVq1Fj9VbqPxWCzg+mL7Vzado2HF2awQvr Eikg9tBUQ1oEqxIEgF1EhnOnC0GyocrQE+dX8TEHCnCzCTU0v1K3YwMPWUMV1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dRbZL5zdZz19j9 for ; Thu, 11 Dec 2025 02:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e7b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Dec 2025 02:07:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e967a2a03677 - main - sockets: remove compat shim for divert(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e967a2a03677f67d46b458d233a6e93c40d173c9 Auto-Submitted: auto-generated Date: Thu, 11 Dec 2025 02:07:22 +0000 Message-Id: <693a275a.2e7b3.1858af56@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e967a2a03677f67d46b458d233a6e93c40d173c9 commit e967a2a03677f67d46b458d233a6e93c40d173c9 Author: Gleb Smirnoff AuthorDate: 2025-12-11 02:03:35 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-11 02:03:35 +0000 sockets: remove compat shim for divert(4) All known software in ports had been addressed three years ago and the shim stays in stable/14 and stable/15 for another couple years with its printf(), so all ourliers are expected to conform before 16.0-RELEASE. See 8624f4347e8133911b0554e816f6bedb56dc5fb3 for details. --- sys/kern/uipc_socket.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 9eba3ad2e082..8ed5dcc9336a 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -913,17 +913,6 @@ socreate(int dom, struct socket **aso, int type, int proto, struct socket *so; int error; - /* - * XXX: divert(4) historically abused PF_INET. Keep this compatibility - * shim until all applications have been updated. - */ - if (__predict_false(dom == PF_INET && type == SOCK_RAW && - proto == IPPROTO_DIVERT)) { - dom = PF_DIVERT; - printf("%s uses obsolete way to create divert(4) socket\n", - td->td_proc->p_comm); - } - prp = pffindproto(dom, type, proto); if (prp == NULL) { /* No support for domain. */