Support IKEv1 SPIs in IKEv1 delete payload

diff --git a/src/libcharon/encoding/payloads/delete_payload.c b/src/libcharon/encoding/payloads/delete_payload.c
index 79070a79f44ec5fd991627f1845e252cac22fd2a..3222e9fbea1dce288cd02460e40597e5fc49e131 100644 (file)
--- a/src/libcharon/encoding/payloads/delete_payload.c
+++ b/src/libcharon/encoding/payloads/delete_payload.c
@@ -272,6 +272,16 @@ METHOD(delete_payload_t, add_spi, void,
        }
 }
 
+METHOD(delete_payload_t, set_ike_spi, void,
+       private_delete_payload_t *this, u_int64_t spi_i, u_int64_t spi_r)
+{
+       free(this->spis.ptr);
+       this->spis = chunk_cat("cc", chunk_from_thing(spi_i),
+                                                                chunk_from_thing(spi_r));
+       this->spi_count = 1;
+       this->payload_length = get_header_length(this) + this->spi_size;
+}
+
 /**
  * SPI enumerator implementation
  */
@@ -342,16 +352,27 @@ 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,
                        .create_spi_enumerator = _create_spi_enumerator,
                        .destroy = _destroy,
                },
                .next_payload = NO_PAYLOAD,
-               .doi = IKEV1_DOI_IPSEC,
                .protocol_id = protocol_id,
-               .spi_size = protocol_id == PROTO_AH || protocol_id == PROTO_ESP ? 4 : 0,
                .type = type,
        );
        this->payload_length = get_header_length(this);
 
+       if (type == DELETE_V1)
+       {
+               if (protocol_id == PROTO_IKE)
+               {
+                       this->spi_size = 16;
+               }
+               else
+               {
+                       this->doi = IKEV1_DOI_IPSEC,
+                       this->spi_size = 4;
+               }
+       }
        return &this->public;
 }

diff --git a/src/libcharon/encoding/payloads/delete_payload.h b/src/libcharon/encoding/payloads/delete_payload.h
index 0ee0d4f7a435aaef6b2dbd5ce6fb488fcaad7238..afce1ecf1d4afb2831f90a0bcfc5a95f7dac0d67 100644 (file)
--- a/src/libcharon/encoding/payloads/delete_payload.h
+++ b/src/libcharon/encoding/payloads/delete_payload.h
@@ -52,6 +52,14 @@ struct delete_payload_t {
         */
        void (*add_spi) (delete_payload_t *this, u_int32_t spi);
 
+       /**
+        * Set the IKE SPIs for an IKEv1 delete.
+        *
+        * @param spi_i                 initiator SPI
+        * @param spi_r                 responder SPI
+        */
+       void (*set_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.
         *