diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-02-29 14:47:09 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-03-20 17:31:40 +0100 |
| commit | 1726795fa9abe4b32ecbd7abd721ecced6c9af9c (patch) | |
| tree | 56a45602079ffd2c64f2151b2d3de7a01a16d8aa /src/libcharon/sa/ike_sa_manager.c | |
| parent | 8254e7ecb8aff19b1b32fb34723be6c31e0b2f9f (diff) | |
| download | strongswan-1726795fa9abe4b32ecbd7abd721ecced6c9af9c.tar.bz2 strongswan-1726795fa9abe4b32ecbd7abd721ecced6c9af9c.tar.xz | |
Store the major IKE version on ike_sa_id_t.
Diffstat (limited to 'src/libcharon/sa/ike_sa_manager.c')
| -rw-r--r-- | src/libcharon/sa/ike_sa_manager.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c index 455d5386a..3a06f1d1f 100644 --- a/src/libcharon/sa/ike_sa_manager.c +++ b/src/libcharon/sa/ike_sa_manager.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2005-2011 Martin Willi * Copyright (C) 2011 revosec AG - * Copyright (C) 2008 Tobias Brunner + * Copyright (C) 2008-2012 Tobias Brunner * Copyright (C) 2005 Jan Hutter * Hochschule fuer Technik Rapperswil * @@ -943,14 +943,17 @@ METHOD(ike_sa_manager_t, checkout_new, ike_sa_t*, { ike_sa_id_t *ike_sa_id; ike_sa_t *ike_sa; + u_int8_t ike_version; + + ike_version = version == IKEV1 ? IKEV1_MAJOR_VERSION : IKEV2_MAJOR_VERSION; if (initiator) { - ike_sa_id = ike_sa_id_create(get_spi(this), 0, TRUE); + ike_sa_id = ike_sa_id_create(ike_version, get_spi(this), 0, TRUE); } else { - ike_sa_id = ike_sa_id_create(0, get_spi(this), FALSE); + ike_sa_id = ike_sa_id_create(ike_version, 0, get_spi(this), FALSE); } ike_sa = ike_sa_create(ike_sa_id, initiator, version); ike_sa_id->destroy(ike_sa_id); |