IKEv1 ConfigMode: Fixed cp_payload to use CONFIGURATION_ATTRIBUTE_V1 in all appropria...
authorClavister OpenSource <opensource@clavister.com>
Thu, 24 Nov 2011 10:30:19 +0000 (11:30 +0100)
committerClavister OpenSource <opensource@clavister.com>
Tue, 20 Mar 2012 16:30:51 +0000 (17:30 +0100)
src/libcharon/encoding/generator.c
src/libcharon/encoding/parser.c
src/libcharon/encoding/payloads/cp_payload.c

index 0776482..43b157c 100644 (file)
@@ -459,6 +459,7 @@ METHOD(generator_t, generate_payload, void,
                        case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE:
                        case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1:
                        case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE:
+                       case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1:
                        case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE:
                        {
                                linked_list_t *proposals;
index 3f4bb15..14e2cc7 100644 (file)
@@ -493,6 +493,7 @@ METHOD(parser_t, parse_payload, status_t,
                        case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE:
                        case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1:
                        case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE:
+                       case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1:
                        case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE:
                        {
                                if (payload_length < header_length ||
index 9ecb150..c8cffa3 100644 (file)
@@ -152,7 +152,7 @@ static encoding_rule_t encodings_v1[] = {
        { RESERVED_BYTE,        offsetof(private_cp_payload_t, reserved_byte[0])},
        { U_INT_16,                     offsetof(private_cp_payload_t, identifier)},
        /* list of configuration attributes in a list */
-       { PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE,
+       { PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1,
                                                offsetof(private_cp_payload_t, attributes)              },
 };