From: Martin Willi <martin@strongswan.org>
Date: Tue, 18 Mar 2008 12:45:23 +0000 (-0000)
Subject: added generic payload order rules for notifies
X-Git-Tag: 4.2.0~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bed94c8aebd81b08735c2479b7ff3fdcf9846e01;p=thirdparty%2Fstrongswan.git

added generic payload order rules for notifies
---

diff --git a/src/charon/encoding/message.c b/src/charon/encoding/message.c
index 0568b42e5a..88dafa033a 100644
--- a/src/charon/encoding/message.c
+++ b/src/charon/encoding/message.c
@@ -163,6 +163,7 @@ static payload_order_t ike_sa_init_i_payload_order[] = {
 	{NONCE, 						0},
 	{NOTIFY,						NAT_DETECTION_SOURCE_IP},
 	{NOTIFY,						NAT_DETECTION_DESTINATION_IP},
+	{NOTIFY,						0},
 	{VENDOR_ID,						0},
 };
 
@@ -190,6 +191,7 @@ static payload_order_t ike_sa_init_r_payload_order[] = {
 	{NOTIFY,						NAT_DETECTION_DESTINATION_IP},
 	{NOTIFY,						HTTP_CERT_LOOKUP_SUPPORTED},
 	{CERTIFICATE_REQUEST,			0},
+	{NOTIFY,						0},
 	{VENDOR_ID,						0},
 };
 
@@ -243,6 +245,7 @@ static payload_order_t ike_auth_i_payload_order[] = {
 	{NOTIFY,						ADDITIONAL_IP4_ADDRESS},
 	{NOTIFY,						ADDITIONAL_IP6_ADDRESS},
 	{NOTIFY,						NO_ADDITIONAL_ADDRESSES},
+	{NOTIFY,						0},
 	{VENDOR_ID,						0},
 };
 
@@ -285,6 +288,7 @@ static payload_order_t ike_auth_r_payload_order[] = {
 	{NOTIFY,						ADDITIONAL_IP4_ADDRESS},
 	{NOTIFY,						ADDITIONAL_IP6_ADDRESS},
 	{NOTIFY,						NO_ADDITIONAL_ADDRESSES},
+	{NOTIFY,						0},
 	{VENDOR_ID,						0},
 };
 
@@ -360,6 +364,7 @@ static payload_order_t create_child_sa_i_payload_order[] = {
 	{KEY_EXCHANGE, 					0},
 	{TRAFFIC_SELECTOR_INITIATOR,	0},
 	{TRAFFIC_SELECTOR_RESPONDER,	0},
+	{NOTIFY,						0},
 };
 
 /**
@@ -392,6 +397,7 @@ static payload_order_t create_child_sa_r_payload_order[] = {
 	{TRAFFIC_SELECTOR_INITIATOR,	0},
 	{TRAFFIC_SELECTOR_RESPONDER,	0},
 	{NOTIFY,						ADDITIONAL_TS_POSSIBLE},
+	{NOTIFY,						0},
 };
 
 #ifdef P2P