From nobody Mon Oct 20 21:19:53 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 4cr7c940DJz6D8kb; Mon, 20 Oct 2025 21:19:53 +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 4cr7c93Mtwz3Wgd; Mon, 20 Oct 2025 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995193; 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=wAk2MD0Z7IfmviNiItbBFPfeRn3CzEHKzeE++knDv74=; b=EiOmgrODXxrYRtzCAwUM6UkwLX2e1moTolI1bYFOeQAMdic3nN0xh94Mp/x9WAvqL5YclS 0RlifA6f6ud4XJL2kjgdird3X8bK6+rbsDG+Jz/kRm/c/xEXFmX5psucsj7G0NOXTaKRHf jcTn29VaSDtnC8MICA5CS5F2a74vEphZWMh1Fab7c68+uxt3qLgrKsBxXHw27Ja+qRnkqY Bal1ttC+ZvV/Kk1d56uFU+6DFHYemD7AAjPiI5lHy22zQE83oKyOL1Yk6UlzNhktO3uQcO e/odLH8vi0J2+t4gFUwcqtfVxkVzsLGPzDS2pAMFOhARVI63B0TShaAOQwro4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995193; 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=wAk2MD0Z7IfmviNiItbBFPfeRn3CzEHKzeE++knDv74=; b=EBMBSAW30Me5Xm2ASqP9AhiU7+nsMEPB5G3d83etxe49yiyQ9GjYhzI+fySuVzxgUpz8Hp Dtti0CqfU3dSmthCuoFQixqT7n0J2CmEI1fskswTsUNa7tZyNidr9NI/WVe8+sT12wbOXq YFb5Nb7tWmKDBnCEg3cEhuH+l42WxW74ygmiRdTQZYW6oLR6tlcnukgEWGwu+nKeGZy3VX 3y6VkhHD+CosgnkyrRqj0/IDiwSrRk0K1bQRxDDgXnPAiECbLAvfmQkxkAJGFyDFuyq9jm +Z1+zHQdk9DxuLqP8Vmc6q867znM+MqS7F4v8t7D+xBKizjHwFb8H93aKH8zbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760995193; a=rsa-sha256; cv=none; b=dU7YZkudAQ7TSswvjsKdCzwGqIpuUwcRlM/8cHIzEGKrgq91hq8O7rpqT1tLYIn7KT5u51 logwDXNwl5YB1Mi4bP6Gk7KNW16/FJDhSIgU1YDoysmAsa+C2k6L6BxmeELyuy3zsBGn5A 8D7Vg6wI5kmS/TMQiqKPl7x/VdyGZRtSUWp6947uDv+9HOcddKtA6jkNDK3sUQd08nJ5JL 0FpAYM8ufIk92bxwxVIqSc8VDV7Jom4oUGNSMynIrVO5blIhDNcJmDPvV8OX5juGp0+7m9 bTHMP8seiCBZU5Ra7xEo/danHazkQxme+LQboWAFS5XRhSQH3ryXYr7XJz2IAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cr7c92hJPzTsq; Mon, 20 Oct 2025 21:19:53 +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 59KLJrir012274; Mon, 20 Oct 2025 21:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLJr7w012271; Mon, 20 Oct 2025 21:19:53 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:19:53 GMT Message-Id: <202510202119.59KLJr7w012271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 7294d2601f3a - main - Revert "UDP: let udp_pcblist() support UDP and UDP-Lite" 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7294d2601f3a605dac3e86e232b43f29a0f5298d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7294d2601f3a605dac3e86e232b43f29a0f5298d commit 7294d2601f3a605dac3e86e232b43f29a0f5298d Author: Michael Tuexen AuthorDate: 2025-10-20 21:19:29 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:19:29 +0000 Revert "UDP: let udp_pcblist() support UDP and UDP-Lite" This reverts commit 5f6f2c3fa25b3f37936b564b433251c33b27a8b3. Missing link to review. --- sys/netinet/udp_usrreq.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 0a89d91dfc37..cea8a916679b 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,8 +787,7 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); - struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, + struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -800,7 +799,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = pcbinfo->ipi_count; + n = V_udbinfo.ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -811,8 +810,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = pcbinfo->ipi_count; - xig.xig_gen = pcbinfo->ipi_gencnt; + xig.xig_count = V_udbinfo.ipi_count; + xig.xig_gen = V_udbinfo.ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -839,9 +838,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = pcbinfo->ipi_gencnt; + xig.xig_gen = V_udbinfo.ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = pcbinfo->ipi_count; + xig.xig_count = V_udbinfo.ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -849,7 +848,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, udp_pcblist, "S,xinpcb", "List of active UDP sockets");