diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-12-13 15:31:47 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-21 11:46:20 +0100 |
| commit | ae82265a4695a58b16893e3dc2d3c616907a2a9a (patch) | |
| tree | 8e7ce009f411b12c675b3bf0e55d06c051b1561a /src | |
| parent | d82372fab87ddbe24014bd0208472c6759a9266c (diff) | |
| download | strongswan-ae82265a4695a58b16893e3dc2d3c616907a2a9a.tar.bz2 strongswan-ae82265a4695a58b16893e3dc2d3c616907a2a9a.tar.xz | |
Add the ability to use a named pool for conftest configs
Diffstat (limited to 'src')
| -rw-r--r-- | src/conftest/README | 7 | ||||
| -rw-r--r-- | src/conftest/config.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/conftest/README b/src/conftest/README index 133ae603c..617195df9 100644 --- a/src/conftest/README +++ b/src/conftest/README @@ -98,9 +98,10 @@ The IKE_SA configuration uses the following options (as key/value pairs): src/libstrongswan/crypt/proposal/proposal_keywords.txt fake_nat: Fake the NAT_DETECTION_*_IP payloads to simulate a NAT scenario - rsa_strength: connection requires a trustchain with RSA keys of given bits - ecdsa_strength: connection requires a trustchain with ECDSA keys of given bits - cert_policy: connection requries a certificate with the given OID policy + rsa_strength: Connection requires a trustchain with RSA keys of given bits + ecdsa_strength: Connection requires a trustchain with ECDSA keys of given bits + cert_policy: Connection requries a certificate with the given OID policy + named_pool: Name of an IP pool defined e.g. in a database backend The following CHILD_SA specific configuration options are supported: diff --git a/src/conftest/config.c b/src/conftest/config.c index 22c9d23e0..ae0d93460 100644 --- a/src/conftest/config.c +++ b/src/conftest/config.c @@ -244,7 +244,7 @@ static peer_cfg_t *load_peer_config(private_config_t *this, child_cfg_t *child_cfg; enumerator_t *enumerator; identification_t *lid, *rid; - char *child, *policy; + char *child, *policy, *pool; uintptr_t strength; ike_cfg = load_ike_config(this, settings, config); @@ -280,6 +280,11 @@ static peer_cfg_t *load_peer_config(private_config_t *this, } auth->add(auth, AUTH_RULE_IDENTITY, rid); peer_cfg->add_auth_cfg(peer_cfg, auth, FALSE); + pool = settings->get_str(settings, "configs.%s.named_pool", NULL, config); + if (pool) + { + peer_cfg->add_pool(peer_cfg, pool); + } DBG1(DBG_CFG, "loaded config %s: %Y - %Y", config, lid, rid); |