Updated to new upstream release. interfaces Patch is not from upstream.

1 files changed, 35 insertions, 19 deletions

diff --git a/src/charon/encoding/payloads/notify_payload.h b/src/charon/encoding/payloads/notify_payload.h
index a5f501dca..0e1bc23b8 100644
--- a/src/charon/encoding/payloads/notify_payload.h
+++ b/src/charon/encoding/payloads/notify_payload.h
@@ -59,11 +59,15 @@ enum notify_type_t {
 	FAILED_CP_REQUIRED = 37,
 	TS_UNACCEPTABLE = 38,
 	INVALID_SELECTORS = 39,
+	/* mobile extension, RFC 4555 */
 	UNACCEPTABLE_ADDRESSES = 40,
 	UNEXPECTED_NAT_DETECTED = 41,
+	/* mobile IPv6 bootstrapping, RFC 5026 */
+	USE_ASSIGNED_HoA = 42,
+
 	/* IKE-ME, private use */
 	ME_CONNECT_FAILED = 8192,
-	
+
 	/* notify status messages */
 	INITIAL_CONTACT = 16384,
 	SET_WINDOW_SIZE = 16385,
@@ -87,9 +91,21 @@ enum notify_type_t {
 	NO_NATS_ALLOWED = 16402,
 	/* repeated authentication extension, RFC4478 */
 	AUTH_LIFETIME = 16403,
-    /* multiple authentication exchanges, RFC 4739 */
+	/* multiple authentication exchanges, RFC 4739 */
 	MULTIPLE_AUTH_SUPPORTED = 16404,
 	ANOTHER_AUTH_FOLLOWS = 16405,
+	/* redirect mechanism, RFC 5685 */
+	REDIRECT_SUPPORTED = 16406,
+	REDIRECT = 16407,
+	REDIRECTED_FROM = 16408,
+	/* draft-ietf-ipsecme-ikev2-resumption, assigned by IANA */
+	TICKET_LT_OPAQUE = 16409,
+	TICKET_REQUEST = 16410,
+	TICKET_ACK = 16411,
+	TICKET_NACK = 16412,
+	TICKET_OPAQUE = 16413,
+	LINK_ID = 16414,
+
 	/* draft-eronen-ipsec-ikev2-eap-auth, not assigned by IANA yet */
 	EAP_ONLY_AUTHENTICATION = 40960,
 	/* BEET mode, not even a draft yet. private use */
@@ -116,7 +132,7 @@ extern enum_name_t *notify_type_short_names;
 
 /**
  * Class representing an IKEv2-Notify Payload.
- * 
+ *
  * The Notify Payload format is described in Draft section 3.10.
  */
 struct notify_payload_t {
@@ -124,67 +140,67 @@ struct notify_payload_t {
 	 * The payload_t interface.
 	 */
 	payload_t payload_interface;
-	
+
 	/**
 	 * Gets the protocol id of this payload.
-	 * 	
+	 *
 	 * @return 			protocol id of this payload
 	 */
 	u_int8_t (*get_protocol_id) (notify_payload_t *this);
 
 	/**
 	 * Sets the protocol id of this payload.
-	 * 	
+	 *
 	 * @param protocol_id	protocol id to set
 	 */
 	void (*set_protocol_id) (notify_payload_t *this, u_int8_t protocol_id);
 
 	/**
 	 * Gets the notify message type of this payload.
-	 * 	
+	 *
 	 * @return 			notify message type of this payload
 	 */
 	notify_type_t (*get_notify_type) (notify_payload_t *this);
 
 	/**
 	 * Sets notify message type of this payload.
-	 * 	
+	 *
 	 * @param type		notify message type to set
 	 */
 	void (*set_notify_type) (notify_payload_t *this, notify_type_t type);
 
 	/**
 	 * Returns the currently set spi of this payload.
-	 * 
+	 *
 	 * This is only valid for notifys with protocol AH|ESP
 	 *
 	 * @return 		SPI value
 	 */
 	u_int32_t (*get_spi) (notify_payload_t *this);
-	
+
 	/**
 	 * Sets the spi of this payload.
-	 * 
+	 *
 	 * This is only valid for notifys with protocol AH|ESP
-	 * 
+	 *
 	 * @param spi	SPI value
 	 */
 	void (*set_spi) (notify_payload_t *this, u_int32_t spi);
 
 	/**
 	 * Returns the currently set notification data of payload.
-	 * 	
+	 *
 	 * Returned data are not copied.
-	 * 
+	 *
 	 * @return 		chunk_t pointing to the value
 	 */
 	chunk_t (*get_notification_data) (notify_payload_t *this);
-	
+
 	/**
 	 * Sets the notification data of this payload.
-	 * 	
+	 *
 	 * @warning Value is getting copied.
-	 * 
+	 *
 	 * @param notification_data 	chunk_t pointing to the value to set
 	 */
 	void (*set_notification_data) (notify_payload_t *this,
@@ -198,14 +214,14 @@ struct notify_payload_t {
 
 /**
  * Creates an empty notify_payload_t object
- * 
+ *
  * @return			created notify_payload_t object
  */
 notify_payload_t *notify_payload_create(void);
 
 /**
  * Creates an notify_payload_t object of specific type for specific protocol id.
- * 
+ *
  * @param protocol_id			protocol id (IKE, AH or ESP)
  * @param type					notify type (see notify_type_t)
  * @return						notify_payload_t object