child-cfg: Allow passing NULL as proposal to add_proposal()

Making the API consistent to the one of ike_cfg.

diff --git a/src/libcharon/config/child_cfg.c b/src/libcharon/config/child_cfg.c
index 8d8214ebe1aacaa7df0b7eab7b1ceba8b3304344..3f07b5860d1efabdeb966d1b24ffe099f3da4f71 100644 (file)
--- a/src/libcharon/config/child_cfg.c
+++ b/src/libcharon/config/child_cfg.c
@@ -149,7 +149,10 @@ METHOD(child_cfg_t, get_name, char*,
 METHOD(child_cfg_t, add_proposal, void,
        private_child_cfg_t *this, proposal_t *proposal)
 {
-       this->proposals->insert_last(this->proposals, proposal);
+       if (proposal)
+       {
+               this->proposals->insert_last(this->proposals, proposal);
+       }
 }
 
 METHOD(child_cfg_t, get_proposals, linked_list_t*,

diff --git a/src/libcharon/config/child_cfg.h b/src/libcharon/config/child_cfg.h
index 20d1fa811638584c6baaec98206119041f703d0a..43ad1c5c89f125f3c213236b0507160141f75351 100644 (file)
--- a/src/libcharon/config/child_cfg.h
+++ b/src/libcharon/config/child_cfg.h
@@ -73,10 +73,10 @@ struct child_cfg_t {
         * Add a proposal to the list.
         *
         * The proposals are stored by priority, first added
-        * is the most preferred.
-        * After add, proposal is owned by child_cfg.
+        * is the most preferred. It is safe to add NULL as proposal, which has no
+        * effect. After add, proposal is owned by child_cfg.
         *
-        * @param proposal              proposal to add
+        * @param proposal              proposal to add, or NULL
         */
        void (*add_proposal) (child_cfg_t *this, proposal_t *proposal);