diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-02-26 03:50:27 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-02-26 03:50:27 +0000 |
| commit | 3d59cd1cd8898e2072ed9c2405edd84d1c92e61b (patch) | |
| tree | 5e01eae48c6bfcbf13a352707654bc2efd5afb8a /sbin/isakmpd/sa.h | |
| parent | 00979bae7faa180a20bda9de6aa4c9c725870944 (diff) | |
Merge from the Ericsson repository
| revision 1.40
| date: 1999/02/14 00:11:40; author: niklas; state: Exp; lines: +7 -4
| Generalize how to find SAs with given attributes. Do SA expiration both hard
| and soft, and do not rekey automatically anymore. We will revisit this by
| adding some kind of policy what to do at these times. Improve commentary
| ----------------------------
Diffstat (limited to 'sbin/isakmpd/sa.h')
| -rw-r--r-- | sbin/isakmpd/sa.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sbin/isakmpd/sa.h b/sbin/isakmpd/sa.h index b4facfda743..4ea8deb5c5b 100644 --- a/sbin/isakmpd/sa.h +++ b/sbin/isakmpd/sa.h @@ -1,5 +1,5 @@ -/* $OpenBSD: sa.h,v 1.4 1998/12/21 01:02:27 niklas Exp $ */ -/* $EOM: sa.h,v 1.39 1998/12/15 16:58:47 niklas Exp $ */ +/* $OpenBSD: sa.h,v 1.5 1999/02/26 03:50:26 niklas Exp $ */ +/* $EOM: sa.h,v 1.40 1999/02/14 00:11:40 niklas Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -71,7 +71,7 @@ struct proto { /* The protocol this SA is for. */ u_int8_t proto; - /* Security parameter index info. Element 0 - responder, 1 - initiator. */ + /* Security parameter index info. Element 0 - outgoing, 1 - incoming. */ u_int8_t spi_sz[2]; u_int8_t *spi[2]; @@ -140,7 +140,8 @@ struct sa { u_int64_t seconds; u_int64_t kilobytes; - /* The event that will occur when an SA has timed out. */ + /* The events that will occur when an SA has timed out. */ + struct event *soft_death; struct event *death; }; @@ -152,6 +153,7 @@ extern int sa_add_transform (struct sa *, struct payload *, int, struct proto **); extern int sa_create (struct exchange *, struct transport *); extern void sa_delete (struct sa *, int); +extern struct sa *sa_find (int (*) (struct sa *, void *), void *); extern void sa_free (struct sa *); extern void sa_free_aux (struct sa *); extern void sa_init (void); @@ -161,7 +163,8 @@ extern struct sa *sa_lookup (u_int8_t *, u_int8_t *); extern struct sa *sa_lookup_by_header (u_int8_t *, int); extern struct sa *sa_lookup_by_name (char *, int); extern struct sa *sa_lookup_from_icookie (u_int8_t *); -extern void sa_rekey_p1 (struct sa *); +extern void sa_soft_expire (struct sa *); +extern void sa_hard_expire (struct sa *); extern void sa_report (void); #endif /* _SA_H_ */ |