From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 25 Jun 2018 10:32:27 +0000 (+0200)
Subject: ike-config: Support IKE_AUX exchange between IKE_SA_INIT and IKE_AUTH
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=964c021e6bbaf064220e0b72100fc4d774415b9f;p=thirdparty%2Fstrongswan.git

ike-config: Support IKE_AUX exchange between IKE_SA_INIT and IKE_AUTH

This changes the MID of the first IKE_AUTH message.
---

diff --git a/src/libcharon/sa/ikev2/tasks/ike_config.c b/src/libcharon/sa/ikev2/tasks/ike_config.c
index 3fb4b94461..21c3eb85d7 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_config.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2012-2018 Tobias Brunner
  * Copyright (C) 2007 Martin Willi
  * Copyright (C) 2006-2007 Fabian Hartmann, Noah Heusser
  * HSR Hochschule fuer Technik Rapperswil
@@ -239,8 +240,8 @@ static void process_payloads(private_ike_config_t *this, message_t *message)
 METHOD(task_t, build_i, status_t,
 	private_ike_config_t *this, message_t *message)
 {
-	if (message->get_message_id(message) == 1)
-	{	/* in first IKE_AUTH only */
+	if (message->get_exchange_type(message) == IKE_AUTH)
+	{
 		cp_payload_t *cp = NULL;
 		enumerator_t *enumerator;
 		attribute_handler_t *handler;
@@ -250,6 +251,9 @@ METHOD(task_t, build_i, status_t,
 		linked_list_t *vips;
 		host_t *host;
 
+		/* in first IKE_AUTH only */
+		this->public.task.build = (void*)return_need_more;
+
 		vips = linked_list_create();
 
 		/* reuse virtual IP if we already have one */
@@ -328,9 +332,11 @@ METHOD(task_t, build_i, status_t,
 METHOD(task_t, process_r, status_t,
 	private_ike_config_t *this, message_t *message)
 {
-	if (message->get_message_id(message) == 1)
-	{	/* in first IKE_AUTH only */
+	if (message->get_exchange_type(message) == IKE_AUTH)
+	{
 		process_payloads(this, message);
+		/* in first IKE_AUTH only */
+		this->public.task.process = (void*)return_need_more;
 	}
 	return NEED_MORE;
 }