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

starter: Use host_t to parse left|rightsourceip.

Browse Source 
Also for the yet unused natip option.
This commit is contained in:
Tobias Brunner
2012-06-11 17:33:31 +02:00
parent 0ac29be793
commit 6ce841b213
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/confread.c
+18 -19
View File
@@ -239,36 +239,35 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
} }
else else
{ {
host_t *host;
char *pos; char *pos;
ip_address addr;
ip_subnet net;
conn->tunnel_addr_family = ip_version(value);
pos = strchr(value, '/'); pos = strchr(value, '/');
if (pos) if (pos)
{ /* CIDR notation, address pool */ { /* CIDR notation, address pool */
ugh = ttosubnet(value, 0, conn->tunnel_addr_family, &net);
if (ugh != NULL)
{
DBG1(DBG_APP, "# bad subnet: %s=%s [%s]", name, value, ugh);
goto err;
}
*pos = '\0'; *pos = '\0';
host = host_create_from_string(value, 0);
if (!host)
{
DBG1(DBG_APP, "# bad subnet: %s=%s", name, value);
goto err;
}
host->destroy(host);
free(end->sourceip); free(end->sourceip);
end->sourceip = strdupnull(value); end->sourceip = strdupnull(value);
end->sourceip_mask = atoi(pos + 1); end->sourceip_mask = atoi(pos + 1);
} }
else else
{ /* fixed srcip */ { /* fixed srcip */
ugh = ttoaddr(value, 0, conn->tunnel_addr_family, &addr); host = host_create_from_string(value, 0);
if (ugh != NULL) if (!host)
{ {
DBG1(DBG_APP, "# bad addr: %s=%s [%s]", name, value, ugh); DBG1(DBG_APP, "# bad addr: %s=%s", name, value);
goto err; goto err;
} }
end->sourceip_mask = (conn->tunnel_addr_family == AF_INET) ? end->sourceip_mask = (host->get_family(host) == AF_INET) ?
32 : 128; 32 : 128;
host->destroy(host);
} }
} }
conn->mode = MODE_TUNNEL; conn->mode = MODE_TUNNEL;
@@ -300,19 +299,19 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
break; break;
case KW_NATIP: case KW_NATIP:
{ {
ip_address addr; host_t *host;
if (end->sourceip) if (end->sourceip)
{ {
DBG1(DBG_APP, "# natip and sourceip cannot be defined at the same time"); DBG1(DBG_APP, "# natip and sourceip cannot be defined at the same time");
goto err; goto err;
} }
conn->tunnel_addr_family = ip_version(value); host = host_create_from_string(value, 0);
ugh = ttoaddr(value, 0, conn->tunnel_addr_family, &addr); if (!host)
if (ugh != NULL)
{ {
DBG1(DBG_APP, "# bad addr: %s=%s [%s]", name, value, ugh); DBG1(DBG_APP, "# bad addr: %s=%s", name, value);
goto err; goto err;
} }
host->destroy(host);
end->sourceip = strdupnull(value); end->sourceip = strdupnull(value);
end->has_natip = TRUE; end->has_natip = TRUE;
conn->mode = MODE_TUNNEL; conn->mode = MODE_TUNNEL;