From nobody Mon Oct 27 16:13:17 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 4cwJT943Sbz6Dy81; Mon, 27 Oct 2025 16:13:17 +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 4cwJT92q8fz44c3; Mon, 27 Oct 2025 16:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761581597; 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=/2nliahQxaH50K2ByTZmJwN2C3lJxcF5XMgfTwrBUgE=; b=E/S2L8VwQqMfIVhMgIdU/CX4lmqL/Y/T4EzI05fDqAPUL6/di4u+fSh1VlRsAVgWEYWC6O e/rY5Jc0PJWWzA84N2tcRPt/UakVGsiTx/40fT1yf7dAb5FCCoFtprSY99prDbtHdWr8L1 os5j17vvc3WhHq3RkXuLshBCxlx0AaIIAj2ZCkOJUxiGWBWsLg0by+3BLG/eb+8ed+d9TU j3+QlHl1MiyNv+kRjU6IEn9vH1AMhm92w9cBR6MWKiTET12vvZNmxirlRjv58CiSSZsFYV VUBX7TC8unoX93cSG054mCc6zl+2sLsYi2wOFZLUuCtEAHqT8SlPvp+Afha3aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761581597; 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=/2nliahQxaH50K2ByTZmJwN2C3lJxcF5XMgfTwrBUgE=; b=cwx9vtkUfGcr7G+a0QSKhimtVsRyHm9kOtfHxc+LkjPbIYvI7PZX8t1xAc+T+bEse1kso5 KfLheJT8hDucAYgmlfDsjxQ8UhlgsmS+h/FcHgKYDQYG1M8aj2B8wWSmQcsXfn2Ii10QIc n7q8n4QqvqtbxJOPOdvBEBsVeY4byp1mF/yh8PorryRPCpEkDZB77B4+p7dC7WSIvmgry7 ZZoReTI2RqZ1zAX3LybtOPC48ItzZrGRkEOjbXQJ0eU0ah6eERKkNwlLU+gDMl6wZdYld6 zCBYCpV8o0QDX3zYzMG/X2IU4IDKS3X7K8IWuuWC1X/kAIk1AgPGgJtxBUV79g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761581597; a=rsa-sha256; cv=none; b=Os8Nah94HB1NlibeoycG1cTL2qN57KooxRxMeXw/SRHkdeoaXL+2PmxWSapqAAkvusgfnM H+PdxW5uxRt578HBM9DUYvL6+PuQ7dMAVK3m97DrtJKDZn8d3MQOXjct+iCN+tT7B8KzhY wpzmvwj+u9RBQOAPFmuimarSjeU6vQnEK9NZkuFtqxqbju6zCBHYHKESvECqvVYV142Vc4 miUUUyvt9R1cPO5TXWk35hFqXlpnxdygK+qqCm0jAIptWIHD25vCuKiIFWcHv6cJRk5c3G MPzFFudhxxNOMNvUd1v3wmtaL5k9tgJo79fxRWhy5XXQT26eEXFY8eFp/4E7Dw== 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 4cwJT92M5Tz1Q1r; Mon, 27 Oct 2025 16:13:17 +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 59RGDH2n060177; Mon, 27 Oct 2025 16:13:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGDHFh060174; Mon, 27 Oct 2025 16:13:17 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:13:17 GMT Message-Id: <202510271613.59RGDHFh060174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0e2e0fb955ad - main - ipfw: Remove more unused IP_FW_* cases 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e2e0fb955adf15a217949bc4cc337d53d2c7259 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e2e0fb955adf15a217949bc4cc337d53d2c7259 commit 0e2e0fb955adf15a217949bc4cc337d53d2c7259 Author: Ed Maste AuthorDate: 2025-10-25 22:32:05 +0000 Commit: Ed Maste CommitDate: 2025-10-27 16:12:37 +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 --- 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,