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

ikev2: Allocate SPI with the protocol of the first/negotiated proposal

Browse Source
This commit is contained in:
Martin Willi
2013-10-11 10:15:21 +02:00
parent f0c59e1cf8
commit cdab8630d9
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/child_create.c
+16 -2
View File
@@ -244,9 +244,23 @@ static bool allocate_spi(private_child_create_t *this)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
proposal_t *proposal; proposal_t *proposal;
protocol_id_t proto = PROTO_ESP;
/* TODO: allocate additional SPI for AH if we have such proposals */ if (this->initiator)
this->my_spi = this->child_sa->alloc_spi(this->child_sa, PROTO_ESP); {
/* we just get a SPI for the first protocol. TODO: If we ever support
* proposal lists with mixed protocols, we'd need multiple SPIs */
if (this->proposals->get_first(this->proposals,
(void**)&proposal) == SUCCESS)
{
proto = proposal->get_protocol(proposal);
}
}
else
{
proto = this->proposal->get_protocol(this->proposal);
}
this->my_spi = this->child_sa->alloc_spi(this->child_sa, proto);
if (this->my_spi) if (this->my_spi)
{ {
if (this->initiator) if (this->initiator)