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/proposal_substructure.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/proposal_substructure.c')
| -rw-r--r-- | src/libcharon/encoding/payloads/proposal_substructure.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c index 3b663da86..16d5794ae 100644 --- a/src/libcharon/encoding/payloads/proposal_substructure.c +++ b/src/libcharon/encoding/payloads/proposal_substructure.c @@ -308,6 +308,12 @@ METHOD(payload_t, get_encoding_rules, int, return countof(encodings_v1); } +METHOD(payload_t, get_header_length, int, + private_proposal_substructure_t *this) +{ + return 8 + this->spi_size; +} + METHOD(payload_t, get_type, payload_type_t, private_proposal_substructure_t *this) { @@ -334,7 +340,7 @@ static void compute_length(private_proposal_substructure_t *this) payload_t *transform; this->transforms_count = 0; - this->proposal_length = PROPOSAL_SUBSTRUCTURE_HEADER_LENGTH + this->spi.len; + this->proposal_length = get_header_length(this); enumerator = this->transforms->create_enumerator(this->transforms); while (enumerator->enumerate(enumerator, &transform)) { @@ -692,6 +698,7 @@ proposal_substructure_t *proposal_substructure_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, @@ -710,10 +717,10 @@ proposal_substructure_t *proposal_substructure_create(payload_type_t type) .destroy = _destroy, }, .next_payload = NO_PAYLOAD, - .proposal_length = PROPOSAL_SUBSTRUCTURE_HEADER_LENGTH, .transforms = linked_list_create(), .type = type, ); + compute_length(this); return &this->public; } |