svn commit: r201730 - user/luigi/ipfw3-head/sys/netinet/ipfw

[Luigi Rizzo]

Author: luigi
Date: Thu Jan  7 09:56:07 2010
New Revision: 201730
URL: http://svn.freebsd.org/changeset/base/201730

Log:
  shuffle headers

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_log.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_table.c

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c	Thu Jan  7 09:54:59 2010	(r201729)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c	Thu Jan  7 09:56:07 2010	(r201730)
@@ -72,11 +72,11 @@ __FBSDID("$FreeBSD$");
 #include <net/netisr.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>		/* ip_len, ip_off */
+#include <netinet/ip_var.h>	/* ip_output(), IP_FORWARDING */
 #include <netinet/ip_fw.h>
 #include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/ipfw/dn_heap.h>
 #include <netinet/ip_dummynet.h>
-#include <netinet/ip_var.h>	/* ip_output(), IP_FORWARDING */
 
 #include <netinet/if_ether.h> /* various ether_* routines */
 

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_log.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_log.c	Thu Jan  7 09:54:59 2010	(r201729)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_log.c	Thu Jan  7 09:56:07 2010	(r201730)
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
+#include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>
 #include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/tcp_var.h>

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c	Thu Jan  7 09:54:59 2010	(r201729)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c	Thu Jan  7 09:56:07 2010	(r201730)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <net/vnet.h>
 
 #include <netinet/in.h>
+#include <netinet/ip_var.h>	/* hooks */
 #include <netinet/ip_fw.h>
 #include <netinet/ipfw/ip_fw_private.h>
 
@@ -676,7 +677,7 @@ check_ipfw_struct(struct ip_fw *rule, in
 				goto check_size;
 		case O_NETGRAPH:
 		case O_NGTEE:
-			if (!NG_IPFW_LOADED)
+			if (ng_ipfw_input_p == NULL)
 				return EINVAL;
 			else
 				goto check_size;

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_table.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_table.c	Thu Jan  7 09:54:59 2010	(r201729)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_table.c	Thu Jan  7 09:56:07 2010	(r201730)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <net/vnet.h>
 
 #include <netinet/in.h>
+#include <netinet/ip_var.h>	/* struct ipfw_rule_ref */
 #include <netinet/ip_fw.h>
 #include <netinet/ipfw/ip_fw_private.h>