Send FAILED_CP_REQUIRED if a configuration payload was expected, but not received

diff --git a/src/libcharon/sa/ikev2/tasks/ike_config.c b/src/libcharon/sa/ikev2/tasks/ike_config.c
index d624fd170662b4a8f2a0befe3b7d8b2a6b17c49c..c44f0452c95a9f002441254399aec9519d38ba50 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_config.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.c
@@ -386,6 +386,15 @@ METHOD(task_t, build_r, status_t,
                        pools->destroy(pools);
                        return SUCCESS;
                }
+               if (pools->get_count(pools) && !this->vips->get_count(this->vips))
+               {
+                       DBG1(DBG_IKE, "expected a virtual IP request, sending %N",
+                                notify_type_names, FAILED_CP_REQUIRED);
+                       message->add_notify(message, FALSE, FAILED_CP_REQUIRED, chunk_empty);
+                       vips->destroy_offset(vips, offsetof(host_t, destroy));
+                       pools->destroy(pools);
+                       return SUCCESS;
+               }
 
                /* query registered providers for additional attributes to include */
                enumerator = hydra->attributes->create_responder_enumerator(