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

kernel-wfp: Refactor route management to separate function

Browse Source
This commit is contained in:
Martin Willi
2014-06-04 16:32:11 +02:00
parent 4a8ba369b6
commit e36d1d4124
1 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
+47 -39
View File
@@ -1325,6 +1325,50 @@ static bool install_route(private_kernel_wfp_ipsec_t *this,
return res;
}
/**
* (Un)-install a single route
*/
static bool manage_route(private_kernel_wfp_ipsec_t *this,
host_t *local, host_t *remote,
traffic_selector_t *src_ts, traffic_selector_t *dst_ts,
bool add)
{
host_t *src, *dst, *gtw;
u_int8_t mask;
bool done;
if (!dst_ts->to_subnet(dst_ts, &dst, &mask))
{
return FALSE;
}
if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface,
src_ts, &src, NULL) != SUCCESS)
{
dst->destroy(dst);
return FALSE;
}
gtw = hydra->kernel_interface->get_nexthop(hydra->kernel_interface,
remote, local);
if (add)
{
done = install_route(this, dst, mask, src, gtw);
}
else
{
done = uninstall_route(this, dst, mask, src, gtw);
}
dst->destroy(dst);
src->destroy(src);
DESTROY_IF(gtw);
if (!done)
{
DBG1(DBG_KNL, "%sinstalling route for policy %R === %R failed",
add ? "" : "un", src_ts, dst_ts);
}
return done;
}
/**
* (Un)-install routes for IPsec policies
*/
@@ -1332,9 +1376,7 @@ static bool manage_routes(private_kernel_wfp_ipsec_t *this, entry_t *entry,
bool add)
{
enumerator_t *enumerator;
host_t *src, *dst, *gtw;
sp_entry_t *sp;
u_int8_t mask;
enumerator = array_create_enumerator(entry->sps);
while (enumerator->enumerate(enumerator, &sp))
@@ -1347,45 +1389,11 @@ static bool manage_routes(private_kernel_wfp_ipsec_t *this, entry_t *entry,
{
continue;
}
if (!sp->dst->to_subnet(sp->dst, &dst, &mask))
if (manage_route(this, entry->local, entry->remote,
sp->src, sp->dst, add))
{
continue;
sp->route = add;
}
if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface,
sp->src, &src, NULL) != SUCCESS)
{
dst->destroy(dst);
continue;
}
gtw = hydra->kernel_interface->get_nexthop(hydra->kernel_interface,
entry->remote, entry->local);
if (add)
{
if (install_route(this, dst, mask, src, gtw))
{
sp->route = TRUE;
}
else
{
DBG1(DBG_KNL, "installing route for policy %R === %R failed",
sp->src, sp->dst);
}
}
else
{
if (uninstall_route(this, dst, mask, src, gtw))
{
sp->route = FALSE;
}
else
{
DBG1(DBG_KNL, "uninstalling route for policy %R === %R failed",
sp->src, sp->dst);
}
}
dst->destroy(dst);
src->destroy(src);
DESTROY_IF(gtw);
}
enumerator->destroy(enumerator);