diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-11-23 12:35:10 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-03-20 17:30:50 +0100 |
| commit | f3cc8589b1e025f3f077d8ca96db4eb31cc20597 (patch) | |
| tree | f0b1584e7aa9bead1cfe05bf3385324ee09ff3d7 /src/libcharon/encoding | |
| parent | d6cec44b2400589a746649862326f72490288544 (diff) | |
| download | strongswan-f3cc8589b1e025f3f077d8ca96db4eb31cc20597.tar.bz2 strongswan-f3cc8589b1e025f3f077d8ca96db4eb31cc20597.tar.xz | |
Fixed header length calculation of DELETE payload.
Diffstat (limited to 'src/libcharon/encoding')
| -rw-r--r-- | src/libcharon/encoding/payloads/delete_payload.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcharon/encoding/payloads/delete_payload.c b/src/libcharon/encoding/payloads/delete_payload.c index f5bdb3809..5609ea766 100644 --- a/src/libcharon/encoding/payloads/delete_payload.c +++ b/src/libcharon/encoding/payloads/delete_payload.c @@ -88,9 +88,9 @@ struct private_delete_payload_t { */ static encoding_rule_t encodings_v2[] = { /* 1 Byte next payload type, stored in the field next_payload */ - { U_INT_8, offsetof(private_delete_payload_t, next_payload) }, + { U_INT_8, offsetof(private_delete_payload_t, next_payload) }, /* the critical bit */ - { FLAG, offsetof(private_delete_payload_t, critical) }, + { FLAG, offsetof(private_delete_payload_t, critical) }, /* 7 Bit reserved bits */ { RESERVED_BIT, offsetof(private_delete_payload_t, reserved[0]) }, { RESERVED_BIT, offsetof(private_delete_payload_t, reserved[1]) }, @@ -105,7 +105,7 @@ static encoding_rule_t encodings_v2[] = { { U_INT_8, offsetof(private_delete_payload_t, spi_size) }, { U_INT_16, offsetof(private_delete_payload_t, spi_count) }, /* some delete data bytes, length is defined in PAYLOAD_LENGTH */ - { CHUNK_DATA, offsetof(private_delete_payload_t, spis) }, + { CHUNK_DATA, offsetof(private_delete_payload_t, spis) }, }; /* @@ -145,7 +145,7 @@ static encoding_rule_t encodings_v1[] = { { U_INT_8, offsetof(private_delete_payload_t, spi_size) }, { U_INT_16, offsetof(private_delete_payload_t, spi_count) }, /* some delete data bytes, length is defined in PAYLOAD_LENGTH */ - { CHUNK_DATA, offsetof(private_delete_payload_t, spis) }, + { CHUNK_DATA, offsetof(private_delete_payload_t, spis) }, }; /* @@ -211,9 +211,9 @@ METHOD(payload_t, get_header_length, int, { if (this->type == DELETE) { - return 8 + this->spi_size; + return 8; } - return 12 + this->spi_size; + return 12; } METHOD(payload_t, get_payload_type, payload_type_t, |