From nobody Thu Dec 11 03:39:33 2025 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 4dRdd81qmZz6KDNC; Thu, 11 Dec 2025 03:39:56 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4dRdd75C6Sz44D1; Thu, 11 Dec 2025 03:39:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 5BB3dXDF067255; Thu, 11 Dec 2025 05:39:36 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 5BB3dXDF067255 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 5BB3dXQ5067254; Thu, 11 Dec 2025 05:39:33 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 11 Dec 2025 05:39:33 +0200 From: Konstantin Belousov To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e967a2a03677 - main - sockets: remove compat shim for divert(4) Message-ID: References: <693a275a.2e7b3.1858af56@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <693a275a.2e7b3.1858af56@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dRdd75C6Sz44D1 On Thu, Dec 11, 2025 at 02:07:22AM +0000, Gleb Smirnoff wrote: > 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. So why breaking the binaries that users might have lingering around? Put this single if() under #ifdef COMPAT15, and perhaps remove the printf() as well. > --- > 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. */