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

Make use of new CIDR string ts constructor where appropriate

Browse Source
This commit is contained in:
Martin Willi
2012-10-24 13:25:08 +02:00
parent fd6c0c8fb4
commit 1efd6c6f2a
4 changed files with 23 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conftest/config.c
+4 -8
View File
@@ -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
src/libcharon/plugins/medcli/medcli_config.c
+4 -20
View File
@@ -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);
src/libcharon/plugins/stroke/stroke_config.c
+11 -26
View File
@@ -881,10 +881,10 @@ static void add_ts(private_stroke_config_t *this,
}
else
{
host_t *net;
if (!end->subnets)
{
host_t *net;
net = host_create_from_string(end->address, 0);
if (net)
{
@@ -895,39 +895,24 @@ static void add_ts(private_stroke_config_t *this,
}
else
{
char *del, *start, *bits;
enumerator_t *enumerator;
char *subnet;
start = end->subnets;
do
enumerator = enumerator_create_token(end->subnets, ",", " ");
while (enumerator->enumerate(enumerator, &subnet))
{
int intbits = 0;
del = strchr(start, ',');
if (del)
ts = traffic_selector_create_from_cidr(subnet,
end->protocol, end->port);
if (ts)
{
*del = '\0';
}
bits = strchr(start, '/');
if (bits)
{
*bits = '\0';
intbits = atoi(bits + 1);
}
net = host_create_from_string(start, 0);
if (net)
{
ts = traffic_selector_create_from_subnet(net, intbits,
end->protocol, end->port);
child_cfg->add_traffic_selector(child_cfg, local, ts);
}
else
{
DBG1(DBG_CFG, "invalid subnet: %s, skipped", start);
DBG1(DBG_CFG, "invalid subnet: %s, skipped", subnet);
}
start = del + 1;
}
while (del);
enumerator->destroy(enumerator);
}
}
}
src/libcharon/plugins/uci/uci_config.c
+4 -20
View File
@@ -87,28 +87,12 @@ static traffic_selector_t *create_ts(char *string)
{
if (string)
{
int netbits = 32;
host_t *net;
char *pos;
traffic_selector_t *ts;
string = strdupa(string);
pos = strchr(string, '/');
if (pos)
ts = traffic_selector_create_from_cidr(string, 0, 0);
if (ts)
{
*pos++ = '\0';
netbits = atoi(pos);
}
else
{
if (strchr(string, ':'))
{
netbits = 128;
}
}
net = host_create_from_string(string, 0);
if (net)
{
return traffic_selector_create_from_subnet(net, netbits, 0, 0);
return ts;
}
}
return traffic_selector_create_dynamic(0, 0, 65535);