aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-12-22 13:26:38 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:31:31 +0100
commit5f1df0a060e25f189f8856331d6bf3ce4ac83b73 (patch)
tree1d0c56d5e120f544e88716ba6117a0afa92921d2
parentf5a84055fe8ecfb22b67af554bf1b43c9c3e751b (diff)
downloadstrongswan-5f1df0a060e25f189f8856331d6bf3ce4ac83b73.tar.bz2
strongswan-5f1df0a060e25f189f8856331d6bf3ce4ac83b73.tar.xz
Double check that we could select a TS as quick mode responder
-rw-r--r--src/libcharon/sa/ikev1/tasks/quick_mode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 94e5bb85a..017ce97d4 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -699,10 +699,10 @@ METHOD(task_t, process_r, status_t,
}
tsi->destroy_offset(tsi, offsetof(traffic_selector_t, destroy));
tsr->destroy_offset(tsr, offsetof(traffic_selector_t, destroy));
- if (!this->config)
+ if (!this->config || !this->tsi || !this->tsr)
{
- DBG1(DBG_IKE, "no child config found");
- return send_notify(this, NO_PROPOSAL_CHOSEN);
+ DBG1(DBG_IKE, "no matching CHILD_SA config found");
+ return send_notify(this, INVALID_ID_INFORMATION);
}
sa_payload = (sa_payload_t*)message->get_payload(message,