PERFORCE change 144322 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=144322

Change 144322 by julian at julian_trafmon1 on 2008/06/30 00:40:35

	work on cleaning up using supplied vimage files

Affected files ...

.. //depot/projects/vimage-commit3/src/sys/net/if_gif.h#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#3 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fastfwd.c#3 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw.h#4 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_ipsec.c#3 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/vinet.h#2 edit
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#3 edit
.. //depot/projects/vimage-commit3/src/sys/netinet6/vinet6.h#2 edit

Differences ...

==== //depot/projects/vimage-commit3/src/sys/net/if_gif.h#3 (text+ko) ====

@@ -114,7 +114,8 @@
  * Virtualization support
  */
 
-#define INIT_VNET_GIF(vnet) int vnet_gif;
+#define INIT_VNET_GIF(vnet) \
+	INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif)
 
 #define VNET_GIF(sym)		VSYM(vnet_gif, sym)
 

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#3 (text+ko) ====

@@ -169,7 +169,6 @@
 
 /* Hash related definitions */
 /* XXX Don't need to initialise them because it's a LIST */
-#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */
 static LIST_HEAD(, ng_node) ng_ID_hash[NG_ID_HASH_SIZE];
 static struct mtx	ng_idhash_mtx;
 /* Method to find a node.. used twice so do it here */

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_fastfwd.c#3 (text+ko) ====


==== //depot/projects/vimage-commit3/src/sys/netinet/ip_fw.h#4 (text+ko) ====

@@ -652,7 +652,9 @@
 
 int ipfw_init(void);
 void ipfw_destroy(void);
+#ifdef NOTYET
 void ipfw_nat_destroy(void);
+#endif
 
 typedef int ip_fw_ctl_t(struct sockopt *);
 extern ip_fw_ctl_t *ip_fw_ctl_ptr;

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_ipsec.c#3 (text+ko) ====

@@ -142,9 +142,9 @@
 int
 ip_ipsec_input(struct mbuf *m)
 {
-	INIT_VNET_IPSEC(curvnet);
 	struct ip *ip = mtod(m, struct ip *);
 #ifdef IPSEC
+	INIT_VNET_IPSEC(curvnet);
 	struct m_tag *mtag;
 	struct tdb_ident *tdbi;
 	struct secpolicy *sp;

==== //depot/projects/vimage-commit3/src/sys/netinet/vinet.h#2 (text+ko) ====

@@ -66,6 +66,7 @@
 	int	_sameprefixcarponly;
 
 	int	_ipforwarding;
+	int	_ipstealth;
 	int	_ipfastforward_active;
 	int	_ipsendredirects;
 	int	_ip_defttl;
@@ -201,6 +202,7 @@
 #define V_sameprefixcarponly	VNET_INET(sameprefixcarponly)
 
 #define V_ipforwarding		VNET_INET(ipforwarding)
+#define V_ipstealth		VNET_INET(ipstealth)
 #define V_ipfastforward_active	VNET_INET(ipfastforward_active)
 #define V_ipsendredirects	VNET_INET(ipsendredirects)
 #define V_ip_defttl		VNET_INET(ip_defttl)

==== //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#3 (text+ko) ====

@@ -355,7 +355,7 @@
 	 * hard.
 	 */
 	if ((arg.found - arg.killed > V_rtq_toomany)
-	   && (time_uptime - last_adjusted_timeout >= V_rtq_timeout)
+	   && (time_uptime - last_adjusted_timeout >= V_rtq_timeout6)
 	   && V_rtq_reallyold > V_rtq_minreallyold) {
 		V_rtq_reallyold = 2*V_rtq_reallyold / 3;
 		if (V_rtq_reallyold < V_rtq_minreallyold) {

==== //depot/projects/vimage-commit3/src/sys/netinet6/vinet6.h#2 (text+ko) ====

@@ -31,16 +31,17 @@
 #ifndef _NETINET6_VINET6_H_
 #define _NETINET6_VINET6_H_
 
+#include <sys/socket.h>
 #include <netinet/ip6.h>
-#include <netinet/ip6.h>
-#include <netinet6/in6_var.h>
+#include <net/if.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/raw_ip6.h>
-#include <netinet/in_pcb.h>
 #include <netinet/icmp6.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/in6_ifattach.h>
+#include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
+#include <netinet/in_pcb.h>
 
 #define INIT_VNET_INET6(vnet) \
 	INIT_FROM_VNET(vnet, VNET_MOD_INET6, \
@@ -89,8 +90,7 @@
 	int				_dad_init;
 
 	int				_icmp6errpps_count;
-	//int				_icmp6errppslim_last;
-	//int				_icmp6_nodeinfo;
+	int				_icmp6errppslim_last;
 
 	int 				_ip6_forwarding;
 	int				_ip6_sendredirects;
@@ -231,7 +231,7 @@
 #define V_icmp6_nodeinfo		VNET_INET6(icmp6_nodeinfo)
 #define V_udp6_sendspace		VNET_INET6(udp6_sendspace)
 #define V_udp6_recvspace		VNET_INET6(udp6_recvspace)	
-//#define V_icmp6errppslim_last		VNET_INET6(icmp6errppslim_last)
+#define V_icmp6errppslim_last		VNET_INET6(icmp6errppslim_last)
 #define V_ip6_prefer_tempaddr		VNET_INET6(ip6_prefer_tempaddr)
 #define V_ip6qmaxlen			VNET_INET6(ip6qmaxlen)
 #define V_ip6_forward_srcrt		VNET_INET6(ip6_forward_srcrt)