projects / strongswan.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added IKEv1 support to delete payload
[strongswan.git] / src / libcharon / encoding / payloads / delete_payload.c
diff --git a/src/libcharon/encoding/payloads/delete_payload.c b/src/libcharon/encoding/payloads/delete_payload.c
index 0abeb55..7cf14cd 100644 (file)
--- a/src/libcharon/encoding/payloads/delete_payload.c
+++ b/src/libcharon/encoding/payloads/delete_payload.c
@@ -24,9 +24,9 @@ typedef struct private_delete_payload_t private_delete_payload_t;
 
 /**
  * Private data of an delete_payload_t object.
 
 /**
  * Private data of an delete_payload_t object.
- *
  */
 struct private_delete_payload_t {
  */
 struct private_delete_payload_t {
+
        /**
         * Public delete_payload_t interface.
         */
        /**
         * Public delete_payload_t interface.
         */
@@ -43,11 +43,21 @@ struct private_delete_payload_t {
        bool critical;
 
        /**
        bool critical;
 
        /**
+        * reserved bits
+        */
+       bool reserved[8];
+
+       /**
         * Length of this payload.
         */
        u_int16_t payload_length;
 
        /**
         * Length of this payload.
         */
        u_int16_t payload_length;
 
        /**
+        * IKEv1 Domain of Interpretation
+        */
+       u_int32_t doi;
+
+       /**
         * Protocol ID.
         */
        u_int8_t protocol_id;
         * Protocol ID.
         */
        u_int8_t protocol_id;
@@ -66,34 +76,76 @@ struct private_delete_payload_t {
         * The contained SPI's.
         */
        chunk_t spis;
         * The contained SPI's.
         */
        chunk_t spis;
+
+       /**
+        * Payload type, DELETE or DELETE_V1
+        */
+       payload_type_t type;
 };
 
 /**
 };
 
 /**
- * Encoding rules to parse or generate a DELETE payload
- *
- * The defined offsets are the positions in a object of type
- * private_delete_payload_t.
+ * Encoding rules for an IKEv2 delete payload.
  */
  */
-encoding_rule_t delete_payload_encodings[] = {
+static encoding_rule_t encodings_v2[] = {
        /* 1 Byte next payload type, stored in the field next_payload */
        { U_INT_8,                      offsetof(private_delete_payload_t, next_payload)        },
        /* the critical bit */
        { FLAG,                         offsetof(private_delete_payload_t, critical)            },
        /* 1 Byte next payload type, stored in the field next_payload */
        { U_INT_8,                      offsetof(private_delete_payload_t, next_payload)        },
        /* the critical bit */
        { FLAG,                         offsetof(private_delete_payload_t, critical)            },
-       /* 7 Bit reserved bits, nowhere stored */
-       { RESERVED_BIT,         0                                                                                                       },
-       { RESERVED_BIT,         0                                                                                                       },
-       { RESERVED_BIT,         0                                                                                                       },
-       { RESERVED_BIT,         0                                                                                                       },
-       { RESERVED_BIT,         0                                                                                                       },
-       { RESERVED_BIT,         0                                                                                                       },
-       { RESERVED_BIT,         0                                                                                                       },
+       /* 7 Bit reserved bits */
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[0])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[1])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[2])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[3])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[4])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[5])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[6])         },
+       /* Length of the whole payload*/
+       { PAYLOAD_LENGTH,       offsetof(private_delete_payload_t, payload_length)      },
+       { U_INT_8,                      offsetof(private_delete_payload_t, protocol_id)         },
+       { U_INT_8,                      offsetof(private_delete_payload_t, spi_size)            },
+       { U_INT_16,                     offsetof(private_delete_payload_t, spi_count)           },
+       /* some delete data bytes, length is defined in PAYLOAD_LENGTH */
+       { CHUNK_DATA,           offsetof(private_delete_payload_t, spis)                        },
+};
+
+/*
+                           1                   2                   3
+       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      ! Next Payload  !C!  RESERVED   !         Payload Length        !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      ! Protocol ID   !   SPI Size    !           # of SPIs           !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                                                               !
+      ~               Security Parameter Index(es) (SPI)              ~
+      !                                                               !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+*/
+
+/**
+ * Encoding rules for an IKEv1 delete payload.
+ */
+static encoding_rule_t encodings_v1[] = {
+       /* 1 Byte next payload type, stored in the field next_payload */
+       { U_INT_8,                      offsetof(private_delete_payload_t, next_payload)        },
+       /* 8 Bit reserved bits */
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[0])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[1])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[2])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[3])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[4])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[5])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[6])         },
+       { RESERVED_BIT,         offsetof(private_delete_payload_t, reserved[7])         },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_delete_payload_t, payload_length)      },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_delete_payload_t, payload_length)      },
+       /* Domain of interpretation */
+       { U_INT_32,                     offsetof(private_delete_payload_t, doi)                         },
        { U_INT_8,                      offsetof(private_delete_payload_t, protocol_id)         },
        { U_INT_8,                      offsetof(private_delete_payload_t, spi_size)            },
        { U_INT_16,                     offsetof(private_delete_payload_t, spi_count)           },
        /* some delete data bytes, length is defined in PAYLOAD_LENGTH */
        { U_INT_8,                      offsetof(private_delete_payload_t, protocol_id)         },
        { U_INT_8,                      offsetof(private_delete_payload_t, spi_size)            },
        { U_INT_16,                     offsetof(private_delete_payload_t, spi_count)           },
        /* some delete data bytes, length is defined in PAYLOAD_LENGTH */
