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

libhydra: Move kernel interface to libcharon

Browse Source 
This moves hydra->kernel_interface to charon->kernel.
This commit is contained in:
Tobias Brunner
2016-03-03 17:36:11 +01:00
parent dec9e1957f
commit 8394ea2a42
69 changed files with 257 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c
+10 -15
View File
@@ -20,7 +20,6 @@
#include "kernel_wfp_ipsec.h"
#include <daemon.h>
#include <hydra.h>
#include <threading/mutex.h>
#include <collections/array.h>
#include <collections/hashtable.h>
@@ -1396,10 +1395,9 @@ static bool uninstall_route(private_kernel_wfp_ipsec_t *this,
{
if (--route->refs == 0)
{
if (hydra->kernel_interface->get_interface(hydra->kernel_interface,
src, &name))
if (charon->kernel->get_interface(charon->kernel, src, &name))
{
res = hydra->kernel_interface->del_route(hydra->kernel_interface,
res = charon->kernel->del_route(charon->kernel,
dst->get_address(dst), mask, gtw, src, name) == SUCCESS;
free(name);
}
@@ -1442,10 +1440,9 @@ static bool install_route(private_kernel_wfp_ipsec_t *this,
}
else
{
if (hydra->kernel_interface->get_interface(hydra->kernel_interface,
src, &name))
if (charon->kernel->get_interface(charon->kernel, src, &name))
{
if (hydra->kernel_interface->add_route(hydra->kernel_interface,
if (charon->kernel->add_route(charon->kernel,
dst->get_address(dst), mask, gtw, src, name) == SUCCESS)
{
INIT(route,
@@ -1486,14 +1483,13 @@ static bool manage_route(private_kernel_wfp_ipsec_t *this,
{
return FALSE;
}
if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface,
src_ts, &src, NULL) != SUCCESS)
if (charon->kernel->get_address_by_ts(charon->kernel, src_ts, &src,
NULL) != SUCCESS)
{
dst->destroy(dst);
return FALSE;
}
gtw = hydra->kernel_interface->get_nexthop(hydra->kernel_interface,
remote, -1, local);
gtw = charon->kernel->get_nexthop(charon->kernel, remote, -1, local);
if (add)
{
done = install_route(this, dst, mask, src, gtw);
@@ -1650,8 +1646,7 @@ static void acquire(private_kernel_wfp_ipsec_t *this, UINT64 filter_id,
{
src = src ? src->clone(src) : NULL;
dst = dst ? dst->clone(dst) : NULL;
hydra->kernel_interface->acquire(hydra->kernel_interface, reqid,
src, dst);
charon->kernel->acquire(charon->kernel, reqid, src, dst);
}
}
@@ -2069,8 +2064,8 @@ static job_requeue_t expire_job(expire_data_t *data)
if (entry)
{
hydra->kernel_interface->expire(hydra->kernel_interface, protocol,
data->spi, data->dst, data->hard);
charon->kernel->expire(charon->kernel, protocol, data->spi, data->dst,
data->hard);
}
return JOB_REQUEUE_NONE;