Date: Fri, 3 Mar 2023 18:30:59 GMT From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 7fc82fd1f82e - main - ipfw: garbage collect ip_fw_chk_ptr Message-ID: <202303031830.323IUxFu023702@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7fc82fd1f82eb37ff52a9199f1e7d640748811ba commit 7fc82fd1f82eb37ff52a9199f1e7d640748811ba Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2023-03-03 18:29:44 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> 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 <net/vnet.h> #include <netinet/in.h> -#if 0 /* not used yet */ -#include <netinet/ip_fw.h> -#endif #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> #include <netgraph/ng_parse.h> @@ -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 *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303031830.323IUxFu023702>