Refer to scheduler via hydra and not charon.
authorTobias Brunner <tobias@strongswan.org>
Tue, 6 Jul 2010 11:23:42 +0000 (13:23 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 2 Sep 2010 17:01:24 +0000 (19:01 +0200)
14 files changed:
src/libcharon/network/receiver.c
src/libcharon/plugins/android/android_service.c
src/libcharon/plugins/ha/ha_segments.c
src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c
src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c
src/libcharon/plugins/stroke/stroke_list.c
src/libcharon/processing/jobs/inactivity_job.c
src/libcharon/sa/connect_manager.c
src/libcharon/sa/ike_sa.c
src/libcharon/sa/task_manager.c
src/libcharon/sa/tasks/child_create.c
src/libcharon/sa/tasks/child_rekey.c
src/libcharon/sa/tasks/ike_rekey.c

index cc73ba8..f439192 100644 (file)
@@ -354,7 +354,7 @@ static job_requeue_t receive_packets(private_receiver_t *this)
                        {
                                DBG1(DBG_NET, "using receive delay: %dms",
                                         this->receive_delay);
-                               charon->scheduler->schedule_job_ms(charon->scheduler,
+                               hydra->scheduler->schedule_job_ms(hydra->scheduler,
                                                                (job_t*)process_message_job_create(message),
                                                                this->receive_delay);
                                return JOB_REQUEUE_DIRECT;
index 235679a..16603a6 100644 (file)
@@ -142,7 +142,7 @@ METHOD(listener_t, child_updown, bool,
                         * callback, but from a different thread. we also delay it to avoid
                         * a race condition during a regular shutdown */
                        job = callback_job_create(shutdown_callback, NULL, NULL, NULL);
-                       charon->scheduler->schedule_job(charon->scheduler, (job_t*)job, 1);
+                       hydra->scheduler->schedule_job(hydra->scheduler, (job_t*)job, 1);
                        return FALSE;
                }
        }
index 8d6fff4..fea454a 100644 (file)
@@ -346,7 +346,7 @@ static job_requeue_t send_status(private_ha_segments_t *this)
        message->destroy(message);
 
        /* schedule next invocation */
-       charon->scheduler->schedule_job_ms(charon->scheduler, (job_t*)
+       hydra->scheduler->schedule_job_ms(hydra->scheduler, (job_t*)
                                                                        callback_job_create((callback_job_cb_t)
                                                                                send_status, this, NULL, NULL),
                                                                        this->heartbeat_delay);
index 6622a96..0b6233a 100644 (file)
@@ -1511,7 +1511,7 @@ static void schedule_expire(private_kernel_klips_ipsec_t *this,
        expire->reqid = reqid;
        expire->type = type;
        job = callback_job_create((callback_job_cb_t)sa_expires, expire, free, NULL);
-       charon->scheduler->schedule_job(charon->scheduler, (job_t*)job, time);
+       hydra->scheduler->schedule_job(hydra->scheduler, (job_t*)job, time);
 }
 
 METHOD(kernel_ipsec_t, get_spi, status_t,
index 9ca5cde..fa4a501 100644 (file)
@@ -241,7 +241,7 @@ static void fire_roam_job(private_kernel_netlink_net_t *this, bool address)
                        now.tv_usec -= 1000000;
                }
                this->last_roam = now;
-               charon->scheduler->schedule_job_ms(charon->scheduler,
+               hydra->scheduler->schedule_job_ms(hydra->scheduler,
                                (job_t*)roam_job_create(address), ROAM_DELAY);
        }
 }
index 6c06b62..ab82c1e 100644 (file)
@@ -169,7 +169,7 @@ static void fire_roam_job(private_kernel_pfroute_net_t *this, bool address)
                        now.tv_usec -= 1000000;
                }
                this->last_roam = now;
-               charon->scheduler->schedule_job_ms(charon->scheduler,
+               hydra->scheduler->schedule_job_ms(hydra->scheduler,
                        (job_t*)roam_job_create(address), ROAM_DELAY);
        }
 }
