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

ike-cfg: Pass arguments as struct

Browse Source
This commit is contained in:
Tobias Brunner
2019-04-25 14:31:33 +02:00
parent de77957eda
commit 9486a2e5b0
18 changed files with 253 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conftest/config.c
+14 -7
View File
@@ -107,14 +107,21 @@ static ike_cfg_t *load_ike_config(private_config_t *this,
ike_cfg_t *ike_cfg;
proposal_t *proposal;
char *token;
ike_cfg_create_t ike = {
.version = IKEV2,
.local = settings->get_str(settings, "configs.%s.lhost",
"%any", config),
.local_port = settings->get_int(settings, "configs.%s.lport",
500, config),
.remote = settings->get_str(settings, "configs.%s.rhost",
"%any", config),
.remote_port = settings->get_int(settings, "configs.%s.rport",
500, config),
.force_encap = settings->get_bool(settings, "configs.%s.fake_nat",
FALSE, config),
};
ike_cfg = ike_cfg_create(IKEV2, TRUE,
settings->get_bool(settings, "configs.%s.fake_nat", FALSE, config),
settings->get_str(settings, "configs.%s.lhost", "%any", config),
settings->get_int(settings, "configs.%s.lport", 500, config),
settings->get_str(settings, "configs.%s.rhost", "%any", config),
settings->get_int(settings, "configs.%s.rport", 500, config),
FRAGMENTATION_NO, 0);
ike_cfg = ike_cfg_create(&ike);
token = settings->get_str(settings, "configs.%s.proposal", NULL, config);
if (token)
{