d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bring the NGM_IPFW_COOKIE back into ng_ipfw.h, libnetgraph expects

Browse Source 
to find it there. Unfortunately this reintroduces the dependency
on ip_fw_pfil.c
This commit is contained in:
luigi 2009-12-28 12:29:13 +00:00
parent 3065c48390
commit b41c473d90
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libnetgraph/debug.c
View File

@ -76,8 +76,6 @@ __FBSDID("$FreeBSD$");
#include <netgraph/ng_hub.h>
#include <netgraph/ng_iface.h>
#include <netgraph/ng_ip_input.h>
#include <netinet/ip_fw.h>
#include <netinet/ip_fw_private.h> /* the NGM cookie is here */
#include <netgraph/ng_ipfw.h>
#include <netgraph/ng_ksocket.h>
#include <netgraph/ng_l2tp.h>

1
sys/netgraph/ng_ipfw.h
View File

@ -29,4 +29,5 @@
#ifndef _NG_IPFW_H
#define _NG_IPFW_H
#define NG_IPFW_NODE_TYPE "ipfw"
#define NGM_IPFW_COOKIE 1105988990
#endif /* _NG_IPFW_H */

1
sys/netinet/ipfw/ip_fw_pfil.c
View File

@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ipfw/ip_fw_private.h>
#include <netinet/ip_divert.h>
#include <netinet/ip_dummynet.h>
#include <netgraph/ng_ipfw.h>
#include <machine/in_cksum.h>

1
sys/netinet/ipfw/ip_fw_private.h
View File

@ -272,7 +272,6 @@ extern ipfw_nat_cfg_t *ipfw_nat_get_cfg_ptr;
extern ipfw_nat_cfg_t *ipfw_nat_get_log_ptr;
/* netgraph prototypes */
#define NGM_IPFW_COOKIE 1105988990
typedef int ng_ipfw_input_t(struct mbuf **, int, struct ip_fw_args *, int);
extern ng_ipfw_input_t *ng_ipfw_input_p;