PERFORCE change 147895 for review

[Julian Elischer]

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

Change 147895 by julian at julian_trafmon1 on 2008/08/20 08:27:38

	make LINT compile but the answer for isn_secret and friends in pf
	is not really correct.

Affected files ...

.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#6 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#22 edit
.. //depot/projects/vimage/src/sys/netinet/vinet.h#25 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#17 edit

Differences ...

==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#6 (text+ko) ====

@@ -65,6 +65,8 @@
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/if_ether.h>
+#include <netinet/vinet.h>
+
 #include <net/pfvar.h>
 
 /*
@@ -115,10 +117,12 @@
 #define ISN_STATIC_INCREMENT 4096
 #define ISN_RANDOM_INCREMENT (4096 - 1)
 
+#ifndef VIMAGE
 static u_char isn_secret[32];
 static int isn_last_reseed;
 static u_int32_t isn_offset;
 static MD5_CTX isn_ctx;
+#endif
 
 u_int32_t
 pf_new_isn(struct pf_state *s)

==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#22 (text+ko) ====

@@ -226,6 +226,7 @@
 	 */
 	callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE);
 	callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz,
+	    tcp_hc_purge, 0);
 }
 
 void

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

@@ -270,6 +270,7 @@
 #define V_tcp_reass_maxqlen	VNET_INET(tcp_reass_maxqlen)
 #define V_tcp_reass_overflows	VNET_INET(tcp_reass_overflows)
 
+/* pf needs to get to these (!?) */
 #define V_isn_secret		VNET_INET(isn_secret)
 #define V_isn_last_reseed	VNET_INET(isn_last_reseed)
 #define V_isn_offset		VNET_INET(isn_offset)

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

@@ -224,23 +224,21 @@
 }
 
 SYSCTL_DECL(_net_inet6_ip6);
-/* XXX fix these VIMAGE */
-#error "virtualise these "
+
+#ifndef VIMAGE
+static int rtq_reallyold6 = 60*60;  /* one hour is ``really old'' */
+static int rtq_minreallyold6 = 10;  /* never automatically crank down to less */
+static int rtq_toomany6 = 128;	    /* 128 cached routes is ``too many'' */
+#endif /* VIMAGE */
 
-static int rtq_reallyold6 = 60*60;
-	/* one hour is ``really old'' */
-SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTEXPIRE, rtexpire,
-	CTLFLAG_RW, &rtq_reallyold6 , 0, "");
+SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTEXPIRE,
+    rtexpire, CTLFLAG_RW, rtq_reallyold6 , 0, "");
 
-static int rtq_minreallyold6 = 10;
-	/* never automatically crank down to less */
-SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMINEXPIRE, rtminexpire,
-	CTLFLAG_RW, &rtq_minreallyold6 , 0, "");
+SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMINEXPIRE,
+    rtminexpire, CTLFLAG_RW, rtq_minreallyold6 , 0, "");
 
-static int rtq_toomany6 = 128;
-	/* 128 cached routes is ``too many'' */
-SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache,
-	CTLFLAG_RW, &rtq_toomany6 , 0, "");
+SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMAXCACHE,
+    rtmaxcache, CTLFLAG_RW, rtq_toomany6 , 0, "");
 
 
 /*