index 9106a4f..d21e1f0 100644 (file)
@@ -428,7 +428,7 @@ static void status(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bo
                fprintf(out, " job queue load: %d,",
                                hydra->processor->get_job_load(hydra->processor));
                fprintf(out, " scheduled events: %d\n",
-                               charon->scheduler->get_job_load(charon->scheduler));
+                               hydra->scheduler->get_job_load(hydra->scheduler));
                fprintf(out, "  loaded plugins: ");
                enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
                while (enumerator->enumerate(enumerator, &plugin))
index f205558..237c9d2 100644 (file)
@@ -15,6 +15,7 @@
 
 #include "inactivity_job.h"
 
+#include <hydra.h>
 #include <daemon.h>
 
 typedef struct private_inactivity_job_t private_inactivity_job_t;
@@ -87,7 +88,7 @@ METHOD(job_t, execute, void,
                                }
                                else
                                {
-                                       charon->scheduler->schedule_job(charon->scheduler,
+                                       hydra->scheduler->schedule_job(hydra->scheduler,
                                                        &this->public.job_interface, this->timeout - diff);
                                        rescheduled = TRUE;
                                }
index fa87715..8367d64 100644 (file)
@@ -933,7 +933,7 @@ static void update_checklist_state(private_connect_manager_t *this,
 
                callback_data_t *data = callback_data_create(this, checklist->connect_id);
                job_t *job = (job_t*)callback_job_create((callback_job_cb_t)initiator_finish, data, (callback_job_cleanup_t)callback_data_destroy, NULL);
-               charon->scheduler->schedule_job_ms(charon->scheduler, job, ME_WAIT_TO_FINISH);
+               hydra->scheduler->schedule_job_ms(hydra->scheduler, job, ME_WAIT_TO_FINISH);
                checklist->is_finishing = TRUE;
        }
 
@@ -1032,7 +1032,7 @@ static void queue_retransmission(private_connect_manager_t *this, check_list_t *
        DBG2(DBG_IKE, "scheduling retransmission %d of pair '%d' in %dms",
                 retransmission, pair->id, rto);
 
-       charon->scheduler->schedule_job_ms(charon->scheduler, (job_t*)job, rto);
+       hydra->scheduler->schedule_job_ms(hydra->scheduler, (job_t*)job, rto);
 }
 
 /**
@@ -1171,7 +1171,7 @@ static void schedule_checks(private_connect_manager_t *this, check_list_t *check
 {
        callback_data_t *data = callback_data_create(this, checklist->connect_id);
        checklist->sender = (job_t*)callback_job_create((callback_job_cb_t)sender, data, (callback_job_cleanup_t)callback_data_destroy, NULL);
-       charon->scheduler->schedule_job_ms(charon->scheduler, checklist->sender, time);
+       hydra->scheduler->schedule_job_ms(hydra->scheduler, checklist->sender, time);
 }
 
 /**
index a7b6cce..6656317 100644 (file)
@@ -470,7 +470,7 @@ METHOD(ike_sa_t, send_keepalive, void,
                diff = 0;
        }
        job = send_keepalive_job_create(this->ike_sa_id);
-       charon->scheduler->schedule_job(charon->scheduler, (job_t*)job,
+       hydra->scheduler->schedule_job(hydra->scheduler, (job_t*)job,
                                                                        this->keepalive_interval - diff);
 }
 
@@ -605,7 +605,7 @@ METHOD(ike_sa_t, send_dpd, status_t,
        }
        /* recheck in "interval" seconds */
        job = (job_t*)send_dpd_job_create(this->ike_sa_id);
-       charon->scheduler->schedule_job(charon->scheduler, job, delay - diff);
+       hydra->scheduler->schedule_job(hydra->scheduler, job, delay - diff);
        return SUCCESS;
 }
 
