diff options
author | Martin Willi <martin@revosec.ch> | 2011-11-21 17:18:43 +0100 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:30:47 +0100 |
commit | 17ec1c74de4c1ceb642e47d4767bd5b323908cfe (patch) | |
tree | 8e5195a27dc77679d0327128544dacbda9c0c9b2 /src/libcharon/sa/ike_sa.c | |
parent | 1b99befac3103fe3b9f66a63883a1ca9d2dfc840 (diff) | |
download | strongswan-17ec1c74de.tar.bz2 strongswan-17ec1c74de.tar.xz |
Don't compare initiator flag in IKE_SA manager, pass initiator parameter to IKE_SA constructor
Diffstat (limited to 'src/libcharon/sa/ike_sa.c')
-rw-r--r-- | src/libcharon/sa/ike_sa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c index b9b2bb82e..d2dffea8b 100644 --- a/src/libcharon/sa/ike_sa.c +++ b/src/libcharon/sa/ike_sa.c @@ -2131,7 +2131,8 @@ METHOD(ike_sa_t, destroy, void, /* * Described in header. */ -ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, ike_version_t version) +ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator, + ike_version_t version) { private_ike_sa_t *this; static u_int32_t unique_id = 0; @@ -2224,7 +2225,7 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, ike_version_t version) .other_host = host_create_any(AF_INET), .my_id = identification_create_from_encoding(ID_ANY, chunk_empty), .other_id = identification_create_from_encoding(ID_ANY, chunk_empty), - .keymat = keymat_create(version, ike_sa_id->is_initiator(ike_sa_id)), + .keymat = keymat_create(version, initiator), .state = IKE_CREATED, .stats[STAT_INBOUND] = time_monotonic(NULL), .stats[STAT_OUTBOUND] = time_monotonic(NULL), |