PERFORCE change 126129 for review

[Ana Kukec]

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

Change 126129 by anchie at anchie_malimis on 2007/09/06 16:06:47

	SYSCTL macro for variable ip6_gif_hlim moved to net/if_gif.c.
	
	Added some INET6 conditional selections of code to enable
	successful compiling with VIMAGE and INET6 options.

Affected files ...

.. //depot/projects/vimage/src/sys/net/if_gif.c#10 edit
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#16 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#30 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#17 edit
.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#15 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/if_gif.c#10 (text+ko) ====

@@ -133,6 +133,10 @@
 SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, max_nesting,
 	CTLFLAG_RW, max_gif_nesting, 0, "Max nested tunnels");
 
+SYSCTL_DECL(_net_inet6_ip6);
+SYSCTL_V_INT(V_NET, vnet_gif, _net_inet6_ip6, IPV6CTL_GIF_HLIM,
+        gifhlim, CTLFLAG_RW,    ip6_gif_hlim,                   0, "");
+
 /*
  * By default, we disallow creation of multiple tunnels between the same
  * pair of addresses.  Some applications require this functionality so
@@ -270,9 +274,7 @@
 		vnet_mod_deregister(&vnet_gif_modinfo);
 #endif
 		mtx_destroy(&gif_mtx);
-#ifdef INET6
-		V_ip6_gif_hlim = 0;
-#endif
+
 		break;
 	default:
 		return EOPNOTSUPP;

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

@@ -194,6 +194,9 @@
 int
 in_pcballoc(struct socket *so, struct inpcbinfo *pcbinfo)
 {
+#ifdef INET6
+	INIT_VNET_INET6(curvnet);
+#endif
 	struct inpcb *inp;
 	int error;
 

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

@@ -2064,6 +2064,9 @@
 sysctl_drop(SYSCTL_HANDLER_ARGS)
 {
 	INIT_VNET_INET(curvnet);
+#ifdef INET6
+	INIT_VNET_INET6(curvnet);
+#endif
 	/* addrs[0] is a foreign socket, addrs[1] is a local one. */
 	struct sockaddr_storage addrs[2];
 	struct inpcb *inp;

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

@@ -519,8 +519,10 @@
 	auto_flowlabel, CTLFLAG_RW,	ip6_auto_flowlabel,	0, "");
 SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_DEFMCASTHLIM,
 	defmcasthlim, CTLFLAG_RW,	ip6_defmcasthlim,	0, "");
+/*
 SYSCTL_V_INT(V_NET, vnet_gif, _net_inet6_ip6, IPV6CTL_GIF_HLIM,
 	gifhlim, CTLFLAG_RW,	ip6_gif_hlim,			0, "");
+*/
 SYSCTL_STRING(_net_inet6_ip6, IPV6CTL_KAME_VERSION,
 	kame_version, CTLFLAG_RD,	__KAME_VERSION,		0, "");
 SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_USE_DEPRECATED,

==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#15 (text+ko) ====

@@ -188,8 +188,8 @@
 	CTLFLAG_RW, &ipsec_integrity, 0, "Emulate man-in-the-middle attack");
 #endif
 
+#ifndef VIMAGE
 #ifdef INET6 
-#ifndef VIMAGE
 struct ipsecstat ipsec6stat;
 int ip6_esp_trans_deflev;
 int ip6_esp_net_deflev;
@@ -1989,9 +1989,6 @@
 	const void *unused;
 {
 	INIT_VNET_IPSEC(curvnet);
-#ifdef INET6
-	INIT_VNET_INET6(curvnet);
-#endif
 
 	#ifdef IPSEC_DEBUG
 	V_ipsec_debug = 1;