@@ -644,7 +644,7 @@ METHOD(ike_sa_t, set_state, void,
                                {
                                        this->stats[STAT_REKEY] = t + this->stats[STAT_ESTABLISHED];
                                        job = (job_t*)rekey_ike_sa_job_create(this->ike_sa_id, FALSE);
-                                       charon->scheduler->schedule_job(charon->scheduler, job, t);
+                                       hydra->scheduler->schedule_job(hydra->scheduler, job, t);
                                        DBG1(DBG_IKE, "scheduling rekeying in %ds", t);
                                }
                                t = this->peer_cfg->get_reauth_time(this->peer_cfg);
@@ -653,7 +653,7 @@ METHOD(ike_sa_t, set_state, void,
                                {
                                        this->stats[STAT_REAUTH] = t + this->stats[STAT_ESTABLISHED];
                                        job = (job_t*)rekey_ike_sa_job_create(this->ike_sa_id, TRUE);
-                                       charon->scheduler->schedule_job(charon->scheduler, job, t);
+                                       hydra->scheduler->schedule_job(hydra->scheduler, job, t);
                                        DBG1(DBG_IKE, "scheduling reauthentication in %ds", t);
                                }
                                t = this->peer_cfg->get_over_time(this->peer_cfg);
@@ -675,7 +675,7 @@ METHOD(ike_sa_t, set_state, void,
                                        this->stats[STAT_DELETE] += t;
                                        t = this->stats[STAT_DELETE] - this->stats[STAT_ESTABLISHED];
                                        job = (job_t*)delete_ike_sa_job_create(this->ike_sa_id, TRUE);
-                                       charon->scheduler->schedule_job(charon->scheduler, job, t);
+                                       hydra->scheduler->schedule_job(hydra->scheduler, job, t);
                                        DBG1(DBG_IKE, "maximum IKE_SA lifetime %ds", t);
                                }
 
@@ -688,8 +688,8 @@ METHOD(ike_sa_t, set_state, void,
                {
                        /* delete may fail if a packet gets lost, so set a timeout */
                        job_t *job = (job_t*)delete_ike_sa_job_create(this->ike_sa_id, TRUE);
-                       charon->scheduler->schedule_job(charon->scheduler, job,
-                                                                                       HALF_OPEN_IKE_SA_TIMEOUT);
+                       hydra->scheduler->schedule_job(hydra->scheduler, job,
+                                                                                  HALF_OPEN_IKE_SA_TIMEOUT);
                        break;
                }
                default:
@@ -1262,8 +1262,8 @@ METHOD(ike_sa_t, process_message, status_t,
                        }
                        /* add a timeout if peer does not establish it completely */
                        job = (job_t*)delete_ike_sa_job_create(this->ike_sa_id, FALSE);
-                       charon->scheduler->schedule_job(charon->scheduler, job,
-                                                                                       HALF_OPEN_IKE_SA_TIMEOUT);
+                       hydra->scheduler->schedule_job(hydra->scheduler, job,
+                                                                                  HALF_OPEN_IKE_SA_TIMEOUT);
                }
                this->stats[STAT_INBOUND] = time_monotonic(NULL);
                /* check if message is trustworthy, and update host information */
@@ -1718,7 +1718,7 @@ METHOD(ike_sa_t, set_auth_lifetime, void,
                this->stats[STAT_REAUTH] = reauth_time;
                DBG1(DBG_IKE, "received AUTH_LIFETIME of %ds, scheduling reauthentication"
                         " in %ds", lifetime, lifetime - reduction);
-               charon->scheduler->schedule_job(charon->scheduler,
+               hydra->scheduler->schedule_job(hydra->scheduler,
                                                (job_t*)rekey_ike_sa_job_create(this->ike_sa_id, TRUE),
                                                lifetime - reduction);
        }
@@ -1919,9 +1919,9 @@ METHOD(ike_sa_t, inherit, status_t,
                this->stats[STAT_DELETE] = this->stats[STAT_REAUTH] + delete;
                DBG1(DBG_IKE, "rescheduling reauthentication in %ds after rekeying, "
                         "lifetime reduced to %ds", reauth, delete);
-               charon->scheduler->schedule_job(charon->scheduler,
+               hydra->scheduler->schedule_job(hydra->scheduler,
                                (job_t*)rekey_ike_sa_job_create(this->ike_sa_id, TRUE), reauth);
-               charon->scheduler->schedule_job(charon->scheduler,
+               hydra->scheduler->schedule_job(hydra->scheduler,
                                (job_t*)delete_ike_sa_job_create(this->ike_sa_id, TRUE), delete);
        }
        /* we have to initate here, there may be new tasks to handle */
index a688264..69c08bf 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <math.h>
 
+#include <hydra.h>
 #include <daemon.h>
 #include <sa/tasks/ike_init.h>
 #include <sa/tasks/ike_natd.h>
@@ -274,7 +275,7 @@ METHOD(task_manager_t, retransmit, status_t,
                this->initiating.retransmitted++;
                job = (job_t*)retransmit_job_create(this->initiating.mid,
                                                                                        this->ike_sa->get_id(this->ike_sa));
-               charon->scheduler->schedule_job_ms(charon->scheduler, job, timeout);
+               hydra->scheduler->schedule_job_ms(hydra->scheduler, job, timeout);
        }
        return SUCCESS;
 }
index 3de27ee..0251302 100644 (file)
@@ -17,6 +17,7 @@
 
 #include "child_create.h"
 
+#include <hydra.h>
 #include <daemon.h>
 #include <crypto/diffie_hellman.h>
 #include <credentials/certificates/x509.h>
@@ -261,7 +262,7 @@ static void schedule_inactivity_timeout(private_child_create_t *this)
        {
                close_ike = lib->settings->get_bool(lib->settings,
                                                                                "charon.inactivity_close_ike", FALSE);
-               charon->scheduler->schedule_job(charon->scheduler, (job_t*)
+               hydra->scheduler->schedule_job(hydra->scheduler, (job_t*)
                                inactivity_job_create(this->child_sa->get_reqid(this->child_sa),
                                                                          timeout, close_ike), timeout);
        }
@@ -871,7 +872,7 @@ static void handle_child_sa_failure(private_child_create_t *this,
                /* we delay the delete for 100ms, as the IKE_AUTH response must arrive
                 * first */
                DBG1(DBG_IKE, "closing IKE_SA due CHILD_SA setup failure");
-               charon->scheduler->schedule_job_ms(charon->scheduler, (job_t*)
+               hydra->scheduler->schedule_job_ms(hydra->scheduler, (job_t*)
                        delete_ike_sa_job_create(this->ike_sa->get_id(this->ike_sa), TRUE),
                        100);
        }
index b53bfd4..e497f01 100644 (file)
@@ -330,7 +330,7 @@ static status_t process_i(private_child_rekey_t *this, message_t *message)
                        DBG1(DBG_IKE, "CHILD_SA rekeying failed, "
                                                                "trying again in %d seconds", retry);
                        this->child_sa->set_state(this->child_sa, CHILD_INSTALLED);
-                       charon->scheduler->schedule_job(charon->scheduler, job, retry);
+                       hydra->scheduler->schedule_job(hydra->scheduler, job, retry);
                }
                return SUCCESS;
        }
index a066adc..1eabf93 100644 (file)
@@ -218,7 +218,7 @@ static status_t process_i(private_ike_rekey_t *this, message_t *message)
                                DBG1(DBG_IKE, "IKE_SA rekeying failed, "
                                                                                "trying again in %d seconds", retry);
                                this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED);
-                               charon->scheduler->schedule_job(charon->scheduler, job, retry);
+                               hydra->scheduler->schedule_job(hydra->scheduler, job, retry);
                        }
                        return SUCCESS;
                case NEED_MORE:
@@ -261,7 +261,7 @@ static status_t process_i(private_ike_rekey_t *this, message_t *message)
                                /* peer should delete this SA. Add a timeout just in case. */
                                job_t *job = (job_t*)delete_ike_sa_job_create(
                                                other->new_sa->get_id(other->new_sa), TRUE);
-                               charon->scheduler->schedule_job(charon->scheduler, job, 10);
+                               hydra->scheduler->schedule_job(hydra->scheduler, job, 10);
                                DBG1(DBG_IKE, "IKE_SA rekey collision won, deleting rekeyed IKE_SA");
                                charon->ike_sa_manager->checkin(charon->ike_sa_manager, other->new_sa);
                                other->new_sa = NULL;