From nobody Fri Mar 3 18:30:59 2023 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 4PSxPJ0L9gz3wCLS; Fri, 3 Mar 2023 18:31:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSxPH6z3hz3tCk; Fri, 3 Mar 2023 18:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677868260; 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=ce+DHJd6/vleJ9wVe5RZiIX5srqIYul1H3tiYIDQVV4=; b=OtHPHCALw7RmsyRXJqZzaGnV2zkoPJKsxRoJE3BW2u+A85BtOcyR+wmknJWaD1WwTFvt8j nLvjpPmltqabZh4N2GmR3TxpnTn78tG5+58SBNjNkxCimtr+nzycvjQQbyuhI7Dk1x9YGA gueKp7ATujm2JNc3QMc0CSuG4CaH22AZlKBUAjmS1UClJSVPiK6GSeNzkUzRlPt8q5LtSC wbJfnRv4wJ+DuyJIW8WfqTe4/nhtHgBY8aawkENwRxMT9raTLA1pCrzAqXQ9AC2gCmj7QF 3hrBqnVicQiZj1+trSyT8ZupaAOeSmdEcKJYNxbskdo/PVnBl6BRyZDkWVGzVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677868260; 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=ce+DHJd6/vleJ9wVe5RZiIX5srqIYul1H3tiYIDQVV4=; b=DXqkzadE5EjBbrklrhJzbNaLtvbwvQaOFm3nprNFOxkFncZ4zoU9NsVXWRy7gVtQCJt8oy dI0ND9OZFaROKpKgVynU0EtrOsA5bBAeAkNHcvCdtR8mrj4gJ2ODF56zX/qpBQ0Rq/QXQM sdDS3MUj/1EkhmsPI3qlkhyct192mv9W/xE6BVF+T0YEvR5Z/vr+IIFfpA8OTlwrdLkLT3 0rzR5/tFzAse5Szl4QjERJdH8DrdnvYuheLDWudDSj4XRHHyPmM7hbE8oaGMsgx4ulOot9 Zeeci4MdP4zgUyYBLutPRaln1wwktnG3BmZdAuEbZ74117vYSi5rQyeKkwquuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677868260; a=rsa-sha256; cv=none; b=cjf1K3+R3J7buUC5bAgvP2SGJS8Cj0QYRbxsBqEDSmd0BEalpSF6E5bU/LkXRXEIIFB/l1 UjnsQ4pj/fazTgB5e8Fb6V5rCbze7/i4KRkIQTdsVvX1PpafG1PJ4f7yttBQBTvjCz7+4m 89XZDAAUuqLJrex1XLXm1ivIyi7FlU/GLbbR8mwI+3A/c4JdVeUKadecI4kyw1yFOUX6Iz m9heggXEt6l/wzG0lUZZjS8BkVuP8OTaPM5+IPmGh/UN5EwYa2GoNRXA7GrIsIRpxuuwSE d9OG+TA5YjK5FIEZhR6A5g/lAULx3ZHImZVDU7umboT4raAWK8JS5YfqQqRCag== 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 4PSxPH61mvz17fK; Fri, 3 Mar 2023 18:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 323IUxZI023703; Fri, 3 Mar 2023 18:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323IUxFu023702; Fri, 3 Mar 2023 18:30:59 GMT (envelope-from git) Date: Fri, 3 Mar 2023 18:30:59 GMT Message-Id: <202303031830.323IUxFu023702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 7fc82fd1f82e - main - ipfw: garbage collect ip_fw_chk_ptr 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fc82fd1f82eb37ff52a9199f1e7d640748811ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7fc82fd1f82eb37ff52a9199f1e7d640748811ba commit 7fc82fd1f82eb37ff52a9199f1e7d640748811ba Author: Gleb Smirnoff AuthorDate: 2023-03-03 18:29:44 +0000 Commit: Gleb Smirnoff CommitDate: 2023-03-03 18:30:15 +0000 ipfw: garbage collect ip_fw_chk_ptr It is a relict left from the old times when ipfw(4) was hooked into IP stack directly, without pfil(9). --- sys/netgraph/ng_bridge.c | 10 ---------- sys/netinet/ip_var.h | 1 - sys/netinet/raw_ip.c | 1 - 3 files changed, 12 deletions(-) diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c index 14068878736d..a8ec0cd207a7 100644 --- a/sys/netgraph/ng_bridge.c +++ b/sys/netgraph/ng_bridge.c @@ -74,9 +74,6 @@ #include #include -#if 0 /* not used yet */ -#include -#endif #include #include #include @@ -860,13 +857,6 @@ ng_bridge_rcvdata(hook_p hook, item_p item) } } - /* Run packet through ipfw processing, if enabled */ -#if 0 - if (priv->conf.ipfw[linkNum] && V_fw_enable && V_ip_fw_chk_ptr != NULL) { - /* XXX not implemented yet */ - } -#endif - /* * If unicast and destination host known, deliver to host's link, * unless it is the same link as the packet came in on. diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 0a2d915b12b3..2dfd7ddb4822 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -296,7 +296,6 @@ enum { #define MTAG_IPFW_CALL 1308397630 /* call stack */ struct ip_fw_args; -typedef int (*ip_fw_chk_ptr_t)(struct ip_fw_args *args); typedef int (*ip_fw_ctl_ptr_t)(struct sockopt *); VNET_DECLARE(ip_fw_ctl_ptr_t, ip_fw_ctl_ptr); #define V_ip_fw_ctl_ptr VNET(ip_fw_ctl_ptr) diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 7278f9711cec..39f40fcebff1 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -97,7 +97,6 @@ VNET_DEFINE(struct inpcbinfo, ripcbinfo); * The data hooks are not used here but it is convenient * to keep them all in one place. */ -VNET_DEFINE(ip_fw_chk_ptr_t, ip_fw_chk_ptr) = NULL; VNET_DEFINE(ip_fw_ctl_ptr_t, ip_fw_ctl_ptr) = NULL; int (*ip_dn_ctl_ptr)(struct sockopt *);