From nobody Thu May 29 18:45:23 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 4b7b0N1kZbz5xMRZ; Thu, 29 May 2025 18:45:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7b0N12Hqz3Phm; Thu, 29 May 2025 18:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544324; 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=h5qV/uvJO2Hih/+2/0MkAwtMrhe1BDJ8D6NO4Asguvw=; b=KGiDJi4SFZHnh972Vsi2Cht9WhceUOmwQ68XudPIJapdxPZ9NMnc69x+M7vE9YYexeeEX6 4UF0HwIXNvjwsDy/2CH/bx4P5zUnoirPfCxKU6vW7kY3W35k9MSrc5d0ZaAcQjF//tgdXL XF1HPQGC+WHLxaP7wIZblGJ3Mhz6lARTJ5d1GmGj5DVsSh6vL7tZW+jK8vG+zcvAVpB20a w3gY7htlvOKB96rNPaPZ2qTGgREsyTA32R1mDoV/EsLX4gl/M6drdfA0uRwhPZTO3evJza iqLa0bhWw4BJpRCYLnKOxyjz0e6wVQJfGfShrz1cM4LqrqDbP5S98zpRbAZ1fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748544324; a=rsa-sha256; cv=none; b=I1c9J5VwAoa7jrVwIX3e2w2XPSsPcf7HKMxYLK4Y+LAuI3eK1XNfh8fwHKgO3EdAsOVtLA CV/PKTA5aZ6p9EU+Xwa62f3YC8tYsVX5EIR3i8uggdUY90IvajO8mIP+Go+viviDle7Lyy gQx2TITge0uMORtgT8f3hoTLdPUGey9GNhuCVlnFJHzDYQD22FMDyF0+DW6SG41g707i7B wibHALYG3es9o2PWUQsGjEy+79cVoKyonB94puAOKrH9FOsGIy9E/t15tJKjlHx0If41fA eme/q9LcyEXEIYHy59DihpRJu/u8Y0qAHluF+mgdjKZaXLOb9pSet/zLq6LCBg== 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=1748544324; 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=h5qV/uvJO2Hih/+2/0MkAwtMrhe1BDJ8D6NO4Asguvw=; b=VpphDiX0cdKjLZH4ooavCg1oDy11O7ZNdgxp60EtSRPyNQJvBVQ6wumSIryE0e/jAaKlJA psEsshTKoy4vqLzFuQDhj8jhedP5JKyeKWF81x/Lsppx9cnPAcSdEM/U26vqTAeMUjDk8L HaEn7kCvlEtlo+u8DHXTgp2tQx9JN72EkplLkiSUdiwuhNqI4oH2aZGa6H43R4UPGjZxRb ITq6Dcy/klrw9ATSuvxHk0Dk+SqJT6mjVNbEmJosaZuLkj9qH9Y9Ef1Y6esZKc4fmPllXP zk6Fu0uBsNoJ7OANri0I2WkLmpaUvpZuz6wLXV4vPa9LU3ORlQx2FWKEKa4gnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7b0N0FqJz475; Thu, 29 May 2025 18:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54TIjN1g099284; Thu, 29 May 2025 18:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TIjNti099279; Thu, 29 May 2025 18:45:23 GMT (envelope-from git) Date: Thu, 29 May 2025 18:45:23 GMT Message-Id: <202505291845.54TIjNti099279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f20e8cd50996 - main - sockets: remove dom_externalize 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: f20e8cd5099600bea9c2c517292afe3a05b4cb92 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f20e8cd5099600bea9c2c517292afe3a05b4cb92 commit f20e8cd5099600bea9c2c517292afe3a05b4cb92 Author: Gleb Smirnoff AuthorDate: 2025-05-28 17:24:57 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-29 18:44:52 +0000 sockets: remove dom_externalize It was used only by unix(4) and now is completely isolated. --- sys/kern/uipc_debug.c | 3 --- sys/kern/uipc_socket.c | 13 ++----------- sys/kern/uipc_usrreq.c | 1 - sys/sys/domain.h | 2 -- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c index bbd6c078fd06..df36ec75cb5f 100644 --- a/sys/kern/uipc_debug.c +++ b/sys/kern/uipc_debug.c @@ -236,9 +236,6 @@ db_print_domain(struct domain *d, const char *domain_name, int indent) db_printf("dom_family: %d ", d->dom_family); db_printf("dom_name: %s\n", d->dom_name); - db_print_indent(indent); - db_printf("dom_externalize: %p ", d->dom_externalize); - db_print_indent(indent); db_printf("dom_protosw: %p ", d->dom_protosw); db_printf("dom_next: %p\n", d->dom_next.sle_next); diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index d478b09ca71c..6c9eb7139cd1 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2934,13 +2934,7 @@ dontblock: while (cm != NULL) { cmn = cm->m_next; cm->m_next = NULL; - if (pr->pr_domain->dom_externalize != NULL) { - SOCKBUF_UNLOCK(&so->so_rcv); - VNET_SO_ASSERT(so); - error = (*pr->pr_domain->dom_externalize) - (cm, controlp, flags); - SOCKBUF_LOCK(&so->so_rcv); - } else if (controlp != NULL) + if (controlp != NULL) *controlp = cm; else m_freem(cm); @@ -3623,10 +3617,7 @@ soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, while (cm != NULL) { cmn = cm->m_next; cm->m_next = NULL; - if (pr->pr_domain->dom_externalize != NULL) { - error = (*pr->pr_domain->dom_externalize) - (cm, controlp, flags); - } else if (controlp != NULL) + if (controlp != NULL) *controlp = cm; else m_freem(cm); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 5b1b8443f8e6..19634e3916da 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -4422,7 +4422,6 @@ static struct protosw seqpacketproto = { static struct domain localdomain = { .dom_family = AF_LOCAL, .dom_name = "local", - .dom_externalize = unp_externalize, .dom_nprotosw = 3, .dom_protosw = { &streamproto, diff --git a/sys/sys/domain.h b/sys/sys/domain.h index 45180aa06f80..dfdda1bc9491 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -52,8 +52,6 @@ struct domain { char *dom_name; int dom_flags; int (*dom_probe)(void); /* check for support (optional) */ - int (*dom_externalize) /* externalize access rights */ - (struct mbuf *, struct mbuf **, int); struct rib_head *(*dom_rtattach) /* initialize routing table */ (uint32_t); void (*dom_rtdetach) /* clean up routing table */