From nobody Thu Oct 30 04:23:51 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 4cxrbD13TSz6DjXF; Thu, 30 Oct 2025 04:23:52 +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 4cxrbC50Shz3G5H; Thu, 30 Oct 2025 04:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798231; 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=WzuHi7vk/zwPJP+8K/tK6dnz63CmKJlyN67JAyAWFxg=; b=LIsYJjH2auZ41GdhXixDGvYoIIodmDniOcdK9aYbnA7iJALO9hb6LTUocKIhBVGlWUJfIp wdh76wKomSDjxb+9lQo7PK70CMmIR1Ir+fMdbFui6NnlbAobW6tH4PwD4/8S4HFHiC/C6u 29kQPRsnPAWXj8GyBAwS+RiBi1pRkDRQdJXvd5ZXfYGEzfQ1+ZyJ30xX4pQizsa5aacSR1 fA2mH0NZuX2yTSV6Nrq0Z9/FIxiBu3B6m2C/5J8HG9Jvv6KQQvEgbyT3DPCKEqK+XTjSR7 N2lZQresCitEQhY5EhQr0N5yF7YFaNRH6S3t3s/+ZRNVN5bZeWujBizsSZXxhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798231; 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=WzuHi7vk/zwPJP+8K/tK6dnz63CmKJlyN67JAyAWFxg=; b=hk4w2MI7KZ2YfyBGKJE4hoKVkDn7g9r7XK/EyesIymC3ox1OOcw6Vt/mXPBdyBBgffHL1n Fbx+m0VW2yjN+trKVvfeCGOraxBX2shmkrTxlft8XgwnEOpnIhZsgrSzJZ7W3kgo+RvEHI IIBKjne1fdCWtcvYHd1m3tByC+pgyYUBlG7K1GiTLuPxu3gG+1NAbvnIzxU7l7r0TcGFfC r4BwoX7Jb/fQykQphPVbWe9lnSu7pzz/jwJay6b0HE0BBRoH4qXf6KHeEOEPsorIIhLGDQ XY54oRgUOTx0R7m4Bq9Woqfs3zZaaw03dueFmPM0TrEYu9e5H7G3ZxE0R5Fl+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798231; a=rsa-sha256; cv=none; b=KkVNQTtVq0g+p4el1yJ/bbKoYFUHT4r9fZoU4obwcpXAXsMgua5PHbI27+HZjjXtMEQThX QJo7FAJHPC6tMKDfT/zTY+SJNwgKLvP71QGVCYW0iHwEwPGds87Pcwn/izDShtbYDgwnxQ Jcip6wZYoyCzLzcdtnzAy5uUakX6QkoG2dyE/ZUXlWEk9drmHOiRXWJvuKvAmlHLu9bsNI OKn8TRH4wajZG/8kH4WQ9cRfEHdpRoPtM0BLcy2eoeAbTYgJpKKuhCPkToa/8Hf1wXfZOO mSTHuM6WQglEXWKRWZeolPbhLk8syqKXSWlHkd0iaDGCf3WMNrsii21EYHzIgw== 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 4cxrbC4NVTz15yC; Thu, 30 Oct 2025 04:23:51 +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 59U4NpZ3084676; Thu, 30 Oct 2025 04:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4Np82084673; Thu, 30 Oct 2025 04:23:51 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:51 GMT Message-Id: <202510300423.59U4Np82084673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 87b73c2684d5 - releng/15.0 - ipfw: Remove more unused IP_FW_* cases 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 87b73c2684d52091ee9d43d1207ca3e980f0903a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=87b73c2684d52091ee9d43d1207ca3e980f0903a commit 87b73c2684d52091ee9d43d1207ca3e980f0903a Author: Ed Maste AuthorDate: 2025-10-25 22:32:05 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:23:12 +0000 ipfw: Remove more unused IP_FW_* cases All of the do_cmd() calls are in dummynet.c and specify the socket option at compile time; none of these removed cases are used in ipfw after the v3 work. Approved by: re (cperciva) Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53378 (cherry picked from commit 0e2e0fb955adf15a217949bc4cc337d53d2c7259) (cherry picked from commit 6b1e5d4d20a94b5bebd726eb6d1df8dca2738f8e) --- sbin/ipfw/ipfw2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index a2b3e121e5df..27ccaea2c78f 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -648,11 +648,7 @@ do_cmd(int optname, void *optval, uintptr_t optlen) if (ipfw_socket < 0) err(EX_UNAVAILABLE, "socket"); - if (optname == IP_FW_GET || - optname == IP_FW_ADD || optname == IP_FW3 || - optname == IP_FW_NAT_GET_CONFIG || - optname < 0 || - optname == IP_FW_NAT_GET_LOG) { + if (optname == IP_FW3 || optname < 0) { if (optname < 0) optname = -optname; i = getsockopt(ipfw_socket, IPPROTO_IP, optname, optval,