Added member fields for reserved bits and bytes in all payloads

diff --git a/src/libcharon/encoding/payloads/auth_payload.c b/src/libcharon/encoding/payloads/auth_payload.c
index 9086f2ff429233605f34f767beec68836e034d9b..cb44a997ca168ce476b02894836b3031379d0775 100644 (file)
--- a/src/libcharon/encoding/payloads/auth_payload.c
+++ b/src/libcharon/encoding/payloads/auth_payload.c
@@ -42,6 +42,16 @@ struct private_auth_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved_bit[7];
+
+       /**
+        * Reserved bytes
+        */
+       u_int8_t reserved_byte[3];
+
        /**
         * Length of this payload.
         */
@@ -66,25 +76,25 @@ struct private_auth_payload_t {
  */
 encoding_rule_t auth_payload_encodings[] = {
        /* 1 Byte next payload type, stored in the field next_payload */
-       { U_INT_8,                      offsetof(private_auth_payload_t, next_payload)  },
+       { U_INT_8,                      offsetof(private_auth_payload_t, next_payload)          },
        /* the critical bit */
-       { FLAG,                         offsetof(private_auth_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                                                                                               },
+       { FLAG,                         offsetof(private_auth_payload_t, critical)                      },
+       /* 7 Bit reserved bits */
+       { RESERVED_BIT,         offsetof(private_auth_payload_t, reserved_bit[0])       },
+       { RESERVED_BIT,         offsetof(private_auth_payload_t, reserved_bit[1])       },
+       { RESERVED_BIT,         offsetof(private_auth_payload_t, reserved_bit[2])       },
+       { RESERVED_BIT,         offsetof(private_auth_payload_t, reserved_bit[3])       },
+       { RESERVED_BIT,         offsetof(private_auth_payload_t, reserved_bit[4])       },
+       { RESERVED_BIT,         offsetof(private_auth_payload_t, reserved_bit[5])       },
+       { RESERVED_BIT,         offsetof(private_auth_payload_t, reserved_bit[6])       },
        /* Length of the whole payload*/
-       { PAYLOAD_LENGTH,       offsetof(private_auth_payload_t, payload_length)},
+       { PAYLOAD_LENGTH,       offsetof(private_auth_payload_t, payload_length)        },
        /* 1 Byte AUTH type*/
-       { U_INT_8,                      offsetof(private_auth_payload_t, auth_method)   },
+       { U_INT_8,                      offsetof(private_auth_payload_t, auth_method)           },
        /* 3 reserved bytes */
-       { RESERVED_BYTE,        0                                                                                               },
-       { RESERVED_BYTE,        0                                                                                               },
-       { RESERVED_BYTE,        0                                                                                               },
+       { RESERVED_BYTE,        offsetof(private_auth_payload_t, reserved_byte[0])      },
+       { RESERVED_BYTE,        offsetof(private_auth_payload_t, reserved_byte[1])      },
+       { RESERVED_BYTE,        offsetof(private_auth_payload_t, reserved_byte[2])      },
        /* some auth data bytes, length is defined in PAYLOAD_LENGTH */
        { AUTH_DATA,            offsetof(private_auth_payload_t, auth_data)     }
 };

diff --git a/src/libcharon/encoding/payloads/auth_payload.h b/src/libcharon/encoding/payloads/auth_payload.h
index e2b8298a2c9e5e1f726326456106b29ad0cece9a..e4c4e6ae394aa277ee32fd6524396d0869a48627 100644 (file)
--- a/src/libcharon/encoding/payloads/auth_payload.h
+++ b/src/libcharon/encoding/payloads/auth_payload.h
@@ -73,6 +73,21 @@ struct auth_payload_t {
         */
        chunk_t (*get_data) (auth_payload_t *this);
 
+       /**
+        * Get the value of a reserved bit.
+        *
+        * @param nr                    number of the reserved bit, 0-6
+        * @return                              TRUE if bit was set, FALSE to clear
+        */
+       bool (*get_reserved_bit)(auth_payload_t *this, u_int nr);
+
+       /**
+        * Set one of the reserved bits.
+        *
+        * @param nr                    number of the reserved bit, 0-6
+        */
+       void (*set_reserved_bit)(auth_payload_t *this, u_int nr);
+
        /**
         * Destroys an auth_payload_t object.
         */

diff --git a/src/libcharon/encoding/payloads/cert_payload.c b/src/libcharon/encoding/payloads/cert_payload.c
index 6b96d2e212816e684c135493c909494b9b6754d1..814ec272677e6c270658644bb998d9e6819bbaad 100644 (file)
--- a/src/libcharon/encoding/payloads/cert_payload.c
+++ b/src/libcharon/encoding/payloads/cert_payload.c
@@ -62,6 +62,11 @@ struct private_cert_payload_t {
         */
        bool critical;
 
+       /**
+        * reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -96,13 +101,13 @@ encoding_rule_t cert_payload_encodings[] = {
        /* the critical bit */
        { FLAG,                         offsetof(private_cert_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                                                                                               },
+       { RESERVED_BIT,         offsetof(private_cert_payload_t, reserved[0])   },
+       { RESERVED_BIT,         offsetof(private_cert_payload_t, reserved[1])   },
+       { RESERVED_BIT,         offsetof(private_cert_payload_t, reserved[2])   },
+       { RESERVED_BIT,         offsetof(private_cert_payload_t, reserved[3])   },
+       { RESERVED_BIT,         offsetof(private_cert_payload_t, reserved[4])   },
+       { RESERVED_BIT,         offsetof(private_cert_payload_t, reserved[5])   },
+       { RESERVED_BIT,         offsetof(private_cert_payload_t, reserved[6])   },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_cert_payload_t, payload_length)},
        /* 1 Byte CERT type*/

diff --git a/src/libcharon/encoding/payloads/certreq_payload.c b/src/libcharon/encoding/payloads/certreq_payload.c
index aa135ed5e140b8d1b44e2a968c040ec7d77cb573..8e0836f0edba5224bb85243073fde635a47016bb 100644 (file)
--- a/src/libcharon/encoding/payloads/certreq_payload.c
+++ b/src/libcharon/encoding/payloads/certreq_payload.c
@@ -45,6 +45,11 @@ struct private_certreq_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -72,14 +77,14 @@ encoding_rule_t certreq_payload_encodings[] = {
        { U_INT_8,                      offsetof(private_certreq_payload_t, next_payload)       },
        /* the critical bit */
        { FLAG,                         offsetof(private_certreq_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_certreq_payload_t, reserved[0])        },
+       { RESERVED_BIT,         offsetof(private_certreq_payload_t, reserved[1])        },
+       { RESERVED_BIT,         offsetof(private_certreq_payload_t, reserved[2])        },
+       { RESERVED_BIT,         offsetof(private_certreq_payload_t, reserved[3])        },
+       { RESERVED_BIT,         offsetof(private_certreq_payload_t, reserved[4])        },
+       { RESERVED_BIT,         offsetof(private_certreq_payload_t, reserved[5])        },
+       { RESERVED_BIT,         offsetof(private_certreq_payload_t, reserved[6])        },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_certreq_payload_t, payload_length)     },
        /* 1 Byte CERTREQ type*/

diff --git a/src/libcharon/encoding/payloads/configuration_attribute.c b/src/libcharon/encoding/payloads/configuration_attribute.c
index 4857c450a73ce125e9bed01b7781275d38844cea..e608497bd2c2f25eb401cace15ef10aac64f4560 100644 (file)
--- a/src/libcharon/encoding/payloads/configuration_attribute.c
+++ b/src/libcharon/encoding/payloads/configuration_attribute.c
@@ -35,6 +35,11 @@ struct private_configuration_attribute_t {
         */
        configuration_attribute_t public;
 
+       /**
+        * Reserved bit
+        */
+       bool reserved;
+
        /**
         * Type of the attribute.
         */
@@ -58,8 +63,8 @@ struct private_configuration_attribute_t {
  * private_configuration_attribute_t.
  */
 encoding_rule_t configuration_attribute_encodings[] = {
-
-       { RESERVED_BIT,                                         0                                                                                                       },
+       /* 1 reserved bit */
+       { RESERVED_BIT,                                         offsetof(private_configuration_attribute_t, reserved)},
        /* type of the attribute as 15 bit unsigned integer */
        { ATTRIBUTE_TYPE,                                       offsetof(private_configuration_attribute_t, type)       },
        /* Length of attribute value */

diff --git a/src/libcharon/encoding/payloads/cp_payload.c b/src/libcharon/encoding/payloads/cp_payload.c
index 1c03262fff5bd9ddb4b0838fb84992f18a78d0fc..82e9e51b738e9e96bd42e74eb87f8573f1b0b70f 100644 (file)
--- a/src/libcharon/encoding/payloads/cp_payload.c
+++ b/src/libcharon/encoding/payloads/cp_payload.c
@@ -51,6 +51,16 @@ struct private_cp_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved_bit[7];
+
+       /**
+        * Reserved bytes
+        */
+       u_int8_t reserved_byte[3];
+
        /**
         * Length of this payload.
         */
@@ -78,22 +88,23 @@ encoding_rule_t cp_payload_encodings[] = {
        { U_INT_8,                                      offsetof(private_cp_payload_t, next_payload)    },
        /* the critical bit */
        { FLAG,                                         offsetof(private_cp_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_cp_payload_t, reserved_bit[0]) },
+       { RESERVED_BIT,                         offsetof(private_cp_payload_t, reserved_bit[1]) },
+       { RESERVED_BIT,                         offsetof(private_cp_payload_t, reserved_bit[2]) },
+       { RESERVED_BIT,                         offsetof(private_cp_payload_t, reserved_bit[3]) },
+       { RESERVED_BIT,                         offsetof(private_cp_payload_t, reserved_bit[4]) },
+       { RESERVED_BIT,                         offsetof(private_cp_payload_t, reserved_bit[5]) },
+       { RESERVED_BIT,                         offsetof(private_cp_payload_t, reserved_bit[6]) },
        /* Length of the whole CP payload*/
        { PAYLOAD_LENGTH,                       offsetof(private_cp_payload_t, payload_length)  },
        /* Proposals are stored in a proposal substructure,
           offset points to a linked_list_t pointer */
        { U_INT_8,                                      offsetof(private_cp_payload_t, type)                    },
-       { RESERVED_BYTE,0                                                                                                                       },
-       { RESERVED_BYTE,0                                                                                                                       },
-       { RESERVED_BYTE,0                                                                                                                       },
+       /* 3 reserved bytes */
+       { RESERVED_BYTE,                        offsetof(private_cp_payload_t, reserved_byte[0])},
+       { RESERVED_BYTE,                        offsetof(private_cp_payload_t, reserved_byte[1])},
+       { RESERVED_BYTE,                        offsetof(private_cp_payload_t, reserved_byte[2])},
        { CONFIGURATION_ATTRIBUTES,     offsetof(private_cp_payload_t, attributes)              }
 };
 

diff --git a/src/libcharon/encoding/payloads/delete_payload.c b/src/libcharon/encoding/payloads/delete_payload.c
index 5fc3b7c88bebae04cbc3edc9e212c57f970e49c9..e6ee07d395be3b321f28a160b3f652cdfca1dee7 100644 (file)
--- a/src/libcharon/encoding/payloads/delete_payload.c
+++ b/src/libcharon/encoding/payloads/delete_payload.c
@@ -42,6 +42,11 @@ struct private_delete_payload_t {
         */
        bool critical;
 
+       /**
+        * reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -79,14 +84,14 @@ encoding_rule_t delete_payload_encodings[] = {
        { 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)         },

diff --git a/src/libcharon/encoding/payloads/eap_payload.c b/src/libcharon/encoding/payloads/eap_payload.c
index 21f34a6420e103ecc9e34c8b1ff5f2ef861b4cb0..eafb668b684826e8b5ab3bb02b4ffde4c87ec9cd 100644 (file)
--- a/src/libcharon/encoding/payloads/eap_payload.c
+++ b/src/libcharon/encoding/payloads/eap_payload.c
@@ -42,6 +42,11 @@ struct private_eap_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -66,13 +71,13 @@ static encoding_rule_t eap_payload_encodings[] = {
        /* the critical bit */
        { FLAG,                         offsetof(private_eap_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                                                                                                       },
+       { RESERVED_BIT,         offsetof(private_eap_payload_t, reserved[0])    },
+       { RESERVED_BIT,         offsetof(private_eap_payload_t, reserved[1])    },
+       { RESERVED_BIT,         offsetof(private_eap_payload_t, reserved[2])    },
+       { RESERVED_BIT,         offsetof(private_eap_payload_t, reserved[3])    },
+       { RESERVED_BIT,         offsetof(private_eap_payload_t, reserved[4])    },
+       { RESERVED_BIT,         offsetof(private_eap_payload_t, reserved[5])    },
+       { RESERVED_BIT,         offsetof(private_eap_payload_t, reserved[6])    },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_eap_payload_t, payload_length) },
        /* chunt to data, starting at "code" */

diff --git a/src/libcharon/encoding/payloads/id_payload.c b/src/libcharon/encoding/payloads/id_payload.c
index e4ca88eb192169fb4452c6af870970c73ac255de..3befadfe28c4dcfd64152890b2e49f40c4e2c040 100644 (file)
--- a/src/libcharon/encoding/payloads/id_payload.c
+++ b/src/libcharon/encoding/payloads/id_payload.c
@@ -51,6 +51,16 @@ struct private_id_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved_bit[7];
+
+       /**
+        * Reserved bytes
+        */
+       u_int8_t reserved_byte[3];
+
        /**
         * Length of this payload.
         */
@@ -78,22 +88,22 @@ encoding_rule_t id_payload_encodings[] = {
        { U_INT_8,                      offsetof(private_id_payload_t, next_payload)    },
        /* the critical bit */
        { FLAG,                         offsetof(private_id_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_id_payload_t, reserved_bit[0]) },
+       { RESERVED_BIT,         offsetof(private_id_payload_t, reserved_bit[1]) },
+       { RESERVED_BIT,         offsetof(private_id_payload_t, reserved_bit[2]) },
+       { RESERVED_BIT,         offsetof(private_id_payload_t, reserved_bit[3]) },
+       { RESERVED_BIT,         offsetof(private_id_payload_t, reserved_bit[4]) },
+       { RESERVED_BIT,         offsetof(private_id_payload_t, reserved_bit[5]) },
+       { RESERVED_BIT,         offsetof(private_id_payload_t, reserved_bit[6]) },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_id_payload_t, payload_length)  },
        /* 1 Byte ID type*/
        { U_INT_8,                      offsetof(private_id_payload_t, id_type)                 },
        /* 3 reserved bytes */
-       { RESERVED_BYTE,        0                                                                                               },
-       { RESERVED_BYTE,        0                                                                                               },
-       { RESERVED_BYTE,        0                                                                                               },
+       { RESERVED_BYTE,        offsetof(private_id_payload_t, reserved_byte[0])},
+       { RESERVED_BYTE,        offsetof(private_id_payload_t, reserved_byte[1])},
+       { RESERVED_BYTE,        offsetof(private_id_payload_t, reserved_byte[2])},
        /* some id data bytes, length is defined in PAYLOAD_LENGTH */
        { ID_DATA,                      offsetof(private_id_payload_t, id_data)                 }
 };

diff --git a/src/libcharon/encoding/payloads/ike_header.c b/src/libcharon/encoding/payloads/ike_header.c
index 9c1bbbedb332f1b413cd3fb330bcff2ab4082d35..d061bd25adee7840ffa4aa139f0a49835d6a25ce 100644 (file)
--- a/src/libcharon/encoding/payloads/ike_header.c
+++ b/src/libcharon/encoding/payloads/ike_header.c
@@ -83,6 +83,11 @@ struct private_ike_header_t {
                bool response;
        } flags;
 
+       /**
+        * Reserved bits of IKE header
+        */
+       bool reserved[5];
+
        /**
         * Associated Message-ID.
         */
@@ -128,17 +133,17 @@ encoding_rule_t ike_header_encodings[] = {
        { U_INT_4,              offsetof(private_ike_header_t, min_version)             },
        /* 8 Bit for the exchange type */
        { U_INT_8,              offsetof(private_ike_header_t, exchange_type)   },
-       /* 2 Bit reserved bits, nowhere stored */
-       { RESERVED_BIT, 0                                                                                               },
-       { RESERVED_BIT, 0                                                                                               },
+       /* 2 Bit reserved bits */
+       { RESERVED_BIT, offsetof(private_ike_header_t, reserved[0])             },
+       { RESERVED_BIT, offsetof(private_ike_header_t, reserved[1])             },
        /* 3 Bit flags, stored in the fields response, version and initiator */
        { FLAG,                 offsetof(private_ike_header_t, flags.response)  },
        { FLAG,                 offsetof(private_ike_header_t, flags.version)   },
        { FLAG,                 offsetof(private_ike_header_t, flags.initiator) },
-       /* 3 Bit reserved bits, nowhere stored */
-       { RESERVED_BIT, 0                                                                                               },
-       { RESERVED_BIT, 0                                                                                               },
-       { RESERVED_BIT, 0                                                                                               },
+       /* 3 Bit reserved bits */
+       { RESERVED_BIT, offsetof(private_ike_header_t, reserved[2])             },
+       { RESERVED_BIT, offsetof(private_ike_header_t, reserved[3])             },
+       { RESERVED_BIT, offsetof(private_ike_header_t, reserved[4])             },
        /* 4 Byte message id, stored in the field message_id */
        { U_INT_32,             offsetof(private_ike_header_t, message_id)              },
        /* 4 Byte length fied, stored in the field length */

diff --git a/src/libcharon/encoding/payloads/ke_payload.c b/src/libcharon/encoding/payloads/ke_payload.c
index ddea0b387afd24aabdbfebe73199b84d5a3bf03c..999d73192b17a14c3ab2b9c8fd1f4d0da0627450 100644 (file)
--- a/src/libcharon/encoding/payloads/ke_payload.c
+++ b/src/libcharon/encoding/payloads/ke_payload.c
@@ -43,6 +43,16 @@ struct private_ke_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved_bit[7];
+
+       /**
+        * Reserved bytes
+        */
+       u_int8_t reserved_byte[2];
+
        /**
         * Length of this payload.
         */
@@ -70,20 +80,21 @@ encoding_rule_t ke_payload_encodings[] = {
        { U_INT_8,                              offsetof(private_ke_payload_t, next_payload)    },
        /* the critical bit */
        { FLAG,                                 offsetof(private_ke_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_ke_payload_t, reserved_bit[0]) },
+       { RESERVED_BIT,                 offsetof(private_ke_payload_t, reserved_bit[1]) },
+       { RESERVED_BIT,                 offsetof(private_ke_payload_t, reserved_bit[2]) },
+       { RESERVED_BIT,                 offsetof(private_ke_payload_t, reserved_bit[3]) },
+       { RESERVED_BIT,                 offsetof(private_ke_payload_t, reserved_bit[4]) },
+       { RESERVED_BIT,                 offsetof(private_ke_payload_t, reserved_bit[5]) },
+       { RESERVED_BIT,                 offsetof(private_ke_payload_t, reserved_bit[6]) },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,               offsetof(private_ke_payload_t, payload_length)  },
        /* DH Group number as 16 bit field*/
        { U_INT_16,                             offsetof(private_ke_payload_t, dh_group_number) },
-       { RESERVED_BYTE,                0                                                                                               },
-       { RESERVED_BYTE,                0                                                                                               },
+       /* 2 reserved bytes */
+       { RESERVED_BYTE,                offsetof(private_ke_payload_t, reserved_byte[0])},
+       { RESERVED_BYTE,                offsetof(private_ke_payload_t, reserved_byte[1])},
        /* Key Exchange Data is from variable size */
        { KEY_EXCHANGE_DATA,    offsetof(private_ke_payload_t, key_exchange_data)}
 };

diff --git a/src/libcharon/encoding/payloads/nonce_payload.c b/src/libcharon/encoding/payloads/nonce_payload.c
index 0d582fa85ec3df2cb2c985afc4cb32092b028043..78000b8c6555d1602fe5240232b23af077fe26bc 100644 (file)
--- a/src/libcharon/encoding/payloads/nonce_payload.c
+++ b/src/libcharon/encoding/payloads/nonce_payload.c
@@ -43,6 +43,11 @@ struct private_nonce_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -65,14 +70,14 @@ encoding_rule_t nonce_payload_encodings[] = {
        { U_INT_8,                      offsetof(private_nonce_payload_t, next_payload)         },
        /* the critical bit */
        { FLAG,                         offsetof(private_nonce_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_nonce_payload_t, reserved[0])          },
+       { RESERVED_BIT,         offsetof(private_nonce_payload_t, reserved[1])          },
+       { RESERVED_BIT,         offsetof(private_nonce_payload_t, reserved[2])          },
+       { RESERVED_BIT,         offsetof(private_nonce_payload_t, reserved[3])          },
+       { RESERVED_BIT,         offsetof(private_nonce_payload_t, reserved[4])          },
+       { RESERVED_BIT,         offsetof(private_nonce_payload_t, reserved[5])          },
+       { RESERVED_BIT,         offsetof(private_nonce_payload_t, reserved[6])          },
        /* Length of the whole nonce payload*/
        { PAYLOAD_LENGTH,       offsetof(private_nonce_payload_t, payload_length)       },
        /* some nonce bytes, lenth is defined in PAYLOAD_LENGTH */

diff --git a/src/libcharon/encoding/payloads/notify_payload.c b/src/libcharon/encoding/payloads/notify_payload.c
index d1c2ac5af89a67d69f767866eb8366e471f95e28..77f15ec6d13ef131e25926c57371c03cf3611802 100644 (file)
--- a/src/libcharon/encoding/payloads/notify_payload.c
+++ b/src/libcharon/encoding/payloads/notify_payload.c
@@ -205,6 +205,11 @@ struct private_notify_payload_t {
         */
        bool critical;
 
+       /**
+        * reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -248,13 +253,13 @@ encoding_rule_t notify_payload_encodings[] = {
        /* the critical bit */
        { FLAG,                         offsetof(private_notify_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                                                                                                               },
+       { RESERVED_BIT,         offsetof(private_notify_payload_t, reserved[0])                 },
+       { RESERVED_BIT,         offsetof(private_notify_payload_t, reserved[1])                 },
+       { RESERVED_BIT,         offsetof(private_notify_payload_t, reserved[2])                 },
+       { RESERVED_BIT,         offsetof(private_notify_payload_t, reserved[3])                 },
+       { RESERVED_BIT,         offsetof(private_notify_payload_t, reserved[4])                 },
+       { RESERVED_BIT,         offsetof(private_notify_payload_t, reserved[5])                 },
+       { RESERVED_BIT,         offsetof(private_notify_payload_t, reserved[6])                 },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_notify_payload_t, payload_length)              },
        /* Protocol ID as 8 bit field*/

diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
index 0fcfee7a56232178397521104e4ce4f3f8427f71..7d73bec79ced40ce3c5304718a98ec1a231690b3 100644 (file)
--- a/src/libcharon/encoding/payloads/proposal_substructure.c
+++ b/src/libcharon/encoding/payloads/proposal_substructure.c
@@ -46,6 +46,11 @@ struct private_proposal_substructure_t {
         */
        u_int8_t  next_payload;
 
+       /**
+        * reserved byte
+        */
+       u_int8_t reserved;
+
        /**
         * Length of this payload.
         */
@@ -91,8 +96,8 @@ struct private_proposal_substructure_t {
 encoding_rule_t proposal_substructure_encodings[] = {
        /* 1 Byte next payload type, stored in the field next_payload */
        { U_INT_8,                      offsetof(private_proposal_substructure_t, next_payload)         },
-       /* Reserved Byte is skipped */
-       { RESERVED_BYTE,        0                                                                                                                       },
+       /* 1 Reserved Byte */
+       { RESERVED_BYTE,        offsetof(private_proposal_substructure_t, reserved)                     },
        /* Length of the whole proposal substructure payload*/
        { PAYLOAD_LENGTH,       offsetof(private_proposal_substructure_t, proposal_length)      },
        /* proposal number is a number of 8 bit */

diff --git a/src/libcharon/encoding/payloads/sa_payload.c b/src/libcharon/encoding/payloads/sa_payload.c
index 08ecba8565c5b969dda7202861a265871a42f0bd..8667e7a9eaed9b12207494011e7489a9221fc75f 100644 (file)
--- a/src/libcharon/encoding/payloads/sa_payload.c
+++ b/src/libcharon/encoding/payloads/sa_payload.c
@@ -45,6 +45,11 @@ struct private_sa_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -68,13 +73,13 @@ encoding_rule_t sa_payload_encodings[] = {
        /* the critical bit */
        { FLAG,                         offsetof(private_sa_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                                                                                                       },
+       { RESERVED_BIT,         offsetof(private_sa_payload_t, reserved[0])                     },
+       { RESERVED_BIT,         offsetof(private_sa_payload_t, reserved[1])                     },
+       { RESERVED_BIT,         offsetof(private_sa_payload_t, reserved[2])                     },
+       { RESERVED_BIT,         offsetof(private_sa_payload_t, reserved[3])                     },
+       { RESERVED_BIT,         offsetof(private_sa_payload_t, reserved[4])                     },
+       { RESERVED_BIT,         offsetof(private_sa_payload_t, reserved[5])                     },
+       { RESERVED_BIT,         offsetof(private_sa_payload_t, reserved[6])                     },
        /* Length of the whole SA payload*/
        { PAYLOAD_LENGTH,       offsetof(private_sa_payload_t, payload_length)          },
        /* Proposals are stored in a proposal substructure,

diff --git a/src/libcharon/encoding/payloads/transform_substructure.c b/src/libcharon/encoding/payloads/transform_substructure.c
index 63e31e587ad5cb86e471775aa8397b1e36c8231a..0428da726d756ce96fe07d71512cc18d6c62224f 100644 (file)
--- a/src/libcharon/encoding/payloads/transform_substructure.c
+++ b/src/libcharon/encoding/payloads/transform_substructure.c
@@ -41,6 +41,10 @@ struct private_transform_substructure_t {
         * Next payload type.
         */
        u_int8_t  next_payload;
+       /**
+        * Reserved bytes
+        */
+       u_int8_t reserved[2];
 
        /**
         * Length of this payload.
@@ -72,14 +76,14 @@ struct private_transform_substructure_t {
 encoding_rule_t transform_substructure_encodings[] = {
        /* 1 Byte next payload type, stored in the field next_payload */
        { U_INT_8,                              offsetof(private_transform_substructure_t, next_payload)        },
-       /* Reserved Byte is skipped */
-       { RESERVED_BYTE,                0                                                                                                                       },
+       /* 1 Reserved Byte */
+       { RESERVED_BYTE,                offsetof(private_transform_substructure_t, reserved[0])         },
        /* Length of the whole transform substructure*/
        { PAYLOAD_LENGTH,               offsetof(private_transform_substructure_t, transform_length)},
        /* transform type is a number of 8 bit */
        { U_INT_8,                              offsetof(private_transform_substructure_t, transform_type)      },
-       /* Reserved Byte is skipped */
-       { RESERVED_BYTE,                0                                                                                                                       },
+       /* 1 Reserved Byte */
+       { RESERVED_BYTE,                offsetof(private_transform_substructure_t, reserved[1])         },
        /* tranform ID is a number of 8 bit */
        { U_INT_16,                             offsetof(private_transform_substructure_t, transform_id)        },
        /* Attributes are stored in a transform attribute,

diff --git a/src/libcharon/encoding/payloads/ts_payload.c b/src/libcharon/encoding/payloads/ts_payload.c
index d693b111adc28085624e9fd912b8a0ffe27309a8..28f760e40243db6fa87fe0dee6769889aab5b14b 100644 (file)
--- a/src/libcharon/encoding/payloads/ts_payload.c
+++ b/src/libcharon/encoding/payloads/ts_payload.c
@@ -49,6 +49,16 @@ struct private_ts_payload_t {
         */
        bool critical;
 
+       /**
+        * reserved bits
+        */
+       bool reserved_bit[7];
+
+       /**
+        * reserved bytes
+        */
+       bool reserved_byte[3];
+
        /**
         * Length of this payload.
         */
@@ -76,24 +86,24 @@ encoding_rule_t ts_payload_encodings[] = {
        { U_INT_8,                      offsetof(private_ts_payload_t, next_payload)    },
        /* the critical bit */
        { FLAG,                         offsetof(private_ts_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_ts_payload_t, reserved_bit[0]) },
+       { RESERVED_BIT,         offsetof(private_ts_payload_t, reserved_bit[1]) },
+       { RESERVED_BIT,         offsetof(private_ts_payload_t, reserved_bit[2]) },
+       { RESERVED_BIT,         offsetof(private_ts_payload_t, reserved_bit[3]) },
+       { RESERVED_BIT,         offsetof(private_ts_payload_t, reserved_bit[4]) },
+       { RESERVED_BIT,         offsetof(private_ts_payload_t, reserved_bit[5]) },
+       { RESERVED_BIT,         offsetof(private_ts_payload_t, reserved_bit[6]) },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_ts_payload_t, payload_length)  },
        /* 1 Byte TS type*/
        { U_INT_8,                      offsetof(private_ts_payload_t, ts_num)                  },
        /* 3 reserved bytes */
-       { RESERVED_BYTE,        0                                                                                               },
-       { RESERVED_BYTE,        0                                                                                               },
-       { RESERVED_BYTE,        0                                                                                               },
+       { RESERVED_BYTE,        offsetof(private_ts_payload_t, reserved_byte[0])},
+       { RESERVED_BYTE,        offsetof(private_ts_payload_t, reserved_byte[1])},
+       { RESERVED_BYTE,        offsetof(private_ts_payload_t, reserved_byte[2])},
        /* some ts data bytes, length is defined in PAYLOAD_LENGTH */
-       { TRAFFIC_SELECTORS,    offsetof(private_ts_payload_t, substrs)         }
+       { TRAFFIC_SELECTORS,offsetof(private_ts_payload_t, substrs)                     }
 };
 
 /*

diff --git a/src/libcharon/encoding/payloads/unknown_payload.c b/src/libcharon/encoding/payloads/unknown_payload.c
index f2c7808857499d51592befeceab7cfee1d40f7bd..27af338b31a4f56fd176e594190479f0a2b67a22 100644 (file)
--- a/src/libcharon/encoding/payloads/unknown_payload.c
+++ b/src/libcharon/encoding/payloads/unknown_payload.c
@@ -45,6 +45,11 @@ struct private_unknown_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -68,14 +73,14 @@ encoding_rule_t unknown_payload_encodings[] = {
        { U_INT_8,                      offsetof(private_unknown_payload_t, next_payload)       },
        /* the critical bit */
        { FLAG,                         offsetof(private_unknown_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_unknown_payload_t, reserved[0])        },
+       { RESERVED_BIT,         offsetof(private_unknown_payload_t, reserved[1])        },
+       { RESERVED_BIT,         offsetof(private_unknown_payload_t, reserved[2])        },
+       { RESERVED_BIT,         offsetof(private_unknown_payload_t, reserved[3])        },
+       { RESERVED_BIT,         offsetof(private_unknown_payload_t, reserved[4])        },
+       { RESERVED_BIT,         offsetof(private_unknown_payload_t, reserved[5])        },
+       { RESERVED_BIT,         offsetof(private_unknown_payload_t, reserved[6])        },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_unknown_payload_t, payload_length)     },
        /* some unknown data bytes, length is defined in PAYLOAD_LENGTH */

diff --git a/src/libcharon/encoding/payloads/vendor_id_payload.c b/src/libcharon/encoding/payloads/vendor_id_payload.c
index ca50943ba86773d0bc682334186748f8b0371302..e9e80e9890b841674252a52e95efa7d9ccd03f7b 100644 (file)
--- a/src/libcharon/encoding/payloads/vendor_id_payload.c
+++ b/src/libcharon/encoding/payloads/vendor_id_payload.c
@@ -41,6 +41,11 @@ struct private_vendor_id_payload_t {
         */
        bool critical;
 
+       /**
+        * Reserved bits
+        */
+       bool reserved[7];
+
        /**
         * Length of this payload.
         */
@@ -64,13 +69,13 @@ encoding_rule_t vendor_id_payload_encodings[] = {
        /* the critical bit */
        { FLAG,                         offsetof(private_vendor_id_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                                                                                                       },
+       { RESERVED_BIT,         offsetof(private_vendor_id_payload_t, reserved[0])      },
+       { RESERVED_BIT,         offsetof(private_vendor_id_payload_t, reserved[1])      },
+       { RESERVED_BIT,         offsetof(private_vendor_id_payload_t, reserved[2])      },
+       { RESERVED_BIT,         offsetof(private_vendor_id_payload_t, reserved[3])      },
+       { RESERVED_BIT,         offsetof(private_vendor_id_payload_t, reserved[4])      },
+       { RESERVED_BIT,         offsetof(private_vendor_id_payload_t, reserved[5])      },
+       { RESERVED_BIT,         offsetof(private_vendor_id_payload_t, reserved[6])      },
        /* Length of the whole payload*/
        { PAYLOAD_LENGTH,       offsetof(private_vendor_id_payload_t, payload_length)},
        /* some vendor_id data bytes, length is defined in PAYLOAD_LENGTH */