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

kernel-pfkey: Provide interface name when installing exclude route

Browse Source
This commit is contained in:
Tobias Brunner
2013-07-17 17:45:18 +02:00
parent 0745f846d0
commit 8afd0f05e3
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+15 -4
View File
@@ -1993,10 +1993,14 @@ static void add_exclude_route(private_kernel_pfkey_ipsec_t *this,
dst, NULL); dst, NULL);
if (gtw) if (gtw)
{ {
if (hydra->kernel_interface->add_route(hydra->kernel_interface, char *if_name = NULL;
if (hydra->kernel_interface->get_interface(
hydra->kernel_interface, src, &if_name) &&
hydra->kernel_interface->add_route(hydra->kernel_interface,
dst->get_address(dst), dst->get_address(dst),
dst->get_family(dst) == AF_INET ? 32 : 128, dst->get_family(dst) == AF_INET ? 32 : 128,
gtw, src, NULL) == SUCCESS) gtw, src, if_name) == SUCCESS)
{ {
INIT(exclude, INIT(exclude,
.dst = dst->clone(dst), .dst = dst->clone(dst),
@@ -2012,6 +2016,7 @@ static void add_exclude_route(private_kernel_pfkey_ipsec_t *this,
DBG1(DBG_KNL, "installing exclude route for %H failed", dst); DBG1(DBG_KNL, "installing exclude route for %H failed", dst);
} }
gtw->destroy(gtw); gtw->destroy(gtw);
free(if_name);
} }
else else
{ {
@@ -2050,18 +2055,24 @@ static void remove_exclude_route(private_kernel_pfkey_ipsec_t *this,
if (removed) if (removed)
{ {
char *if_name = NULL;
dst = route->exclude->dst; dst = route->exclude->dst;
DBG2(DBG_KNL, "uninstalling exclude route for %H src %H", DBG2(DBG_KNL, "uninstalling exclude route for %H src %H",
dst, route->exclude->src); dst, route->exclude->src);
if (hydra->kernel_interface->del_route(hydra->kernel_interface, if (hydra->kernel_interface->get_interface(
hydra->kernel_interface,
route->exclude->src, &if_name) &&
hydra->kernel_interface->del_route(hydra->kernel_interface,
dst->get_address(dst), dst->get_address(dst),
dst->get_family(dst) == AF_INET ? 32 : 128, dst->get_family(dst) == AF_INET ? 32 : 128,
route->exclude->gtw, route->exclude->src, route->exclude->gtw, route->exclude->src,
NULL) != SUCCESS) if_name) != SUCCESS)
{ {
DBG1(DBG_KNL, "uninstalling exclude route for %H failed", dst); DBG1(DBG_KNL, "uninstalling exclude route for %H failed", dst);
} }
exclude_route_destroy(route->exclude); exclude_route_destroy(route->exclude);
free(if_name);
} }
route->exclude = NULL; route->exclude = NULL;
} }