From nobody Wed Oct 29 13:40: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 4cxT0N0Gvxz6Djpw; Wed, 29 Oct 2025 13:40: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 4cxT0M5wX4z3CDc; Wed, 29 Oct 2025 13:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745251; 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=Ioqbp/Bciv5Dz1d6SEdsCOVjeLiGqHML46I50Pl6wW0=; b=b5aA3sqsaxWna9Aa779cjGK0VCuln9vT2CnKjiU/enqvkPR00547a+SQRNOdH2AYLJhEzN k1BjMY+KjmJG3JMYo+r0nNyZ7sRF0kOiLPLfr0+aYeQ+N0Xl4CO/PaD+JZWbKtKEP6DtAS QAhQf5MXpVx3XiZyoZHQ2FwS7gnsWRzRCTxHmZBluQ0BWBvMZiIlrDmVsFscF3Kgs+4Lc6 XcJPKhVhtVO4a4h0vGPv9EsEhAabZT9gJLURJC5QtcAuojcskZDZYQXGOW7fg4xg5uXBHA akif74LuQMxjsDu+fXmJlJvcBK/J4XSpXYwjmxV4iPk8QFLIDZ3+biukJEqY2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745251; 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=Ioqbp/Bciv5Dz1d6SEdsCOVjeLiGqHML46I50Pl6wW0=; b=R+K8AHN7knzaBNhbXwFx8D9292yiEZMyRMboX+5BKz4wy004XN/BAFUG9Dk1nxYL1+idCc JvwN+ru4Hvok84YKoXIFF0GfUJYo0ZK8uKhidhQmmfYuES2EKGZTS3VSPqEGIhtNPWnEUp p594R+rTxQYYNXtjv+oU5TciGHTkiYgdQUjJssKfuqFtQfbJ6RTQMvir2hXFUWPS+Rcbly URBBlR72jJkMcNZkQGv1db3d7Jm5zphX9+AtUcSeSI89621TjtGilYAD48DKOmdXkJ1i4d jnTE0qIIjPCirRCqcOK4xX3TgyrXS00JZaCwuRYLVKTsLLMX4nRK+I0FkwJgHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761745251; a=rsa-sha256; cv=none; b=bV+sfF+RvwI1tkYgFZFKXGXWf2exeLUWIw9ot49wwSKmAbH15nFDayt/kpKvSQNlQF/GnM QSaKVoDU1Qnc0aVagQUC+ILD+Ly76n2tKiF2yno1EAMS/tdRiJGYea2HF17I/1z5wtMGFX PhAboWt+Hhy8myyZlLQk9OXL3Ptrwdi+RxXIR9bRX6TDC0XD7YkkOlvo/A4qmIdhr3wEgP isyc/70Y/IP7azm+dxTcHKqzYSWjYD0JdA1Sd3lji6v4EWqbS+NDoFTQ5OflTOFMx1SLXr A5snCLXUnZEb3MPBM8J5frzDKioBzWBBZ6hs8uda/w3nXAZxFvsEH7DZxonjyg== 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 4cxT0M5PRXzfYK; Wed, 29 Oct 2025 13:40: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 59TDepaw015750; Wed, 29 Oct 2025 13:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TDepnd015747; Wed, 29 Oct 2025 13:40:51 GMT (envelope-from git) Date: Wed, 29 Oct 2025 13:40:51 GMT Message-Id: <202510291340.59TDepnd015747@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: 6b1e5d4d20a9 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 6b1e5d4d20a94b5bebd726eb6d1df8dca2738f8e Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b1e5d4d20a94b5bebd726eb6d1df8dca2738f8e commit 6b1e5d4d20a94b5bebd726eb6d1df8dca2738f8e Author: Ed Maste AuthorDate: 2025-10-25 22:32:05 +0000 Commit: Ed Maste CommitDate: 2025-10-29 13:40:29 +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) --- 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,