-       { SPIS,                         offsetof(private_delete_payload_t, spis)                        }
+       { CHUNK_DATA,           offsetof(private_delete_payload_t, spis)                        },
 };
 
 /*
 };
 
 /*
@@ -102,6 +154,8 @@ encoding_rule_t delete_payload_encodings[] = {
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       ! Next Payload  !C!  RESERVED   !         Payload Length        !
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       ! Next Payload  !C!  RESERVED   !         Payload Length        !
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                          DOI                                  !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       ! Protocol ID   !   SPI Size    !           # of SPIs           !
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       !                                                               !
       ! Protocol ID   !   SPI Size    !           # of SPIs           !
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       !                                                               !
@@ -140,17 +194,32 @@ METHOD(payload_t, verify, status_t,
        return SUCCESS;
 }
 
        return SUCCESS;
 }
 
-METHOD(payload_t, get_encoding_rules, void,
-       private_delete_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
+METHOD(payload_t, get_encoding_rules, int,
+       private_delete_payload_t *this, encoding_rule_t **rules)
 {
 {
-       *rules = delete_payload_encodings;
-       *rule_count = countof(delete_payload_encodings);
+       if (this->type == DELETE)
+       {
+               *rules = encodings_v2;
+               return countof(encodings_v2);
+       }
+       *rules = encodings_v1;
+       return countof(encodings_v1);
+}
+
+METHOD(payload_t, get_header_length, int,
+       private_delete_payload_t *this)
+{
+       if (this->type == DELETE)
+       {
+               return 8;
+       }
+       return 12;
 }
 
 METHOD(payload_t, get_payload_type, payload_type_t,
        private_delete_payload_t *this)
 {
 }
 
 METHOD(payload_t, get_payload_type, payload_type_t,
        private_delete_payload_t *this)
 {
-       return DELETE;
+       return this->type;
 }
 
 METHOD(payload_t, get_next_type, payload_type_t,
 }
 
 METHOD(payload_t, get_next_type, payload_type_t,
@@ -185,6 +254,7 @@ METHOD(delete_payload_t, add_spi, void,
                case PROTO_AH:
                case PROTO_ESP:
                        this->spi_count++;
                case PROTO_AH:
                case PROTO_ESP:
                        this->spi_count++;
+                       this->payload_length += sizeof(spi);
                        this->spis = chunk_cat("mc", this->spis, chunk_from_thing(spi));
                        break;
                default:
                        this->spis = chunk_cat("mc", this->spis, chunk_from_thing(spi));
                        break;
                default:
@@ -243,7 +313,8 @@ METHOD2(payload_t, delete_payload_t, destroy, void,
 /*
  * Described in header
  */
 /*
  * Described in header
  */
-delete_payload_t *delete_payload_create(protocol_id_t protocol_id)
+delete_payload_t *delete_payload_create(payload_type_t type,
+                                                                               protocol_id_t protocol_id)
 {
        private_delete_payload_t *this;
 
 {
        private_delete_payload_t *this;
 
@@ -252,6 +323,7 @@ delete_payload_t *delete_payload_create(protocol_id_t protocol_id)
                        .payload_interface = {
                                .verify = _verify,
                                .get_encoding_rules = _get_encoding_rules,
                        .payload_interface = {
                                .verify = _verify,
                                .get_encoding_rules = _get_encoding_rules,
+                               .get_header_length = _get_header_length,
                                .get_length = _get_length,
                                .get_next_type = _get_next_type,
                                .set_next_type = _set_next_type,
                                .get_length = _get_length,
                                .get_next_type = _get_next_type,
                                .set_next_type = _set_next_type,
@@ -264,9 +336,11 @@ delete_payload_t *delete_payload_create(protocol_id_t protocol_id)
                        .destroy = _destroy,
                },
                .next_payload = NO_PAYLOAD,
                        .destroy = _destroy,
                },
                .next_payload = NO_PAYLOAD,
-               .payload_length = DELETE_PAYLOAD_HEADER_LENGTH,
+               .payload_length = get_header_length(this),
+               .doi = IKEV1_DOI_IPSEC,
                .protocol_id = protocol_id,
                .spi_size = protocol_id == PROTO_AH || protocol_id == PROTO_ESP ? 4 : 0,
                .protocol_id = protocol_id,
                .spi_size = protocol_id == PROTO_AH || protocol_id == PROTO_ESP ? 4 : 0,
+               .type = type,
        );
        return &this->public;
 }
        );
        return &this->public;
 }
strongSwan - IPsec VPN