From: Martin Willi Date: Thu, 22 Jul 2010 13:52:18 +0000 (+0000) Subject: Delay resynchronization request until starter has loaded the configurations X-Git-Tag: 4.4.1~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51217527e6c10cbb772d8956eb11b8c7e66ecb5d;p=thirdparty%2Fstrongswan.git Delay resynchronization request until starter has loaded the configurations --- diff --git a/src/libcharon/plugins/ha/ha_segments.c b/src/libcharon/plugins/ha/ha_segments.c index 5f6e40db23..5cec3c5b04 100644 --- a/src/libcharon/plugins/ha/ha_segments.c +++ b/src/libcharon/plugins/ha/ha_segments.c @@ -319,6 +319,8 @@ static job_requeue_t request_resync(private_ha_segments_t *this) ha_message_t *message; int i; + DBG1(DBG_CFG, "requesting HA resynchronization"); + message = ha_message_create(HA_RESYNC); for (i = 1; i <= this->count; i++) { @@ -478,9 +480,9 @@ ha_segments_t *ha_segments_create(ha_socket_t *socket, ha_kernel_t *kernel, if (sync) { /* request a resync as soon as we are up */ - charon->processor->queue_job(charon->processor, (job_t*) + charon->scheduler->schedule_job(charon->scheduler, (job_t*) callback_job_create((callback_job_cb_t)request_resync, - this, NULL, NULL)); + this, NULL, NULL), 2); } return &this->public;