svn commit: r201124 - in head: lib/libnetgraph sys/netgraph sys/netinet/ipfw

[Luigi Rizzo]

Author: luigi
Date: Mon Dec 28 12:29:13 2009
New Revision: 201124
URL: http://svn.freebsd.org/changeset/base/201124

Log:
  bring the NGM_IPFW_COOKIE back into ng_ipfw.h, libnetgraph expects
  to find it there. Unfortunately this reintroduces the dependency
  on ip_fw_pfil.c

Modified:
  head/lib/libnetgraph/debug.c
  head/sys/netgraph/ng_ipfw.h
  head/sys/netinet/ipfw/ip_fw_pfil.c
  head/sys/netinet/ipfw/ip_fw_private.h

Modified: head/lib/libnetgraph/debug.c
==============================================================================
--- head/lib/libnetgraph/debug.c	Mon Dec 28 10:48:01 2009	(r201123)
+++ head/lib/libnetgraph/debug.c	Mon Dec 28 12:29:13 2009	(r201124)
@@ -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>

Modified: head/sys/netgraph/ng_ipfw.h
==============================================================================
--- head/sys/netgraph/ng_ipfw.h	Mon Dec 28 10:48:01 2009	(r201123)
+++ head/sys/netgraph/ng_ipfw.h	Mon Dec 28 12:29:13 2009	(r201124)
@@ -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 */

Modified: head/sys/netinet/ipfw/ip_fw_pfil.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_pfil.c	Mon Dec 28 10:48:01 2009	(r201123)
+++ head/sys/netinet/ipfw/ip_fw_pfil.c	Mon Dec 28 12:29:13 2009	(r201124)
@@ -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>
 

Modified: head/sys/netinet/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_private.h	Mon Dec 28 10:48:01 2009	(r201123)
+++ head/sys/netinet/ipfw/ip_fw_private.h	Mon Dec 28 12:29:13 2009	(r201124)
@@ -272,7 +272,6 @@ extern ipfw_nat_cfg_t *ipfw_nat_get_cfg_
 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;