diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2007-01-28 20:57:54 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2007-01-28 20:57:54 +0000 |
| commit | 808cf8b3174aa7ad0833ea69cb55753d21318c9c (patch) | |
| tree | f616989731c65ab1b6361b3ae5fff5ffed2e0c0a /programs/pluto/spdb.h | |
| parent | 58d26e02cd8686e177eebb9fb81e6b17798bbb30 (diff) | |
| download | vyos-strongswan-808cf8b3174aa7ad0833ea69cb55753d21318c9c.tar.gz vyos-strongswan-808cf8b3174aa7ad0833ea69cb55753d21318c9c.zip | |
[svn-upgrade] Integrating new upstream version, strongswan (2.8.1)
Diffstat (limited to 'programs/pluto/spdb.h')
| -rw-r--r-- | programs/pluto/spdb.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/programs/pluto/spdb.h b/programs/pluto/spdb.h index 5eebf86cf..6cb92f036 100644 --- a/programs/pluto/spdb.h +++ b/programs/pluto/spdb.h @@ -11,7 +11,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * RCSID $Id: spdb.h,v 1.4 2006/04/22 21:59:20 as Exp $ + * RCSID $Id: spdb.h,v 1.5 2007/01/10 00:36:19 as Exp $ */ #ifndef _SPDB_H @@ -60,10 +60,8 @@ struct db_sa { */ }; -/* The oakley sadb is subscripted by a bitset with members - * from POLICY_PSK and POLICY_RSASIG. - */ -extern struct db_sa oakley_sadb[1 << 2]; +/* The oakley sadb */ +extern struct db_sa oakley_sadb; /* The ipsec sadb is subscripted by a bitset with members * from POLICY_ENCRYPT, POLICY_AUTHENTICATE, POLICY_COMPRESS @@ -90,14 +88,15 @@ extern notification_t preparse_isakmp_sa_body( extern notification_t parse_isakmp_policy( pb_stream *proposal_pbs, /* body of proposal Payload */ u_int notrans, /* number of transforms */ - lset_t *policy); /* RSA or PSK policy */ + lset_t *policy); /* RSA, PSK or XAUTH policy */ extern notification_t parse_isakmp_sa_body( u_int32_t ipsecdoisit, /* IPsec DOI SIT bitset */ pb_stream *proposal_pbs, /* body of proposal Payload */ struct isakmp_proposal *proposal, pb_stream *r_sa_pbs, /* if non-NULL, where to emit winning SA */ - struct state *st); /* current state object */ + struct state *st, /* current state object */ + bool initiator); /* is caller initiator? */ extern notification_t parse_ipsec_sa_body( pb_stream *sa_pbs, /* body of input SA Payload */ |