From owner-p4-projects@FreeBSD.ORG  Tue Nov 25 23:47:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F66A1065675; Tue, 25 Nov 2008 23:47:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C83D0106564A
	for <perforce@freebsd.org>; Tue, 25 Nov 2008 23:47:57 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BEA5D8FC22
	for <perforce@freebsd.org>; Tue, 25 Nov 2008 23:47:57 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPNlvPK037097
	for <perforce@freebsd.org>; Tue, 25 Nov 2008 23:47:57 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPNlvda037095
	for perforce@freebsd.org; Tue, 25 Nov 2008 23:47:57 GMT
	(envelope-from zec@tel.fer.hr)
Date: Tue, 25 Nov 2008 23:47:57 GMT
Message-Id: <200811252347.mAPNlvda037095@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153564 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Nov 2008 23:47:58 -0000

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

Change 153564 by zec@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];