- works with new proposal code
- still some(!) memleaks
This commit is contained in:
@@ -569,7 +569,6 @@ proposal_substructure_t *proposal_substructure_create_from_child_proposal(child_
|
||||
this->proposal_number = proposal->get_number(proposal);
|
||||
this->protocol_id = proto;
|
||||
|
||||
|
||||
/* encryption algorithm is only availble in ESP */
|
||||
iterator = proposal->create_algorithm_iterator(proposal, proto, ENCRYPTION_ALGORITHM);
|
||||
while (iterator->has_next(iterator))
|
||||
|
||||
@@ -545,7 +545,7 @@ sa_payload_t *sa_payload_create_from_ike_proposals(ike_proposal_t *proposals, si
|
||||
/*
|
||||
* Described in header.
|
||||
*/
|
||||
sa_payload_t *sa_payload_create_from_child_proposals(linked_list_t *proposals)
|
||||
sa_payload_t *sa_payload_create_from_child_proposal_list(linked_list_t *proposals)
|
||||
{
|
||||
iterator_t *iterator;
|
||||
child_proposal_t *proposal;
|
||||
@@ -561,3 +561,15 @@ sa_payload_t *sa_payload_create_from_child_proposals(linked_list_t *proposals)
|
||||
|
||||
return sa_payload;
|
||||
}
|
||||
|
||||
/*
|
||||
* Described in header.
|
||||
*/
|
||||
sa_payload_t *sa_payload_create_from_child_proposal(child_proposal_t *proposal)
|
||||
{
|
||||
sa_payload_t *sa_payload = sa_payload_create();
|
||||
|
||||
add_child_proposal((private_sa_payload_t*)sa_payload, proposal);
|
||||
|
||||
return sa_payload;
|
||||
}
|
||||
|
||||
@@ -151,6 +151,8 @@ sa_payload_t *sa_payload_create();
|
||||
*/
|
||||
sa_payload_t *sa_payload_create_from_ike_proposals(ike_proposal_t *proposals, size_t proposal_count);
|
||||
|
||||
sa_payload_t *sa_payload_create_from_child_proposals(linked_list_t *proposals);
|
||||
sa_payload_t *sa_payload_create_from_child_proposal_list(linked_list_t *proposals);
|
||||
|
||||
sa_payload_t *sa_payload_create_from_child_proposal(child_proposal_t *proposal);
|
||||
|
||||
#endif /*SA_PAYLOAD_H_*/
|
||||
|
||||
Reference in New Issue
Block a user