From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 15:04:01 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB2D616A4C0; Mon, 29 Sep 2003 15:04:00 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C513116A4B3
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 15:04:00 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 497124401E
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 15:04:00 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TM40XJ009053
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 15:04:00 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TM3xUW009050
	for perforce@freebsd.org; Mon, 29 Sep 2003 15:03:59 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Mon, 29 Sep 2003 15:03:59 -0700 (PDT)
Message-Id: <200309292203.h8TM3xUW009050@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38805 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 29 Sep 2003 22:04:01 -0000

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

Change 38805 by sam@sam_ebb on 2003/09/29 15:03:29

	o correct some types: long -> time_t
	o add scan generation # to secpolicy to deal with locking issues

Affected files ...

.. //depot/projects/netperf/sys/netipsec/ipsec.h#6 edit

Differences ...

==== //depot/projects/netperf/sys/netipsec/ipsec.h#6 (text+ko) ====

@@ -80,8 +80,8 @@
 	u_int state;			/* 0: dead, others: alive */
 #define IPSEC_SPSTATE_DEAD	0
 #define IPSEC_SPSTATE_ALIVE	1
-
-	u_int policy;		/* DISCARD, NONE or IPSEC, see keyv2.h */
+	u_int16_t policy;		/* policy_type per pfkeyv2.h */
+	u_int16_t scangen;		/* scan generation # */
 	struct ipsecrequest *req;
 				/* pointer to the ipsec request tree, */
 				/* if policy == IPSEC else this value == NULL.*/
@@ -93,8 +93,8 @@
 	 * "lifetime" is passed by sadb_lifetime.sadb_lifetime_addtime.
 	 * "validtime" is passed by sadb_lifetime.sadb_lifetime_usetime.
 	 */
-	long created;		/* time created the policy */
-	long lastused;		/* updated every when kernel sends a packet */
+	time_t created;		/* time created the policy */
+	time_t lastused;	/* updated every when kernel sends a packet */
 	long lifetime;		/* duration of the lifetime of this policy */
 	long validtime;		/* duration this policy is valid without use */
 };
@@ -145,7 +145,7 @@
 
 	struct secpolicyindex spidx;
 
-	long created;		/* for lifetime */
+	time_t created;		/* for lifetime */
 	int count;		/* for lifetime */
 	/* XXX: here is mbuf place holder to be sent ? */
 };