denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix scheduling of heartbeat sending in HA plugin

Browse Source 
e0efd7c1 switches to automated job rescheduling for HA heartbeat. However,
send_status() is initially called directly, which will not reschedule the job
as required.
This commit is contained in:
Martin Willi
2013-03-19 15:48:27 +01:00
parent 5cf3afd1fa
commit 2071dd63d6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ha/ha_segments.c
+11 -2
View File
@@ -348,6 +348,16 @@ static job_requeue_t send_status(private_ha_segments_t *this)
return JOB_RESCHEDULE_MS(this->heartbeat_delay); return JOB_RESCHEDULE_MS(this->heartbeat_delay);
} }
/**
* Start the heartbeat sending task
*/
static void start_heartbeat(private_ha_segments_t *this)
{
lib->processor->queue_job(lib->processor,
(job_t*)callback_job_create_with_prio((callback_job_cb_t)send_status,
this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
}
METHOD(ha_segments_t, is_active, bool, METHOD(ha_segments_t, is_active, bool,
private_ha_segments_t *this, u_int segment) private_ha_segments_t *this, u_int segment)
{ {
@@ -401,10 +411,9 @@ ha_segments_t *ha_segments_create(ha_socket_t *socket, ha_kernel_t *kernel,
{ {
DBG1(DBG_CFG, "starting HA heartbeat, delay %dms, timeout %dms", DBG1(DBG_CFG, "starting HA heartbeat, delay %dms, timeout %dms",
this->heartbeat_delay, this->heartbeat_timeout); this->heartbeat_delay, this->heartbeat_timeout);
send_status(this); start_heartbeat(this);
start_watchdog(this); start_watchdog(this);
} }
return &this->public; return &this->public;
} }