diff options
| author | Clavister OpenSource <opensource@clavister.com> | 2011-11-24 11:30:19 +0100 |
|---|---|---|
| committer | Clavister OpenSource <opensource@clavister.com> | 2012-03-20 17:30:51 +0100 |
| commit | 0b6811b4a7a26176b8fc102ef6ee398edaa289cb (patch) | |
| tree | 78957f142b9024171ba2c94511f4d76a9762e0f0 | |
| parent | 01685247b0ea9666793c80b28879d6866a333be1 (diff) | |
| download | strongswan-0b6811b4a7a26176b8fc102ef6ee398edaa289cb.tar.bz2 strongswan-0b6811b4a7a26176b8fc102ef6ee398edaa289cb.tar.xz | |
IKEv1 ConfigMode: Fixed cp_payload to use CONFIGURATION_ATTRIBUTE_V1 in all appropriate places, so the parsing is done correctly.
| -rw-r--r-- | src/libcharon/encoding/generator.c | 1 | ||||
| -rw-r--r-- | src/libcharon/encoding/parser.c | 1 | ||||
| -rw-r--r-- | src/libcharon/encoding/payloads/cp_payload.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/libcharon/encoding/generator.c b/src/libcharon/encoding/generator.c index 077648224..43b157cc1 100644 --- a/src/libcharon/encoding/generator.c +++ b/src/libcharon/encoding/generator.c @@ -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; diff --git a/src/libcharon/encoding/parser.c b/src/libcharon/encoding/parser.c index 3f4bb15a9..14e2cc7a0 100644 --- a/src/libcharon/encoding/parser.c +++ b/src/libcharon/encoding/parser.c @@ -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 || diff --git a/src/libcharon/encoding/payloads/cp_payload.c b/src/libcharon/encoding/payloads/cp_payload.c index 9ecb15006..c8cffa3f7 100644 --- a/src/libcharon/encoding/payloads/cp_payload.c +++ b/src/libcharon/encoding/payloads/cp_payload.c @@ -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) }, }; |