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/libcharon/plugins/medcli/medcli_config.c | |
| 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/libcharon/plugins/medcli/medcli_config.c')
| -rw-r--r-- | src/libcharon/plugins/medcli/medcli_config.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/libcharon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c index 440d4dd4e..42c158231 100644 --- a/src/libcharon/plugins/medcli/medcli_config.c +++ b/src/libcharon/plugins/medcli/medcli_config.c @@ -61,28 +61,12 @@ static traffic_selector_t *ts_from_string(char *str) { if (str) { - int netbits = 32; - host_t *net; - char *pos; + traffic_selector_t *ts; - str = strdupa(str); - pos = strchr(str, '/'); - if (pos) + ts = traffic_selector_create_from_cidr(str, 0, 0); + if (ts) { - *pos++ = '\0'; - netbits = atoi(pos); - } - else - { - if (strchr(str, ':')) - { - netbits = 128; - } - } - net = host_create_from_string(str, 0); - if (net) - { - return traffic_selector_create_from_subnet(net, netbits, 0, 0); + return ts; } } return traffic_selector_create_dynamic(0, 0, 65535); |