Explicitly configure MOBIKE tasks to update the list of additional addresses.

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 998095f5f685514c26de7641ceecad540813b328..0df517ada64c339720f6e108091d41a61aafe1c3 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1740,6 +1740,7 @@ METHOD(ike_sa_t, roam, status_t,
                {
                        DBG1(DBG_IKE, "sending address list update using MOBIKE");
                        mobike = ike_mobike_create(&this->public, TRUE);
+                       mobike->addresses(mobike);
                        this->task_manager->queue_task(this->task_manager, (task_t*)mobike);
                        return this->task_manager->initiate(this->task_manager);
                }

diff --git a/src/libcharon/sa/tasks/ike_mobike.c b/src/libcharon/sa/tasks/ike_mobike.c
index 3b1fbb019bf516defc55636b4affc64f94c5f3e7..e63a4212cf6284524d5d98114440b67060b62d47 100644 (file)
--- a/src/libcharon/sa/tasks/ike_mobike.c
+++ b/src/libcharon/sa/tasks/ike_mobike.c
@@ -540,6 +540,14 @@ METHOD(task_t, process_i, status_t,
        return NEED_MORE;
 }
 
+METHOD(ike_mobike_t, addresses, void,
+          private_ike_mobike_t *this)
+{
+       this->address = TRUE;
+       this->ike_sa->set_pending_updates(this->ike_sa,
+                                               this->ike_sa->get_pending_updates(this->ike_sa) + 1);
+}
+
 METHOD(ike_mobike_t, roam, void,
           private_ike_mobike_t *this, bool address)
 {
@@ -556,7 +564,6 @@ METHOD(ike_mobike_t, dpd, void,
        {
                this->natd = ike_natd_create(this->ike_sa, this->initiator);
        }
-       this->address = FALSE;
        this->ike_sa->set_pending_updates(this->ike_sa,
                                                this->ike_sa->get_pending_updates(this->ike_sa) + 1);
 }
@@ -609,6 +616,7 @@ ike_mobike_t *ike_mobike_create(ike_sa_t *ike_sa, bool initiator)
                                .migrate = _migrate,
                                .destroy = _destroy,
                        },
+                       .addresses = _addresses,
                        .roam = _roam,
                        .dpd = _dpd,
                        .transmit = _transmit,
@@ -616,7 +624,6 @@ ike_mobike_t *ike_mobike_create(ike_sa_t *ike_sa, bool initiator)
                },
                .ike_sa = ike_sa,
                .initiator = initiator,
-               .address = TRUE,
        );
 
        if (initiator)

diff --git a/src/libcharon/sa/tasks/ike_mobike.h b/src/libcharon/sa/tasks/ike_mobike.h
index 05b2224d11e62d23e9d7ff918bf7d3fd2f1ec557..16611939e3fe81dd4bb1ca746183f998bbfebc93 100644 (file)
--- a/src/libcharon/sa/tasks/ike_mobike.h
+++ b/src/libcharon/sa/tasks/ike_mobike.h
@@ -45,6 +45,11 @@ struct ike_mobike_t {
         */
        task_t task;
 
+       /**
+        * Use the task to update the list of additional addresses.
+        */
+       void (*addresses)(ike_mobike_t *this);
+
        /**
         * Use the task to roam to other addresses.
         *