Force port update as responder when initiator switches to 4500 in IKE_AUTH

diff --git a/src/libcharon/processing/jobs/update_sa_job.c b/src/libcharon/processing/jobs/update_sa_job.c
index 17dce2548d97e67602230a2cda8ec6cda822f4c4..a88ce723cbc09dc58e152922f841d8b1bf9bdc8f 100644 (file)
--- a/src/libcharon/processing/jobs/update_sa_job.c
+++ b/src/libcharon/processing/jobs/update_sa_job.c
@@ -71,7 +71,7 @@ static void execute(private_update_sa_job_t *this)
                if (ike_sa->has_condition(ike_sa, COND_NAT_THERE) &&
                        !ike_sa->has_condition(ike_sa, COND_NAT_HERE))
                {
-                       ike_sa->update_hosts(ike_sa, NULL, this->new);
+                       ike_sa->update_hosts(ike_sa, NULL, this->new, FALSE);
                }
                charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
        }

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index d6d880d26c934985cd29a1cc0c1354bb9e425652..9b6f9d06d833ebd66749703ab27e3b64b0d5d465 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -825,7 +825,7 @@ METHOD(ike_sa_t, float_ports, void,
 }
 
 METHOD(ike_sa_t, update_hosts, void,
-       private_ike_sa_t *this, host_t *me, host_t *other)
+       private_ike_sa_t *this, host_t *me, host_t *other, bool force)
 {
        bool update = FALSE;
 
@@ -858,7 +858,7 @@ METHOD(ike_sa_t, update_hosts, void,
                if (!other->equals(other, this->other_host))
                {
                        /* update others adress if we are NOT NATed */
-                       if (!has_condition(this, COND_NAT_HERE))
+                       if (force || !has_condition(this, COND_NAT_HERE))
                        {
                                set_other_host(this, other->clone(other));
                                update = TRUE;

diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index c0007e27d97d36d7dde77224e91ddee7827393ca..988100bcc18e28ae5775c2496a04fca6d2aca278 100644 (file)
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -343,8 +343,9 @@ struct ike_sa_t {
         *
         * @param me                    new local host address, or NULL
         * @param other                 new remote host address, or NULL
+        * @param force                 force update
         */
-       void (*update_hosts)(ike_sa_t *this, host_t *me, host_t *other);
+       void (*update_hosts)(ike_sa_t *this, host_t *me, host_t *other, bool force);
 
        /**
         * Get the own identification.

diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
index 16ddb25c563cb21e2209affa2e7e87a560743f78..9467d1586ad6c9a1bd1ef005211e968d94b5e367 100644 (file)
--- a/src/libcharon/sa/task_manager.c
+++ b/src/libcharon/sa/task_manager.c
@@ -897,7 +897,7 @@ METHOD(task_manager_t, process_message, status_t,
                        {       /* only do host updates based on verified messages */
                                if (!this->ike_sa->supports_extension(this->ike_sa, EXT_MOBIKE))
                                {       /* with MOBIKE, we do no implicit updates */
-                                       this->ike_sa->update_hosts(this->ike_sa, me, other);
+                                       this->ike_sa->update_hosts(this->ike_sa, me, other, mid == 1);
                                }
                        }
                        charon->bus->message(charon->bus, msg, TRUE);
@@ -942,7 +942,7 @@ METHOD(task_manager_t, process_message, status_t,
                        {       /* only do host updates based on verified messages */
                                if (!this->ike_sa->supports_extension(this->ike_sa, EXT_MOBIKE))
                                {       /* with MOBIKE, we do no implicit updates */
-                                       this->ike_sa->update_hosts(this->ike_sa, me, other);
+                                       this->ike_sa->update_hosts(this->ike_sa, me, other, FALSE);
                                }
                        }
                        charon->bus->message(charon->bus, msg, TRUE);