Support multiple virtual IPs on peer_cfg and ike_sa classes

[strongswan.git] / src / libcharon / processing / jobs / migrate_job.c

diff --git a/src/libcharon/processing/jobs/migrate_job.c b/src/libcharon/processing/jobs/migrate_job.c
index 05f4734..2ebfc67 100644 (file)
--- a/src/libcharon/processing/jobs/migrate_job.c
+++ b/src/libcharon/processing/jobs/migrate_job.c
@@ -57,10 +57,8 @@ struct private_migrate_job_t {
        host_t *remote;
 };
 
-/**
- * Implementation of job_t.destroy.
- */
-static void destroy(private_migrate_job_t *this)
+METHOD(job_t, destroy, void,
+       private_migrate_job_t *this)
 {
        DESTROY_IF(this->src_ts);
        DESTROY_IF(this->dst_ts);
@@ -69,10 +67,8 @@ static void destroy(private_migrate_job_t *this)
        free(this);
 }
 
-/**
- * Implementation of job_t.execute.
- */
-static void execute(private_migrate_job_t *this)
+METHOD(job_t, execute, job_requeue_t,
+       private_migrate_job_t *this)
 {
        ike_sa_t *ike_sa = NULL;
 
@@ -83,12 +79,13 @@ static void execute(private_migrate_job_t *this)
        }
        if (ike_sa)
        {
-               iterator_t *children;
+               enumerator_t *children, *enumerator;
                child_sa_t *child_sa;
                host_t *host;
+               linked_list_t *vips;
 
-               children = ike_sa->create_child_sa_iterator(ike_sa);
-               while (children->iterate(children, (void**)&child_sa))
+               children = ike_sa->create_child_sa_enumerator(ike_sa);
+               while (children->enumerate(children, (void**)&child_sa))
                {
                        if (child_sa->get_reqid(child_sa) == this->reqid)
                        {
@@ -101,27 +98,41 @@ static void execute(private_migrate_job_t *this)
                ike_sa->set_kmaddress(ike_sa, this->local, this->remote);
 
                host = this->local->clone(this->local);
-               host->set_port(host, IKEV2_UDP_PORT);
+               host->set_port(host, charon->socket->get_port(charon->socket, FALSE));
                ike_sa->set_my_host(ike_sa, host);
 
                host = this->remote->clone(this->remote);
                host->set_port(host, IKEV2_UDP_PORT);
                ike_sa->set_other_host(ike_sa, host);
 
-               if (child_sa->update(child_sa, this->local, this->remote,
-                               ike_sa->get_virtual_ip(ike_sa, TRUE),
+               vips = linked_list_create();
+               enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa, TRUE);
+               while (enumerator->enumerate(enumerator, &host))
+               {
+                       vips->insert_last(vips, host);
+               }
+               enumerator->destroy(enumerator);
+
+               if (child_sa->update(child_sa, this->local, this->remote, vips,
                                ike_sa->has_condition(ike_sa, COND_NAT_ANY)) == NOT_SUPPORTED)
                {
                        ike_sa->rekey_child_sa(ike_sa, child_sa->get_protocol(child_sa),
                                                                   child_sa->get_spi(child_sa, TRUE));
                }
                charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
+               vips->destroy(vips);
        }
        else
        {
                DBG1(DBG_JOB, "no CHILD_SA found with reqid {%d}", this->reqid);
        }
-       destroy(this);
+       return JOB_REQUEUE_NONE;
+}
+
+METHOD(job_t, get_priority, job_priority_t,
+       private_migrate_job_t *this)
+{
+       return JOB_PRIO_MEDIUM;
 }
 
 /*
@@ -133,18 +144,22 @@ migrate_job_t *migrate_job_create(u_int32_t reqid,
                                                                  policy_dir_t dir,
                                                                  host_t *local, host_t *remote)
 {
-       private_migrate_job_t *this = malloc_thing(private_migrate_job_t);
-
-       /* interface functions */
-       this->public.job_interface.execute = (void (*) (job_t *)) execute;
-       this->public.job_interface.destroy = (void (*)(job_t*)) destroy;
-
-       /* private variables */
-       this->reqid = reqid;
-       this->src_ts = (dir == POLICY_OUT) ? src_ts : dst_ts;
-       this->dst_ts = (dir == POLICY_OUT) ? dst_ts : src_ts;
-       this->local = local;
-       this->remote = remote;
+       private_migrate_job_t *this;
+
+       INIT(this,
+               .public = {
+                       .job_interface = {
+                               .execute = _execute,
+                               .get_priority = _get_priority,
+                               .destroy = _destroy,
+                       },
+               },
+               .reqid = reqid,
+               .src_ts = (dir == POLICY_OUT) ? src_ts : dst_ts,
+               .dst_ts = (dir == POLICY_OUT) ? dst_ts : src_ts,
+               .local = local,
+               .remote = remote,
+       );
 
        return &this->public;
 }