diff options
| author | Martin Willi <martin@revosec.ch> | 2011-11-23 11:26:04 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:30:49 +0100 |
| commit | 017d98bf39e3824829cf17be1723b460a2ddeb4e (patch) | |
| tree | ec0187ea36553eb0f11942de6e179a53fd5753e7 /src/libcharon/encoding/payloads/payload.h | |
| parent | df99e976be113cb55d7d38061e546bc8f0377c95 (diff) | |
| download | strongswan-017d98bf39e3824829cf17be1723b460a2ddeb4e.tar.bz2 strongswan-017d98bf39e3824829cf17be1723b460a2ddeb4e.tar.xz | |
Merged IKEv1 attribute payload/data into configuration payload/attribute
Diffstat (limited to 'src/libcharon/encoding/payloads/payload.h')
| -rw-r--r-- | src/libcharon/encoding/payloads/payload.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/libcharon/encoding/payloads/payload.h b/src/libcharon/encoding/payloads/payload.h index f55099fe7..6209b0822 100644 --- a/src/libcharon/encoding/payloads/payload.h +++ b/src/libcharon/encoding/payloads/payload.h @@ -113,9 +113,9 @@ enum payload_type_t { VENDOR_ID_V1 = 13, /** - * Attribute payload (ISAKMP Cfg Mode "draft-ietf-ipsec-isakmp-mode-cfg-05") + * Attribute payload (ISAKMP Mode Config, aka configuration payload. */ - ATTRIBUTE_V1 = 14, + CONFIGURATION_V1 = 14, /** * The security association (SA) payload containing proposals. @@ -249,20 +249,19 @@ enum payload_type_t { TRAFFIC_SELECTOR_SUBSTRUCTURE, /** - * CONFIGURATION_ATTRIBUTE, attribute in a configuration payload. + * CONFIGURATION_ATTRIBUTE, IKEv2 attribute in a configuration payload. */ CONFIGURATION_ATTRIBUTE, /** - * This is not really a payload, but rather the complete IKEv1 message. + * CONFIGURATION_ATTRIBUTE_V1, IKEv1 attribute in a configuration payload. */ - ENCRYPTED_V1, + CONFIGURATION_ATTRIBUTE_V1, /** - * DATA_ATTRIBUTE, attribute in an ATTRIBUTE payload. + * This is not really a payload, but rather the complete IKEv1 message. */ - DATA_ATTRIBUTE_V1, - + ENCRYPTED_V1, }; /** |