diff options
| author | Martin Willi <martin@revosec.ch> | 2013-03-01 11:24:42 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-03-01 11:24:42 +0100 |
| commit | 00683b686456383a83e7500e19a24a83eccd7314 (patch) | |
| tree | 4fbee73c40376388c7f361295b974f54a922f4fd /src/libcharon/sa/ikev2 | |
| parent | d634109f1df9586fe7fd206050c4f64c6c1fadaa (diff) | |
| parent | e2857be823cb916e0d89d02c08544b7c14b309c8 (diff) | |
| download | strongswan-00683b686456383a83e7500e19a24a83eccd7314.tar.bz2 strongswan-00683b686456383a83e7500e19a24a83eccd7314.tar.xz | |
Merge branch 'ikev1-mm-retransmits'
Fixes retransmit of the last Main Mode or IKE_AUTH message, and correctly
queues Main Mode messages when processing of the last message is still in
progress.
Diffstat (limited to 'src/libcharon/sa/ikev2')
| -rw-r--r-- | src/libcharon/sa/ikev2/task_manager_v2.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c index ea0117c54..29d8d830e 100644 --- a/src/libcharon/sa/ikev2/task_manager_v2.c +++ b/src/libcharon/sa/ikev2/task_manager_v2.c @@ -1123,6 +1123,18 @@ METHOD(task_manager_t, process_message, status_t, { if (mid == this->responding.mid) { + /* reject initial messages once established */ + if (msg->get_exchange_type(msg) == IKE_SA_INIT || + msg->get_exchange_type(msg) == IKE_AUTH) + { + if (this->ike_sa->get_state(this->ike_sa) != IKE_CREATED && + this->ike_sa->get_state(this->ike_sa) != IKE_CONNECTING) + { + DBG1(DBG_IKE, "ignoring %N in established IKE_SA state", + exchange_type_names, msg->get_exchange_type(msg)); + return FAILED; + } + } if (this->ike_sa->get_state(this->ike_sa) == IKE_CREATED || this->ike_sa->get_state(this->ike_sa) == IKE_CONNECTING || msg->get_exchange_type(msg) != IKE_SA_INIT) |