denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed length calculation of delete payload

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:30:44 +01:00
parent 4ea258538e
commit cbb6d765bc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/delete_payload.c
+5 -3
View File
@@ -211,9 +211,9 @@ METHOD(payload_t, get_header_length, int,
{ {
if (this->type == DELETE) if (this->type == DELETE)
{ {
return 8; return 8 + this->spi_size;
} }
return 12; return 12 + this->spi_size;
} }
METHOD(payload_t, get_payload_type, payload_type_t, METHOD(payload_t, get_payload_type, payload_type_t,
@@ -255,6 +255,7 @@ METHOD(delete_payload_t, add_spi, void,
case PROTO_ESP: case PROTO_ESP:
this->spi_count++; this->spi_count++;
this->payload_length += sizeof(spi); this->payload_length += sizeof(spi);
this->spi_size += sizeof(spi);
this->spis = chunk_cat("mc", this->spis, chunk_from_thing(spi)); this->spis = chunk_cat("mc", this->spis, chunk_from_thing(spi));
break; break;
default: default:
@@ -336,11 +337,12 @@ delete_payload_t *delete_payload_create(payload_type_t type,
.destroy = _destroy, .destroy = _destroy,
}, },
.next_payload = NO_PAYLOAD, .next_payload = NO_PAYLOAD,
.payload_length = get_header_length(this),
.doi = IKEV1_DOI_IPSEC, .doi = IKEV1_DOI_IPSEC,
.protocol_id = protocol_id, .protocol_id = protocol_id,
.spi_size = protocol_id == PROTO_AH || protocol_id == PROTO_ESP ? 4 : 0, .spi_size = protocol_id == PROTO_AH || protocol_id == PROTO_ESP ? 4 : 0,
.type = type, .type = type,
); );
this->payload_length = get_header_length(this);
return &this->public; return &this->public;
} }