aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/load_tester/load_tester_config.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2016-04-04 16:09:23 +0200
committerAndreas Steffen <andreas.steffen@strongswan.org>2016-04-09 16:51:01 +0200
commit8a00a8452ddb36ec07038242c029a214b0417ae8 (patch)
tree27dc50623f6bdc7013c665763d693ca4736261fa /src/libcharon/plugins/load_tester/load_tester_config.c
parentfd8f1194f3f14ff94c02e2218dd01b3aaf14c414 (diff)
downloadstrongswan-8a00a8452ddb36ec07038242c029a214b0417ae8.tar.bz2
strongswan-8a00a8452ddb36ec07038242c029a214b0417ae8.tar.xz
child-cfg: Use struct to pass data to constructor
Diffstat (limited to 'src/libcharon/plugins/load_tester/load_tester_config.c')
-rw-r--r--src/libcharon/plugins/load_tester/load_tester_config.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
index 9366556fc..efef3fbde 100644
--- a/src/libcharon/plugins/load_tester/load_tester_config.c
+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
@@ -688,13 +688,15 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
peer_cfg_t *peer_cfg;
char local[32], *remote;
host_t *addr;
- ipsec_mode_t mode = MODE_TUNNEL;
- lifetime_cfg_t lifetime = {
- .time = {
- .life = this->child_rekey * 2,
- .rekey = this->child_rekey,
- .jitter = 0
- }
+ child_cfg_create_t child = {
+ .lifetime = {
+ .time = {
+ .life = this->child_rekey * 2,
+ .rekey = this->child_rekey,
+ .jitter = 0
+ },
+ },
+ .mode = MODE_TUNNEL,
};
if (num)
@@ -768,17 +770,15 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
{
if (streq(this->mode, "transport"))
{
- mode = MODE_TRANSPORT;
+ child.mode = MODE_TRANSPORT;
}
else if (streq(this->mode, "beet"))
{
- mode = MODE_BEET;
+ child.mode = MODE_BEET;
}
}
- child_cfg = child_cfg_create("load-test", &lifetime, NULL, TRUE, mode,
- ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE,
- 0, 0, NULL, NULL, 0);
+ child_cfg = child_cfg_create("load-test", &child);
child_cfg->add_proposal(child_cfg, this->esp->clone(this->esp));
if (num)