diff options
| author | Martin Willi <martin@revosec.ch> | 2012-10-18 11:23:30 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-10-24 13:25:08 +0200 |
| commit | 1efd6c6f2a126094bf375c859eea5a5f04da8be0 (patch) | |
| tree | 14aef5559d96b60ffa1d18cb7999c7daf14d93f7 /src/conftest | |
| parent | fd6c0c8fb499a1d99b80cea30a2e6c00bc780f05 (diff) | |
| download | strongswan-1efd6c6f2a126094bf375c859eea5a5f04da8be0.tar.bz2 strongswan-1efd6c6f2a126094bf375c859eea5a5f04da8be0.tar.xz | |
Make use of new CIDR string ts constructor where appropriate
Diffstat (limited to 'src/conftest')
| -rw-r--r-- | src/conftest/config.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/conftest/config.c b/src/conftest/config.c index 6adb545c0..98f3dc433 100644 --- a/src/conftest/config.c +++ b/src/conftest/config.c @@ -143,9 +143,7 @@ static child_cfg_t *load_child_config(private_config_t *this, proposal_t *proposal; traffic_selector_t *ts; ipsec_mode_t mode = MODE_TUNNEL; - host_t *net; char *token; - int bits; u_int32_t tfc; if (settings->get_bool(settings, "configs.%s.%s.transport", @@ -189,10 +187,9 @@ static child_cfg_t *load_child_config(private_config_t *this, enumerator = enumerator_create_token(token, ",", " "); while (enumerator->enumerate(enumerator, &token)) { - net = host_create_from_subnet(token, &bits); - if (net) + ts = traffic_selector_create_from_cidr(token, 0, 0); + if (ts) { - ts = traffic_selector_create_from_subnet(net, bits, 0, 0); child_cfg->add_traffic_selector(child_cfg, TRUE, ts); } else @@ -214,10 +211,9 @@ static child_cfg_t *load_child_config(private_config_t *this, enumerator = enumerator_create_token(token, ",", " "); while (enumerator->enumerate(enumerator, &token)) { - net = host_create_from_subnet(token, &bits); - if (net) + ts = traffic_selector_create_from_cidr(token, 0, 0); + if (ts) { - ts = traffic_selector_create_from_subnet(net, bits, 0, 0); child_cfg->add_traffic_selector(child_cfg, FALSE, ts); } else |