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

kernel-pfroute: Make time that is waited for VIPs to appear configurable

Browse Source 
One second might be too short for IPs to appear/disappear, especially on
virtualized hosts.
This commit is contained in:
Tobias Brunner
2013-07-17 17:45:17 +02:00
parent dc8b083d9f
commit baa6419ec1
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/strongswan.conf.5.in
+3
View File
@@ -610,6 +610,9 @@ Set MTU of ipsecN device
.BR charon.plugins.kernel-netlink.roam_events " [yes]" .BR charon.plugins.kernel-netlink.roam_events " [yes]"
Whether to trigger roam events when interfaces, addresses or routes change Whether to trigger roam events when interfaces, addresses or routes change
.TP .TP
.BR charon.plugins.kernel-pfroute.vip_wait " [1000]"
Time in ms to wait until virtual IP addresses appear/disappear before failing.
.TP
.BR charon.plugins.load-tester .BR charon.plugins.load-tester
Section to configure the load-tester plugin, see LOAD TESTS Section to configure the load-tester plugin, see LOAD TESTS
.TP .TP
src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
+11 -2
View File
@@ -247,6 +247,11 @@ struct private_kernel_pfroute_net_t
* time of last roam event * time of last roam event
*/ */
timeval_t last_roam; timeval_t last_roam;
/**
* Time in ms to wait for IP addresses to appear/disappear
*/
int vip_wait;
}; };
/** /**
@@ -852,7 +857,8 @@ METHOD(kernel_net_t, add_ip, status_t,
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
while (!timeout && !get_interface_name(this, vip, NULL)) while (!timeout && !get_interface_name(this, vip, NULL))
{ {
timeout = this->condvar->timed_wait(this->condvar, this->mutex, 1000); timeout = this->condvar->timed_wait(this->condvar, this->mutex,
this->vip_wait);
} }
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
if (timeout) if (timeout)
@@ -929,7 +935,8 @@ METHOD(kernel_net_t, del_ip, status_t,
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
while (!timeout && get_interface_name(this, vip, NULL)) while (!timeout && get_interface_name(this, vip, NULL))
{ {
timeout = this->condvar->timed_wait(this->condvar, this->mutex, 1000); timeout = this->condvar->timed_wait(this->condvar, this->mutex,
this->vip_wait);
} }
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
if (timeout) if (timeout)
@@ -1382,6 +1389,8 @@ kernel_pfroute_net_t *kernel_pfroute_net_create()
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT), .lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
.mutex = mutex_create(MUTEX_TYPE_DEFAULT), .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
.condvar = condvar_create(CONDVAR_TYPE_DEFAULT), .condvar = condvar_create(CONDVAR_TYPE_DEFAULT),
.vip_wait = lib->settings->get_int(lib->settings,
"%s.plugins.kernel-pfroute.vip_wait", 1000, hydra->daemon),
); );
/* create a PF_ROUTE socket to communicate with the kernel */ /* create a PF_ROUTE socket to communicate with the kernel */