libhydra: Move kernel interface to libcharon

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
+1 -3
View File
@@ -16,7 +16,6 @@
#include "stroke_config.h"
#include <hydra.h>
#include <daemon.h>
#include <threading/mutex.h>
#include <utils/lexparser.h>
@@ -201,8 +200,7 @@ static bool is_local(char *address, bool any_allowed)
host = host_create_from_dns(token, 0, 0);
if (host)
{
if (hydra->kernel_interface->get_interface(
hydra->kernel_interface, host, NULL))
if (charon->kernel->get_interface(charon->kernel, host, NULL))
{
found = TRUE;
}
@@ -16,7 +16,6 @@
#include "stroke_control.h"
#include <hydra.h>
#include <daemon.h>
#include <processing/jobs/delete_ike_sa_job.h>
+2 -3
View File
@@ -26,7 +26,6 @@
#include <malloc.h>
#endif /* HAVE_MALLINFO */
#include <hydra.h>
#include <daemon.h>
#include <collections/linked_list.h>
#include <plugins/plugin.h>
@@ -533,8 +532,8 @@ METHOD(stroke_list_t, status, void,
}
enumerator->destroy(enumerator);
enumerator = hydra->kernel_interface->create_address_enumerator(
hydra->kernel_interface, ADDR_TYPE_REGULAR);
enumerator = charon->kernel->create_address_enumerator(charon->kernel,
ADDR_TYPE_REGULAR);
fprintf(out, "Listening IP addresses:\n");
while (enumerator->enumerate(enumerator, (void**)&host))
{