diff options
| author | Martin Willi <martin@revosec.ch> | 2011-11-17 11:27:46 +0000 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:30:42 +0100 |
| commit | 38fb67fbf18489f40845b072e4ed50b1f6cf0c9c (patch) | |
| tree | 01e3e43880ec5cf7712607bfd37a6811cbb4cbce /src/libcharon/encoding/payloads/ke_payload.c | |
| parent | e9b55b832546d05f464bdddbe779ed21cd17b624 (diff) | |
| download | strongswan-38fb67fbf18489f40845b072e4ed50b1f6cf0c9c.tar.bz2 strongswan-38fb67fbf18489f40845b072e4ed50b1f6cf0c9c.tar.xz | |
Add a payload.get_header_length() method, remove header length definitions
Diffstat (limited to 'src/libcharon/encoding/payloads/ke_payload.c')
| -rw-r--r-- | src/libcharon/encoding/payloads/ke_payload.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/libcharon/encoding/payloads/ke_payload.c b/src/libcharon/encoding/payloads/ke_payload.c index 183e722a2..a6e5217aa 100644 --- a/src/libcharon/encoding/payloads/ke_payload.c +++ b/src/libcharon/encoding/payloads/ke_payload.c @@ -157,6 +157,16 @@ METHOD(payload_t, get_encoding_rules, int, return countof(encodings_v1); } +METHOD(payload_t, get_header_length, int, + private_ke_payload_t *this) +{ + if (this->type == KEY_EXCHANGE) + { + return 8; + } + return 4; +} + METHOD(payload_t, get_type, payload_type_t, private_ke_payload_t *this) { @@ -212,6 +222,7 @@ ke_payload_t *ke_payload_create(payload_type_t type) .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, @@ -223,14 +234,10 @@ ke_payload_t *ke_payload_create(payload_type_t type) .destroy = _destroy, }, .next_payload = NO_PAYLOAD, - .payload_length = KE_PAYLOAD_HEADER_LENGTH, .dh_group_number = MODP_NONE, .type = type, ); - if (type == KEY_EXCHANGE_V1) - { - this->payload_length = KE_PAYLOAD_V1_HEADER_LENGTH; - } + this->payload_length = get_header_length(this); return &this->public; } |