sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-08 00:02:03 -04:00
Code Issues Projects Releases Wiki Activity

Add an additional proposal without IPComp to SA payload.

Browse Source
This commit is contained in:
Tobias Brunner 2012-05-24 14:40:12 +02:00
parent 3451ecd7ac
commit 6695b48582
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libcharon/encoding/payloads/sa_payload.c
View File

@ -568,8 +568,16 @@ sa_payload_t *sa_payload_create_from_proposals_v1(linked_list_t *proposals,
substruct->set_is_last_proposal(substruct, FALSE); substruct->set_is_last_proposal(substruct, FALSE);
if (cpi) if (cpi)
{ {
u_int8_t proposal_number = substruct->get_proposal_number(substruct);
substruct = proposal_substructure_create_for_ipcomp_v1(lifetime, substruct = proposal_substructure_create_for_ipcomp_v1(lifetime,
lifebytes, cpi, substruct->get_proposal_number(substruct)); lifebytes, cpi, proposal_number);
this->proposals->insert_last(this->proposals, substruct);
substruct->set_is_last_proposal(substruct, FALSE);
/* add the proposals again without IPComp */
substruct = proposal_substructure_create_from_proposals_v1(proposals,
lifetime, lifebytes, auth, mode, udp);
substruct->set_proposal_number(substruct, proposal_number + 1);
this->proposals->insert_last(this->proposals, substruct); this->proposals->insert_last(this->proposals, substruct);
} }
substruct->set_is_last_proposal(substruct, TRUE); substruct->set_is_last_proposal(substruct, TRUE);
@ -586,23 +594,13 @@ sa_payload_t *sa_payload_create_from_proposal_v1(proposal_t *proposal,
auth_method_t auth, ipsec_mode_t mode, bool udp, auth_method_t auth, ipsec_mode_t mode, bool udp,
u_int16_t cpi) u_int16_t cpi)
{ {
proposal_substructure_t *substruct;
private_sa_payload_t *this; private_sa_payload_t *this;
linked_list_t *proposals;
this = (private_sa_payload_t*)sa_payload_create(SECURITY_ASSOCIATION_V1); proposals = linked_list_create();
proposals->insert_last(proposals, proposal);
substruct = proposal_substructure_create_from_proposal_v1(proposal, this = (private_sa_payload_t*)sa_payload_create_from_proposals_v1(proposals,
lifetime, lifebytes, auth, mode, udp); lifetime, lifebytes, auth, mode, udp, cpi);
this->proposals->insert_last(this->proposals, substruct); proposals->destroy(proposals);
substruct->set_is_last_proposal(substruct, FALSE);
if (cpi)
{
substruct = proposal_substructure_create_for_ipcomp_v1(lifetime,
lifebytes, cpi, substruct->get_proposal_number(substruct));
this->proposals->insert_last(this->proposals, substruct);
}
substruct->set_is_last_proposal(substruct, TRUE);
compute_length(this);
return &this->public; return &this->public;
} }