From nobody Wed Oct 29 13:45:36 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 4cxT5s26Ppz6DkJX; Wed, 29 Oct 2025 13:45:37 +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 4cxT5r6pj7z3Dlh; Wed, 29 Oct 2025 13:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745537; 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=UOutmBiIFHV1IO64stwY2YQR/kdLRU1b11JE1bXJjLM=; b=tD97MnvCCQrdSi3Ip2P+YnxHjblYGdIREdCIm6bNCXhzKFsuGEEMc4eGeKTEvlT3oKGpC0 Xm3kf6LrqfXf30SQpFMJ67ts0czXymvygrMS6LQ9b4qVF/fWDqFIvYbihIjM4Cd10mPrXE Sh90H+EJ2oOw/Ps5J1BIeB2rpOGaGYhGcEeDSunGYpAklLVQdh1bOazSLKrO5RyRcTqaAq VIcBo0NG1dfqEr5f7IDeT/mJMtDfntl+fewPWxx2x8Iov89lK0q0tu2K5w1V1IuviwTqi2 dARBfPunfLuaI3UtlPa7eDfCGEFd68sy7lcPymJElh2oLZ9IJuPuX4WCtijlpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745537; 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=UOutmBiIFHV1IO64stwY2YQR/kdLRU1b11JE1bXJjLM=; b=cVd/J9fgrsn9jeN8x/k81iT7OgXMIxcOaDzb1BM2ponqr32K0DtqtLWdQO5hKd8p0LUp2g vH7/sPmj3aKReuJqKMCNgrXILCWOPwkvo8y82p7GKMALxSoG4oQ4L1yIgNRqWpj/hFo7HQ XwwbECi83wJOoui8daphH2kILlzfd4Bw62rIptw4AfZXa8Ov2woOBPA93cXKYIwIY0rT9u H/VHP3ETBB1Eb5KAtqEqEA0fkRluiDXEVoaAxrJxJVS1nhUdlqEHwKnK9aKRkbuIVyettO kbjAHLKaSARG0rECI7U596sHVFYXD0qJ9Q/6ZBsMX5qKXOBIA9PwQL3XAeioRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761745537; a=rsa-sha256; cv=none; b=BeGUlKGqCEhlUrrQB++nVmfy4rw5ZWnMb2WyD8axeJkM6zW7x4kl71nUKq7OCXA9i13RiE ndB4pCr4AKDp3k2Q0wqetEGDasc14+ALMxguJlSG4bpCXW6cMTjYouqc4kLjd3mI4P7Y2A ABrVL+0ItfEKXHdhutpCLhEBX5MIBGQefzaRIsSjHVdnIAo/j+K6Md/SlbV8dlNjPSdFpn jhbO6RrE+E6cO2Liynk5FT/BHpyUWpPZ9tF5tW5qI053QvO7jX396SY1mcXcQxSjoPNZFA g0DxlsETz8ikb5YUpt10CLjVmnQe14opW836veANptPBWZXAk3eDzQIobGuFgA== 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 4cxT5r6MNjzflM; Wed, 29 Oct 2025 13:45:36 +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 59TDjamp024755; Wed, 29 Oct 2025 13:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TDjaFT024752; Wed, 29 Oct 2025 13:45:36 GMT (envelope-from git) Date: Wed, 29 Oct 2025 13:45:36 GMT Message-Id: <202510291345.59TDjaFT024752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 848075bff4de - stable/14 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 848075bff4dec6d9a1a992ec339ea1342b3c5bc5 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=848075bff4dec6d9a1a992ec339ea1342b3c5bc5 commit 848075bff4dec6d9a1a992ec339ea1342b3c5bc5 Author: Ed Maste AuthorDate: 2025-10-25 22:32:05 +0000 Commit: Ed Maste CommitDate: 2025-10-29 13:45:11 +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. 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 43b69c742f15..eecf6a9c056f 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -620,11 +620,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,