PERFORCE change 38805 for review

[Sam Leffler]

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

Change 38805 by sam at 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 ? */
 };