encoding: Add getter for IKE SPIs in IKEv1 DELETE payloads

diff --git a/src/libcharon/encoding/payloads/delete_payload.c b/src/libcharon/encoding/payloads/delete_payload.c
index c2ab3b951bed54b75df139c0d39d90a4a33e1d86..f11ea485cf549115e9adaa9f80ad57e43845703f 100644 (file)
--- a/src/libcharon/encoding/payloads/delete_payload.c
+++ b/src/libcharon/encoding/payloads/delete_payload.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2015 Tobias Brunner
  * Copyright (C) 2005-2010 Martin Willi
  * Copyright (C) 2010 revosec AG
  * Copyright (C) 2005 Jan Hutter
@@ -281,6 +282,19 @@ METHOD(delete_payload_t, set_ike_spi, void,
        this->payload_length = get_header_length(this) + this->spi_size;
 }
 
+METHOD(delete_payload_t, get_ike_spi, bool,
+       private_delete_payload_t *this, u_int64_t *spi_i, u_int64_t *spi_r)
+{
+       if (this->protocol_id != PROTO_IKE ||
+               this->spis.len < 2 * sizeof(u_int64_t))
+       {
+               return FALSE;
+       }
+       memcpy(spi_i, this->spis.ptr, sizeof(u_int64_t));
+       memcpy(spi_r, this->spis.ptr + sizeof(u_int64_t), sizeof(u_int64_t));
+       return TRUE;
+}
+
 /**
  * SPI enumerator implementation
  */
@@ -352,6 +366,7 @@ delete_payload_t *delete_payload_create(payload_type_t type,
                        .get_protocol_id = _get_protocol_id,
                        .add_spi = _add_spi,
                        .set_ike_spi = _set_ike_spi,
+                       .get_ike_spi = _get_ike_spi,
                        .create_spi_enumerator = _create_spi_enumerator,
                        .destroy = _destroy,
                },

diff --git a/src/libcharon/encoding/payloads/delete_payload.h b/src/libcharon/encoding/payloads/delete_payload.h
index 46a89eab648b3a8131726959a7badc6f7dcc6b10..6728718cdc3da5f3e4ba1969db0fccc88074a912 100644 (file)
--- a/src/libcharon/encoding/payloads/delete_payload.h
+++ b/src/libcharon/encoding/payloads/delete_payload.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2015 Tobias Brunner
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
@@ -60,6 +61,15 @@ struct delete_payload_t {
         */
        void (*set_ike_spi)(delete_payload_t *this, u_int64_t spi_i, u_int64_t spi_r);
 
+       /**
+        * Get the IKE SPIs from an IKEv1 delete.
+        *
+        * @param spi_i                 initiator SPI
+        * @param spi_r                 responder SPI
+        * @return                              TRUE if SPIs extracted successfully
+        */
+       bool (*get_ike_spi)(delete_payload_t *this, u_int64_t *spi_i, u_int64_t *spi_r);
+
        /**
         * Get an enumerator over the SPIs in network order.
         *