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/sa/ike_sa.c
+11 -14
View File
@@ -46,7 +46,6 @@
#include "ike_sa.h"
#include <library.h>
#include <hydra.h>
#include <daemon.h>
#include <collections/array.h>
#include <utils/lexparser.h>
@@ -803,12 +802,12 @@ METHOD(ike_sa_t, add_virtual_ip, void,
{
char *iface;
if (hydra->kernel_interface->get_interface(hydra->kernel_interface,
this->my_host, &iface))
if (charon->kernel->get_interface(charon->kernel, this->my_host,
&iface))
{
DBG1(DBG_IKE, "installing new virtual IP %H", ip);
if (hydra->kernel_interface->add_ip(hydra->kernel_interface,
ip, -1, iface) == SUCCESS)
if (charon->kernel->add_ip(charon->kernel, ip, -1,
iface) == SUCCESS)
{
array_insert_create(&this->my_vips, ARRAY_TAIL, ip->clone(ip));
}
@@ -845,8 +844,7 @@ METHOD(ike_sa_t, clear_virtual_ips, void,
{
if (local)
{
hydra->kernel_interface->del_ip(hydra->kernel_interface,
vip, -1, TRUE);
charon->kernel->del_ip(charon->kernel, vip, -1, TRUE);
}
vip->destroy(vip);
}
@@ -1282,8 +1280,8 @@ static void resolve_hosts(private_ike_sa_t *this)
!this->other_host->is_anyaddr(this->other_host))
{
host->destroy(host);
host = hydra->kernel_interface->get_source_addr(
hydra->kernel_interface, this->other_host, NULL);
host = charon->kernel->get_source_addr(charon->kernel,
this->other_host, NULL);
if (host)
{
host->set_port(host, this->ike_cfg->get_my_port(this->ike_cfg));
@@ -2084,8 +2082,8 @@ static bool is_current_path_valid(private_ike_sa_t *this)
{
bool valid = FALSE;
host_t *src;
src = hydra->kernel_interface->get_source_addr(hydra->kernel_interface,
this->other_host, this->my_host);
src = charon->kernel->get_source_addr(charon->kernel, this->other_host,
this->my_host);
if (src)
{
if (src->ip_equals(src, this->my_host))
@@ -2129,8 +2127,7 @@ static bool is_any_path_valid(private_ike_sa_t *this)
continue;
}
DBG1(DBG_IKE, "looking for a route to %H ...", addr);
src = hydra->kernel_interface->get_source_addr(
hydra->kernel_interface, addr, NULL);
src = charon->kernel->get_source_addr(charon->kernel, addr, NULL);
if (src)
{
break;
@@ -2418,7 +2415,7 @@ METHOD(ike_sa_t, destroy, void,
}
while (array_remove(this->my_vips, ARRAY_TAIL, &vip))
{
hydra->kernel_interface->del_ip(hydra->kernel_interface, vip, -1, TRUE);
charon->kernel->del_ip(charon->kernel, vip, -1, TRUE);
vip->destroy(vip);
}
if (array_count(this->other_vips))