Simplify NAT-D payload creation if UDP encapsulation is forced

We don't need any address lookups in that case as the content of the
payload is generated randomly anyway.

diff --git a/src/libcharon/sa/ikev2/tasks/ike_natd.c b/src/libcharon/sa/ikev2/tasks/ike_natd.c
index 3de0ab1b4149c8f7ed160eea27bd5142c59f046c..44a2be10b4dba00f8ef6b242498b4f455e5d2c3c 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_natd.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_natd.c
@@ -306,8 +306,8 @@ METHOD(task_t, build_i, status_t,
         * 3. Include all possbile addresses
         */
        host = message->get_source(message);
-       if (!host->is_anyaddr(host))
-       {       /* 1. */
+       if (!host->is_anyaddr(host) || ike_cfg->force_encap(ike_cfg))
+       {       /* 1. or if we force UDP encap, as it doesn't matter if it's %any */
                notify = build_natd_payload(this, NAT_DETECTION_SOURCE_IP, host);
                message->add_payload(message, (payload_t*)notify);
        }