diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2015-08-21 18:21:24 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2015-08-21 18:21:24 +0200 |
| commit | d88cec920c9def7ed2d9906858f4b88a4b46a730 (patch) | |
| tree | cc5798460efe4618077e8b17694ed6340071b6d4 /src/libcharon/plugins/load_tester | |
| parent | ffa20bad6356732e840aaffc6f9ef8fd1e6eb88e (diff) | |
| parent | 256e666d2235718a3711cf7ad9634354c10f7a7e (diff) | |
| download | strongswan-d88cec920c9def7ed2d9906858f4b88a4b46a730.tar.bz2 strongswan-d88cec920c9def7ed2d9906858f4b88a4b46a730.tar.xz | |
Merge branch 'init-limits'
IKE_SAs that are initiated are now counted towards the half-open IKE_SAs
limit. Optionally it is possible to enforce limits towards the number of
half-open IKE_SAs and the job load also when initiating SAs. This is
currently only possible via VICI.
Diffstat (limited to 'src/libcharon/plugins/load_tester')
| -rw-r--r-- | src/libcharon/plugins/load_tester/load_tester_control.c | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/load_tester/load_tester_plugin.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcharon/plugins/load_tester/load_tester_control.c b/src/libcharon/plugins/load_tester/load_tester_control.c index 5f089f5db..24076d443 100644 --- a/src/libcharon/plugins/load_tester/load_tester_control.c +++ b/src/libcharon/plugins/load_tester/load_tester_control.c @@ -239,7 +239,7 @@ static bool on_accept(private_load_tester_control_t *this, stream_t *io) switch (charon->controller->initiate(charon->controller, peer_cfg, child_cfg->get_ref(child_cfg), - (void*)initiate_cb, listener, 0)) + (void*)initiate_cb, listener, 0, FALSE)) { case NEED_MORE: /* Callback returns FALSE once it got track of this IKE_SA. diff --git a/src/libcharon/plugins/load_tester/load_tester_plugin.c b/src/libcharon/plugins/load_tester/load_tester_plugin.c index e684f22ce..c7380b974 100644 --- a/src/libcharon/plugins/load_tester/load_tester_plugin.c +++ b/src/libcharon/plugins/load_tester/load_tester_plugin.c @@ -152,7 +152,7 @@ static job_requeue_t do_load_test(private_load_tester_plugin_t *this) charon->controller->initiate(charon->controller, peer_cfg, child_cfg->get_ref(child_cfg), - NULL, NULL, 0); + NULL, NULL, 0, FALSE); if (s) { sleep(s); |