PERFORCE change 153564 for review

[Marko Zec]

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

Change 153564 by zec at zec_tpx32 on 2008/11/25 23:47:35

	static struct sockaddr key_src should most probably be
	virtualized as well (?)

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 (text+ko) ====

@@ -74,10 +74,9 @@
 #ifdef VIMAGE_GLOBALS
 static struct key_cb key_cb;
 struct pfkeystat pfkeystat;
+static struct sockaddr key_src;
 #endif
 
-static struct sockaddr key_src = { 2, PF_KEY, };
-
 static int key_sendup0 __P((struct rawcb *, struct mbuf *, int));
 
 /*
@@ -573,6 +572,9 @@
 {
 	INIT_VNET_IPSEC(curvnet);
 
+	V_key_src.sa_len = 2;
+	V_key_src.sa_family = PF_KEY;
+
 	bzero((caddr_t)&V_key_cb, sizeof(V_key_cb));
 	ipsec_init();
 	key_init();

==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 (text+ko) ====

@@ -106,7 +106,7 @@
 
 	struct pfkeystat	_pfkeystat;
 	struct key_cb		_key_cb;
-
+	struct sockaddr		_key_src;
 	LIST_HEAD(, secpolicy)	_sptree[IPSEC_DIR_MAX];
 	LIST_HEAD(, secashead)	_sahtree;
 	LIST_HEAD(, secreg)	_regtree[SADB_SATYPE_MAX + 1];