diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-24 21:52:29 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-24 21:52:29 +0000 |
| commit | a947602a8e490b9c56e746231bf6fc1a45b63ab9 (patch) | |
| tree | a3ac033a54a3e31df305ca90ec41815614cdec0d | |
| parent | e94a96fdee652ded43a48a642b0637ded3c47e66 (diff) | |
use new timeouts for spd expirations (hmm cvs did not pick up the file); ho@ ok
| -rw-r--r-- | sys/netinet/ip_ipsp.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index aab6998d3b8..c3ffe10541c 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.105 2001/06/24 18:22:47 provos Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.106 2001/06/24 21:52:28 mickey Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -163,11 +163,11 @@ struct ipsec_ref struct ipsec_acquire { union sockaddr_union ipa_addr; - u_int64_t ipa_expire; u_int32_t ipa_seq; struct sockaddr_encap ipa_info; struct sockaddr_encap ipa_mask; struct mbuf *ipa_packet; + struct timeout ipa_timeout; TAILQ_ENTRY(ipsec_acquire) ipa_next; }; @@ -609,10 +609,9 @@ extern struct ipsec_policy *ipsec_add_policy(struct sockaddr_encap *, struct sockaddr_encap *, union sockaddr_union *, int, int); extern int ipsec_delete_policy(struct ipsec_policy *); -extern void ipsp_acquire_expirations(void *); extern struct ipsec_acquire *ipsp_pending_acquire(union sockaddr_union *); extern struct ipsec_acquire *ipsec_get_acquire(u_int32_t); -extern void ipsp_delete_acquire(struct ipsec_acquire *); +extern void ipsp_delete_acquire(void *); extern void ipsp_clear_acquire(struct tdb *); extern int ipsp_is_unspecified(union sockaddr_union); extern void ipsp_reffree(struct ipsec_ref *); |