From: Martin Willi <martin@revosec.ch>
Date: Wed, 16 Nov 2011 17:23:00 +0000 (+0100)
Subject: Don't set IKEv2 only header flags when using IKEv1
X-Git-Tag: 5.0.0~338^2~9^2~499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bce8d3be1182f249659f2c01ac7feca58de533f4;p=thirdparty%2Fstrongswan.git

Don't set IKEv2 only header flags when using IKEv1
---

diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 91d7f3df9b..6640b7696a 100644
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -1315,10 +1315,13 @@ METHOD(message_t, generate, status_t,
 										   this->minor_version);
 	ike_header->set_exchange_type(ike_header, this->exchange_type);
 	ike_header->set_message_id(ike_header, this->message_id);
-	ike_header->set_response_flag(ike_header, !this->is_request);
-	ike_header->set_version_flag(ike_header, this->version_flag);
-	ike_header->set_initiator_flag(ike_header,
+	if (this->major_version == IKEV2_MAJOR_VERSION)
+	{
+		ike_header->set_response_flag(ike_header, !this->is_request);
+		ike_header->set_version_flag(ike_header, this->version_flag);
+		ike_header->set_initiator_flag(ike_header,
 						this->ike_sa_id->is_initiator(this->ike_sa_id));
+	}
 	ike_header->set_initiator_spi(ike_header,
 						this->ike_sa_id->get_initiator_spi(this->ike_sa_id));
 	ike_header->set_responder_spi(ike_header,