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

ike-cfg: Allow passing NULL to add_proposal()

Browse Source 
This simplifies adding default proposals with constructors potentially
returning NULL.
This commit is contained in:
Martin Willi
2014-05-16 16:01:21 +02:00
parent 8642f8bdb7
commit 3312c447ef
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/config/ike_cfg.c
+4 -1
View File
@@ -281,7 +281,10 @@ METHOD(ike_cfg_t, get_dscp, u_int8_t,
METHOD(ike_cfg_t, add_proposal, void, METHOD(ike_cfg_t, add_proposal, void,
private_ike_cfg_t *this, proposal_t *proposal) private_ike_cfg_t *this, proposal_t *proposal)
{ {
this->proposals->insert_last(this->proposals, proposal); if (proposal)
{
this->proposals->insert_last(this->proposals, proposal);
}
} }
METHOD(ike_cfg_t, get_proposals, linked_list_t*, METHOD(ike_cfg_t, get_proposals, linked_list_t*,
src/libcharon/config/ike_cfg.h
+3 -2
View File
@@ -148,9 +148,10 @@ struct ike_cfg_t {
* Adds a proposal to the list. * Adds a proposal to the list.
* *
* The first added proposal has the highest priority, the last * The first added proposal has the highest priority, the last
* added the lowest. * added the lowest. It is safe to add NULL as proposal, which has no
* effect.
* *
* @param proposal proposal to add * @param proposal proposal to add, or NULL
*/ */
void (*add_proposal) (ike_cfg_t *this, proposal_t *proposal); void (*add_proposal) (ike_cfg_t *this, proposal_t *proposal);