libhydra: Move kernel interface to libcharon
This moves hydra->kernel_interface to charon->kernel.
This commit is contained in:
parent
dec9e1957f
commit
8394ea2a42
|
@ -14,7 +14,7 @@
|
|||
* for more details.
|
||||
*/
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <utils/debug.h>
|
||||
#include <tkm/constants.h>
|
||||
#include <tkm/types.h>
|
||||
|
@ -25,8 +25,7 @@
|
|||
void charon_esa_acquire(result_type *res, const sp_id_type sp_id)
|
||||
{
|
||||
DBG1(DBG_KNL, "ees: acquire received for reqid %u", sp_id);
|
||||
hydra->kernel_interface->acquire(hydra->kernel_interface, sp_id, NULL,
|
||||
NULL);
|
||||
charon->kernel->acquire(charon->kernel, sp_id, NULL, NULL);
|
||||
*res = TKM_OK;
|
||||
}
|
||||
|
||||
|
@ -47,6 +46,5 @@ void charon_esa_expire(result_type *res, const sp_id_type sp_id,
|
|||
|
||||
DBG1(DBG_KNL, "ees: expire received for reqid %u, spi %x, dst %H", sp_id,
|
||||
ntohl(spi_rem), dst);
|
||||
hydra->kernel_interface->expire(hydra->kernel_interface, protocol,
|
||||
spi_rem, dst, hard != 0);
|
||||
charon->kernel->expire(charon->kernel, protocol, spi_rem, dst, hard != 0);
|
||||
}
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include <tests/test_suite.h>
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <config/proposal.h>
|
||||
#include <encoding/payloads/ike_header.h>
|
||||
#include <tkm/client.h>
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#define CONFTEST_H_
|
||||
|
||||
#include <library.h>
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <credentials/sets/mem_cred.h>
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "android_attr.h"
|
||||
#include "../charonservice.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <utils/debug.h>
|
||||
#include <library.h>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "android_dns_proxy.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/rwlock.h>
|
||||
#include <collections/hashtable.h>
|
||||
#include <processing/jobs/callback_job.h>
|
||||
|
@ -121,8 +121,7 @@ static int open_socket(int family)
|
|||
DBG1(DBG_NET, "could not open proxy socket: %s", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
|
||||
skt, family))
|
||||
if (!charon->kernel->bypass_socket(charon->kernel, skt, family))
|
||||
{
|
||||
DBG1(DBG_NET, "installing bypass policy for proxy socket failed");
|
||||
close(skt);
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <utils/debug.h>
|
||||
#include <library.h>
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <ipsec.h>
|
||||
|
||||
typedef struct private_kernel_android_ipsec_t private_kernel_android_ipsec_t;
|
||||
|
@ -42,8 +42,7 @@ struct private_kernel_android_ipsec_t {
|
|||
*/
|
||||
static void expire(u_int8_t protocol, u_int32_t spi, host_t *dst, bool hard)
|
||||
{
|
||||
hydra->kernel_interface->expire(hydra->kernel_interface, protocol,
|
||||
spi, dst, hard);
|
||||
charon->kernel->expire(charon->kernel, protocol, spi, dst, hard);
|
||||
}
|
||||
|
||||
METHOD(kernel_ipsec_t, get_spi, status_t,
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "../android_jni.h"
|
||||
#include "../charonservice.h"
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <processing/jobs/callback_job.h>
|
||||
#include <threading/mutex.h>
|
||||
|
||||
|
@ -75,7 +75,7 @@ static job_requeue_t roam_event()
|
|||
{
|
||||
/* this will fail if no connection is up */
|
||||
charonservice->bypass_socket(charonservice, -1, 0);
|
||||
hydra->kernel_interface->roam(hydra->kernel_interface, TRUE);
|
||||
charon->kernel->roam(charon->kernel, TRUE);
|
||||
return JOB_REQUEUE_NONE;
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,10 @@ encoding/payloads/unknown_payload.c encoding/payloads/unknown_payload.h \
|
|||
encoding/payloads/vendor_id_payload.c encoding/payloads/vendor_id_payload.h \
|
||||
encoding/payloads/hash_payload.c encoding/payloads/hash_payload.h \
|
||||
encoding/payloads/fragment_payload.c encoding/payloads/fragment_payload.h \
|
||||
kernel/kernel_handler.c kernel/kernel_handler.h \
|
||||
kernel/kernel_interface.c kernel/kernel_interface.h \
|
||||
kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
|
||||
kernel/kernel_net.c kernel/kernel_net.h \
|
||||
kernel/kernel_listener.h kernel/kernel_handler.c kernel/kernel_handler.h \
|
||||
network/receiver.c network/receiver.h network/sender.c network/sender.h \
|
||||
network/socket.c network/socket.h \
|
||||
network/socket_manager.c network/socket_manager.h \
|
||||
|
|
|
@ -46,7 +46,10 @@ encoding/payloads/unknown_payload.c encoding/payloads/unknown_payload.h \
|
|||
encoding/payloads/vendor_id_payload.c encoding/payloads/vendor_id_payload.h \
|
||||
encoding/payloads/hash_payload.c encoding/payloads/hash_payload.h \
|
||||
encoding/payloads/fragment_payload.c encoding/payloads/fragment_payload.h \
|
||||
kernel/kernel_handler.c kernel/kernel_handler.h \
|
||||
kernel/kernel_interface.c kernel/kernel_interface.h \
|
||||
kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
|
||||
kernel/kernel_net.c kernel/kernel_net.h \
|
||||
kernel/kernel_listener.h kernel/kernel_handler.c kernel/kernel_handler.h \
|
||||
network/receiver.c network/receiver.h network/sender.c network/sender.h \
|
||||
network/socket.c network/socket.h \
|
||||
network/socket_manager.c network/socket_manager.h \
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "mem_pool.h"
|
||||
|
||||
#include <library.h>
|
||||
#include <hydra.h>
|
||||
#include <utils/debug.h>
|
||||
#include <collections/hashtable.h>
|
||||
#include <collections/array.h>
|
||||
|
|
|
@ -685,6 +685,7 @@ static void destroy(private_daemon_t *this)
|
|||
DESTROY_IF(this->public.xauth);
|
||||
DESTROY_IF(this->public.backends);
|
||||
DESTROY_IF(this->public.socket);
|
||||
DESTROY_IF(this->public.kernel);
|
||||
|
||||
/* rehook library logging, shutdown logging */
|
||||
dbg = dbg_old;
|
||||
|
@ -862,6 +863,7 @@ private_daemon_t *daemon_create()
|
|||
.ref = 1,
|
||||
);
|
||||
charon = &this->public;
|
||||
this->public.kernel = kernel_interface_create();
|
||||
this->public.attributes = attribute_manager_create();
|
||||
this->public.controller = controller_create();
|
||||
this->public.eap = eap_manager_create();
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
* @defgroup payloads payloads
|
||||
* @ingroup encoding
|
||||
*
|
||||
* @defgroup ckernel kernel
|
||||
* @defgroup kernel kernel
|
||||
* @ingroup libcharon
|
||||
*
|
||||
* @defgroup network network
|
||||
|
@ -179,6 +179,7 @@
|
|||
typedef struct daemon_t daemon_t;
|
||||
|
||||
#include <attributes/attribute_manager.h>
|
||||
#include <kernel/kernel_interface.h>
|
||||
#include <network/sender.h>
|
||||
#include <network/receiver.h>
|
||||
#include <network/socket_manager.h>
|
||||
|
@ -238,6 +239,11 @@ struct daemon_t {
|
|||
*/
|
||||
socket_manager_t *socket;
|
||||
|
||||
/**
|
||||
* Kernel interface to communicate with kernel
|
||||
*/
|
||||
kernel_interface_t *kernel;
|
||||
|
||||
/**
|
||||
* A ike_sa_manager_t instance.
|
||||
*/
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
#include "kernel_handler.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <processing/jobs/acquire_job.h>
|
||||
#include <processing/jobs/delete_child_sa_job.h>
|
||||
|
@ -135,8 +134,7 @@ METHOD(kernel_listener_t, roam, bool,
|
|||
METHOD(kernel_handler_t, destroy, void,
|
||||
private_kernel_handler_t *this)
|
||||
{
|
||||
hydra->kernel_interface->remove_listener(hydra->kernel_interface,
|
||||
&this->public.listener);
|
||||
charon->kernel->remove_listener(charon->kernel, &this->public.listener);
|
||||
free(this);
|
||||
}
|
||||
|
||||
|
@ -157,8 +155,7 @@ kernel_handler_t *kernel_handler_create()
|
|||
},
|
||||
);
|
||||
|
||||
hydra->kernel_interface->add_listener(hydra->kernel_interface,
|
||||
&this->public.listener);
|
||||
charon->kernel->add_listener(charon->kernel, &this->public.listener);
|
||||
|
||||
return &this->public;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
/**
|
||||
* @defgroup kernel_handler kernel_handler
|
||||
* @{ @ingroup ckernel
|
||||
* @{ @ingroup kernel
|
||||
*/
|
||||
|
||||
#ifndef KERNEL_HANDLER_H_
|
||||
|
|
|
@ -39,7 +39,6 @@
|
|||
|
||||
#include "kernel_interface.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <utils/debug.h>
|
||||
#include <threading/mutex.h>
|
||||
#include <collections/linked_list.h>
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
/**
|
||||
* @defgroup kernel_interface kernel_interface
|
||||
* @{ @ingroup hkernel
|
||||
* @{ @ingroup kernel
|
||||
*/
|
||||
|
||||
#ifndef KERNEL_INTERFACE_H_
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "kernel_ipsec.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
|
||||
/**
|
||||
* See header
|
||||
|
@ -25,14 +25,12 @@ bool kernel_ipsec_register(plugin_t *plugin, plugin_feature_t *feature,
|
|||
{
|
||||
if (reg)
|
||||
{
|
||||
return hydra->kernel_interface->add_ipsec_interface(
|
||||
hydra->kernel_interface,
|
||||
return charon->kernel->add_ipsec_interface(charon->kernel,
|
||||
(kernel_ipsec_constructor_t)data);
|
||||
}
|
||||
else
|
||||
{
|
||||
return hydra->kernel_interface->remove_ipsec_interface(
|
||||
hydra->kernel_interface,
|
||||
return charon->kernel->remove_ipsec_interface(charon->kernel,
|
||||
(kernel_ipsec_constructor_t)data);
|
||||
}
|
||||
}
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
/**
|
||||
* @defgroup kernel_ipsec kernel_ipsec
|
||||
* @{ @ingroup hkernel
|
||||
* @{ @ingroup kernel
|
||||
*/
|
||||
|
||||
#ifndef KERNEL_IPSEC_H_
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
/**
|
||||
* @defgroup kernel_listener kernel_listener
|
||||
* @{ @ingroup hkernel
|
||||
* @{ @ingroup kernel
|
||||
*/
|
||||
|
||||
#ifndef KERNEL_LISTENER_H_
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "kernel_net.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
|
||||
/**
|
||||
* See header
|
||||
|
@ -25,14 +25,12 @@ bool kernel_net_register(plugin_t *plugin, plugin_feature_t *feature,
|
|||
{
|
||||
if (reg)
|
||||
{
|
||||
return hydra->kernel_interface->add_net_interface(
|
||||
hydra->kernel_interface,
|
||||
return charon->kernel->add_net_interface(charon->kernel,
|
||||
(kernel_net_constructor_t)data);
|
||||
}
|
||||
else
|
||||
{
|
||||
return hydra->kernel_interface->remove_net_interface(
|
||||
hydra->kernel_interface,
|
||||
return charon->kernel->remove_net_interface(charon->kernel,
|
||||
(kernel_net_constructor_t)data);
|
||||
}
|
||||
}
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
/**
|
||||
* @defgroup kernel_net kernel_net
|
||||
* @{ @ingroup hkernel
|
||||
* @{ @ingroup kernel
|
||||
*/
|
||||
|
||||
#ifndef KERNEL_NET_H_
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include "receiver.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <network/socket.h>
|
||||
#include <processing/jobs/job.h>
|
||||
|
@ -451,9 +450,8 @@ static job_requeue_t receive_packets(private_receiver_t *this)
|
|||
|
||||
dst = packet->get_destination(packet);
|
||||
src = packet->get_source(packet);
|
||||
if (!hydra->kernel_interface->all_interfaces_usable(hydra->kernel_interface)
|
||||
&& !hydra->kernel_interface->get_interface(hydra->kernel_interface,
|
||||
dst, NULL))
|
||||
if (!charon->kernel->all_interfaces_usable(charon->kernel)
|
||||
&& !charon->kernel->get_interface(charon->kernel, dst, NULL))
|
||||
{
|
||||
DBG3(DBG_NET, "received packet from %#H to %#H on ignored interface",
|
||||
src, dst);
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include <threading/condvar.h>
|
||||
#include <threading/thread.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <processing/jobs/callback_job.h>
|
||||
|
||||
|
@ -209,8 +208,7 @@ static int prepare_dhcp(private_dhcp_socket_t *this,
|
|||
else
|
||||
{
|
||||
/* act as relay agent */
|
||||
src = hydra->kernel_interface->get_source_addr(hydra->kernel_interface,
|
||||
this->dst, NULL);
|
||||
src = charon->kernel->get_source_addr(charon->kernel, this->dst, NULL);
|
||||
if (src)
|
||||
{
|
||||
memcpy(&dhcp->gateway_address, src->get_address(src).ptr,
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include <ifaddrs.h>
|
||||
#include <net/if.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/thread.h>
|
||||
#include <processing/jobs/callback_job.h>
|
||||
|
@ -428,8 +427,7 @@ METHOD(forecast_forwarder_t, destroy, void,
|
|||
lib->watcher->remove(lib->watcher, this->kernel.pkt);
|
||||
close(this->kernel.pkt);
|
||||
}
|
||||
hydra->kernel_interface->remove_listener(hydra->kernel_interface,
|
||||
&this->kernel.listener);
|
||||
charon->kernel->remove_listener(charon->kernel, &this->kernel.listener);
|
||||
free(this);
|
||||
}
|
||||
|
||||
|
@ -486,8 +484,8 @@ forecast_forwarder_t *forecast_forwarder_create(forecast_listener_t *listener)
|
|||
|
||||
setup_interface(&this->kernel);
|
||||
|
||||
hydra->kernel_interface->add_listener(hydra->kernel_interface,
|
||||
&this->kernel.listener);
|
||||
charon->kernel->add_listener(charon->kernel,
|
||||
&this->kernel.listener);
|
||||
|
||||
lib->watcher->add(lib->watcher, this->kernel.pkt, WATCHER_READ,
|
||||
(watcher_cb_t)receive_casts, this);
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "kernel_iph_net.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/mutex.h>
|
||||
#include <collections/linked_list.h>
|
||||
#include <processing/jobs/callback_job.h>
|
||||
|
@ -130,7 +130,7 @@ static job_requeue_t roam_event(private_kernel_iph_net_t *this)
|
|||
this->roam_address = FALSE;
|
||||
this->mutex->unlock(this->mutex);
|
||||
|
||||
hydra->kernel_interface->roam(hydra->kernel_interface, address);
|
||||
charon->kernel->roam(charon->kernel, address);
|
||||
return JOB_REQUEUE_NONE;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,8 +17,6 @@
|
|||
#include "kernel_iph_plugin.h"
|
||||
#include "kernel_iph_net.h"
|
||||
|
||||
#include <hydra.h>
|
||||
|
||||
typedef struct private_kernel_iph_plugin_t private_kernel_iph_plugin_t;
|
||||
|
||||
/**
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include <library.h>
|
||||
#include <ipsec.h>
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <networking/tun_device.h>
|
||||
#include <threading/mutex.h>
|
||||
#include <utils/debug.h>
|
||||
|
@ -224,8 +224,7 @@ static inline bool policy_entry_equals(policy_entry_t *a,
|
|||
*/
|
||||
static void expire(u_int8_t protocol, u_int32_t spi, host_t *dst, bool hard)
|
||||
{
|
||||
hydra->kernel_interface->expire(hydra->kernel_interface, protocol,
|
||||
spi, dst, hard);
|
||||
charon->kernel->expire(charon->kernel, protocol, spi, dst, hard);
|
||||
}
|
||||
|
||||
METHOD(kernel_ipsec_t, get_features, kernel_feature_t,
|
||||
|
@ -313,16 +312,13 @@ static void add_exclude_route(private_kernel_libipsec_ipsec_t *this,
|
|||
if (!route->exclude)
|
||||
{
|
||||
DBG2(DBG_KNL, "installing new exclude route for %H src %H", dst, src);
|
||||
gtw = hydra->kernel_interface->get_nexthop(hydra->kernel_interface,
|
||||
dst, -1, NULL);
|
||||
gtw = charon->kernel->get_nexthop(charon->kernel, dst, -1, NULL);
|
||||
if (gtw)
|
||||
{
|
||||
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),
|
||||
if (charon->kernel->get_interface(charon->kernel, src, &if_name) &&
|
||||
charon->kernel->add_route(charon->kernel, dst->get_address(dst),
|
||||
dst->get_family(dst) == AF_INET ? 32 : 128,
|
||||
gtw, src, if_name) == SUCCESS)
|
||||
{
|
||||
|
@ -367,14 +363,12 @@ static void remove_exclude_route(private_kernel_libipsec_ipsec_t *this,
|
|||
dst = route->exclude->dst;
|
||||
DBG2(DBG_KNL, "uninstalling exclude route for %H src %H",
|
||||
dst, route->exclude->src);
|
||||
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_family(dst) == AF_INET ? 32 : 128,
|
||||
route->exclude->gtw, route->exclude->src,
|
||||
if_name) != SUCCESS)
|
||||
if (charon->kernel->get_interface(charon->kernel, route->exclude->src,
|
||||
&if_name) &&
|
||||
charon->kernel->del_route(charon->kernel, dst->get_address(dst),
|
||||
dst->get_family(dst) == AF_INET ? 32 : 128,
|
||||
route->exclude->gtw, route->exclude->src,
|
||||
if_name) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_KNL, "uninstalling exclude route for %H failed", dst);
|
||||
}
|
||||
|
@ -402,8 +396,8 @@ static bool install_route(private_kernel_libipsec_ipsec_t *this,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface,
|
||||
src_ts, &src_ip, &is_virtual) != SUCCESS)
|
||||
if (charon->kernel->get_address_by_ts(charon->kernel, src_ts, &src_ip,
|
||||
&is_virtual) != SUCCESS)
|
||||
{
|
||||
traffic_selector_t *multicast, *broadcast = NULL;
|
||||
bool ignore = FALSE;
|
||||
|
@ -444,8 +438,7 @@ static bool install_route(private_kernel_libipsec_ipsec_t *this,
|
|||
);
|
||||
#ifndef __linux__
|
||||
/* on Linux we cant't install a gateway */
|
||||
route->gateway = hydra->kernel_interface->get_nexthop(
|
||||
hydra->kernel_interface, dst, -1, src);
|
||||
route->gateway = charon->kernel->get_nexthop(charon->kernel, dst, -1, src);
|
||||
#endif
|
||||
|
||||
if (policy->route)
|
||||
|
@ -459,9 +452,9 @@ static bool install_route(private_kernel_libipsec_ipsec_t *this,
|
|||
return TRUE;
|
||||
}
|
||||
/* uninstall previously installed route */
|
||||
if (hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
old->dst_net, old->prefixlen, old->gateway,
|
||||
old->src_ip, old->if_name) != SUCCESS)
|
||||
if (charon->kernel->del_route(charon->kernel, old->dst_net,
|
||||
old->prefixlen, old->gateway,
|
||||
old->src_ip, old->if_name) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_KNL, "error uninstalling route installed with policy "
|
||||
"%R === %R %N", src_ts, dst_ts, policy_dir_names,
|
||||
|
@ -490,9 +483,9 @@ static bool install_route(private_kernel_libipsec_ipsec_t *this,
|
|||
DBG2(DBG_KNL, "installing route: %R src %H dev %s",
|
||||
dst_ts, route->src_ip, route->if_name);
|
||||
|
||||
switch (hydra->kernel_interface->add_route(hydra->kernel_interface,
|
||||
route->dst_net, route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name))
|
||||
switch (charon->kernel->add_route(charon->kernel, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name))
|
||||
{
|
||||
case ALREADY_DONE:
|
||||
/* route exists, do not uninstall */
|
||||
|
@ -598,9 +591,9 @@ METHOD(kernel_ipsec_t, del_policy, status_t,
|
|||
{
|
||||
route_entry_t *route = policy->route;
|
||||
|
||||
if (hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
route->dst_net, route->prefixlen, route->gateway, route->src_ip,
|
||||
route->if_name) != SUCCESS)
|
||||
if (charon->kernel->del_route(charon->kernel, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_KNL, "error uninstalling route installed with "
|
||||
"policy %R === %R %N", src_ts, dst_ts,
|
||||
|
@ -629,9 +622,9 @@ METHOD(kernel_ipsec_t, flush_policies, status_t,
|
|||
{
|
||||
route_entry_t *route = pol->route;
|
||||
|
||||
hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
route->dst_net, route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name);
|
||||
charon->kernel->del_route(charon->kernel, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name);
|
||||
remove_exclude_route(this, route);
|
||||
}
|
||||
policy_entry_destroy(pol);
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include "kernel_libipsec_router.h"
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <ipsec.h>
|
||||
#include <collections/hashtable.h>
|
||||
#include <networking/tun_device.h>
|
||||
|
@ -298,8 +297,7 @@ METHOD(kernel_libipsec_router_t, destroy, void,
|
|||
(ipsec_outbound_cb_t)send_esp);
|
||||
ipsec->processor->unregister_inbound(ipsec->processor,
|
||||
(ipsec_inbound_cb_t)deliver_plain);
|
||||
hydra->kernel_interface->remove_listener(hydra->kernel_interface,
|
||||
&this->public.listener);
|
||||
charon->kernel->remove_listener(charon->kernel, &this->public.listener);
|
||||
this->lock->destroy(this->lock);
|
||||
this->tuns->destroy(this->tuns);
|
||||
close(this->notify[0]);
|
||||
|
@ -351,8 +349,7 @@ kernel_libipsec_router_t *kernel_libipsec_router_create()
|
|||
(hashtable_equals_t)tun_entry_equals, 4);
|
||||
this->lock = rwlock_create(RWLOCK_TYPE_DEFAULT);
|
||||
|
||||
hydra->kernel_interface->add_listener(hydra->kernel_interface,
|
||||
&this->public.listener);
|
||||
charon->kernel->add_listener(charon->kernel, &this->public.listener);
|
||||
ipsec->processor->register_outbound(ipsec->processor, send_esp, NULL);
|
||||
ipsec->processor->register_inbound(ipsec->processor,
|
||||
(ipsec_inbound_cb_t)deliver_plain, this);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
AM_CPPFLAGS = \
|
||||
-I${linux_headers} \
|
||||
-I$(top_srcdir)/src/libstrongswan \
|
||||
-I$(top_srcdir)/src/libhydra \
|
||||
-I$(top_srcdir)/src/libcharon \
|
||||
-DROUTING_TABLE=${routing_table} \
|
||||
-DROUTING_TABLE_PRIO=${routing_table_prio}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "kernel_netlink_ipsec.h"
|
||||
#include "kernel_netlink_shared.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <utils/debug.h>
|
||||
#include <threading/mutex.h>
|
||||
#include <collections/array.h>
|
||||
|
@ -262,8 +262,8 @@ static char* lookup_algorithm(transform_type_t type, int ikev2)
|
|||
return list[i].name;
|
||||
}
|
||||
}
|
||||
if (hydra->kernel_interface->lookup_algorithm(hydra->kernel_interface,
|
||||
ikev2, type, NULL, &name))
|
||||
if (charon->kernel->lookup_algorithm(charon->kernel, ikev2, type, NULL,
|
||||
&name))
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
@ -856,8 +856,7 @@ static void process_acquire(private_kernel_netlink_ipsec_t *this,
|
|||
src_ts = selector2ts(&acquire->sel, TRUE);
|
||||
dst_ts = selector2ts(&acquire->sel, FALSE);
|
||||
|
||||
hydra->kernel_interface->acquire(hydra->kernel_interface, reqid, src_ts,
|
||||
dst_ts);
|
||||
charon->kernel->acquire(charon->kernel, reqid, src_ts, dst_ts);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -882,8 +881,8 @@ static void process_expire(private_kernel_netlink_ipsec_t *this,
|
|||
dst = xfrm2host(expire->state.family, &expire->state.id.daddr, 0);
|
||||
if (dst)
|
||||
{
|
||||
hydra->kernel_interface->expire(hydra->kernel_interface, protocol,
|
||||
spi, dst, expire->hard != 0);
|
||||
charon->kernel->expire(charon->kernel, protocol, spi, dst,
|
||||
expire->hard != 0);
|
||||
dst->destroy(dst);
|
||||
}
|
||||
}
|
||||
|
@ -951,8 +950,8 @@ static void process_migrate(private_kernel_netlink_ipsec_t *this,
|
|||
|
||||
if (src_ts && dst_ts && local && remote)
|
||||
{
|
||||
hydra->kernel_interface->migrate(hydra->kernel_interface, reqid,
|
||||
src_ts, dst_ts, dir, local, remote);
|
||||
charon->kernel->migrate(charon->kernel, reqid, src_ts, dst_ts, dir,
|
||||
local, remote);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -988,8 +987,8 @@ static void process_mapping(private_kernel_netlink_ipsec_t *this,
|
|||
mapping->new_sport);
|
||||
if (new)
|
||||
{
|
||||
hydra->kernel_interface->mapping(hydra->kernel_interface,
|
||||
IPPROTO_ESP, spi, dst, new);
|
||||
charon->kernel->mapping(charon->kernel, IPPROTO_ESP, spi, dst,
|
||||
new);
|
||||
new->destroy(new);
|
||||
}
|
||||
dst->destroy(dst);
|
||||
|
@ -2202,22 +2201,21 @@ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this,
|
|||
.prefixlen = policy->sel.prefixlen_s,
|
||||
);
|
||||
|
||||
if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface,
|
||||
fwd->dst_ts, &route->src_ip, NULL) == SUCCESS)
|
||||
if (charon->kernel->get_address_by_ts(charon->kernel, fwd->dst_ts,
|
||||
&route->src_ip, NULL) == SUCCESS)
|
||||
{
|
||||
/* get the nexthop to src (src as we are in POLICY_FWD) */
|
||||
if (!ipsec->src->is_anyaddr(ipsec->src))
|
||||
{
|
||||
route->gateway = hydra->kernel_interface->get_nexthop(
|
||||
hydra->kernel_interface, ipsec->src,
|
||||
-1, ipsec->dst);
|
||||
route->gateway = charon->kernel->get_nexthop(charon->kernel,
|
||||
ipsec->src, -1, ipsec->dst);
|
||||
}
|
||||
else
|
||||
{ /* for shunt policies */
|
||||
iface = xfrm2host(policy->sel.family, &policy->sel.saddr, 0);
|
||||
route->gateway = hydra->kernel_interface->get_nexthop(
|
||||
hydra->kernel_interface, iface,
|
||||
policy->sel.prefixlen_s, route->src_ip);
|
||||
route->gateway = charon->kernel->get_nexthop(charon->kernel,
|
||||
iface, policy->sel.prefixlen_s,
|
||||
route->src_ip);
|
||||
iface->destroy(iface);
|
||||
}
|
||||
route->dst_net = chunk_alloc(policy->sel.family == AF_INET ? 4 : 16);
|
||||
|
@ -2232,8 +2230,8 @@ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this,
|
|||
iface = route->src_ip;
|
||||
}
|
||||
/* install route via outgoing interface */
|
||||
if (!hydra->kernel_interface->get_interface(hydra->kernel_interface,
|
||||
iface, &route->if_name))
|
||||
if (!charon->kernel->get_interface(charon->kernel, iface,
|
||||
&route->if_name))
|
||||
{
|
||||
this->mutex->unlock(this->mutex);
|
||||
route_entry_destroy(route);
|
||||
|
@ -2250,9 +2248,9 @@ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this,
|
|||
return SUCCESS;
|
||||
}
|
||||
/* uninstall previously installed route */
|
||||
if (hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
old->dst_net, old->prefixlen, old->gateway,
|
||||
old->src_ip, old->if_name) != SUCCESS)
|
||||
if (charon->kernel->del_route(charon->kernel, old->dst_net,
|
||||
old->prefixlen, old->gateway,
|
||||
old->src_ip, old->if_name) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_KNL, "error uninstalling route installed with "
|
||||
"policy %R === %R %N", fwd->src_ts,
|
||||
|
@ -2265,10 +2263,9 @@ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this,
|
|||
|
||||
DBG2(DBG_KNL, "installing route: %R via %H src %H dev %s",
|
||||
fwd->src_ts, route->gateway, route->src_ip, route->if_name);
|
||||
switch (hydra->kernel_interface->add_route(
|
||||
hydra->kernel_interface, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name))
|
||||
switch (charon->kernel->add_route(charon->kernel, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name))
|
||||
{
|
||||
default:
|
||||
DBG1(DBG_KNL, "unable to install source route for %H",
|
||||
|
@ -2579,9 +2576,9 @@ METHOD(kernel_ipsec_t, del_policy, status_t,
|
|||
if (current->route)
|
||||
{
|
||||
route_entry_t *route = current->route;
|
||||
if (hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
route->dst_net, route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name) != SUCCESS)
|
||||
if (charon->kernel->del_route(charon->kernel, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_KNL, "error uninstalling route installed with "
|
||||
"policy %R === %R %N", src_ts, dst_ts,
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
#include "kernel_netlink_net.h"
|
||||
#include "kernel_netlink_shared.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <utils/debug.h>
|
||||
#include <threading/mutex.h>
|
||||
#include <threading/rwlock.h>
|
||||
|
@ -893,7 +893,7 @@ static job_requeue_t roam_event(private_kernel_netlink_net_t *this)
|
|||
address = this->roam_address;
|
||||
this->roam_address = FALSE;
|
||||
this->roam_lock->unlock(this->roam_lock);
|
||||
hydra->kernel_interface->roam(hydra->kernel_interface, address);
|
||||
charon->kernel->roam(charon->kernel, address);
|
||||
return JOB_REQUEUE_NONE;
|
||||
}
|
||||
|
||||
|
@ -1004,8 +1004,8 @@ static void process_link(private_kernel_netlink_net_t *this,
|
|||
INIT(entry,
|
||||
.ifindex = msg->ifi_index,
|
||||
.addrs = linked_list_create(),
|
||||
.usable = hydra->kernel_interface->is_interface_usable(
|
||||
hydra->kernel_interface, name),
|
||||
.usable = charon->kernel->is_interface_usable(
|
||||
charon->kernel, name),
|
||||
);
|
||||
this->ifaces->insert_last(this->ifaces, entry);
|
||||
}
|
||||
|
|
|
@ -19,8 +19,6 @@
|
|||
#include "kernel_netlink_ipsec.h"
|
||||
#include "kernel_netlink_net.h"
|
||||
|
||||
#include <hydra.h>
|
||||
|
||||
typedef struct private_kernel_netlink_plugin_t private_kernel_netlink_plugin_t;
|
||||
|
||||
/**
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
|
||||
#include <test_runner.h>
|
||||
|
||||
#include <hydra.h>
|
||||
|
||||
/* declare test suite constructors */
|
||||
#define TEST_SUITE(x) test_suite_t* x();
|
||||
#include "tests.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
AM_CPPFLAGS = \
|
||||
-I${linux_headers} \
|
||||
-I$(top_srcdir)/src/libstrongswan \
|
||||
-I$(top_srcdir)/src/libhydra
|
||||
-I$(top_srcdir)/src/libcharon
|
||||
|
||||
AM_CFLAGS = \
|
||||
$(PLUGIN_CFLAGS)
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
#include "kernel_pfkey_ipsec.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <utils/debug.h>
|
||||
#include <networking/host.h>
|
||||
#include <collections/linked_list.h>
|
||||
|
@ -922,8 +922,7 @@ static int lookup_algorithm(transform_type_t type, int ikev2)
|
|||
}
|
||||
list++;
|
||||
}
|
||||
hydra->kernel_interface->lookup_algorithm(hydra->kernel_interface, ikev2,
|
||||
type, &alg, NULL);
|
||||
charon->kernel->lookup_algorithm(charon->kernel, ikev2, type, &alg, NULL);
|
||||
return alg;
|
||||
}
|
||||
|
||||
|
@ -1283,8 +1282,7 @@ static void process_acquire(private_kernel_pfkey_ipsec_t *this,
|
|||
src_ts = sadb_address2ts(response.src);
|
||||
dst_ts = sadb_address2ts(response.dst);
|
||||
|
||||
hydra->kernel_interface->acquire(hydra->kernel_interface, reqid, src_ts,
|
||||
dst_ts);
|
||||
charon->kernel->acquire(charon->kernel, reqid, src_ts, dst_ts);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1316,8 +1314,7 @@ static void process_expire(private_kernel_pfkey_ipsec_t *this,
|
|||
dst = host_create_from_sockaddr((sockaddr_t*)(response.dst + 1));
|
||||
if (dst)
|
||||
{
|
||||
hydra->kernel_interface->expire(hydra->kernel_interface, protocol,
|
||||
spi, dst, hard);
|
||||
charon->kernel->expire(charon->kernel, protocol, spi, dst, hard);
|
||||
dst->destroy(dst);
|
||||
}
|
||||
}
|
||||
|
@ -1366,8 +1363,8 @@ static void process_migrate(private_kernel_pfkey_ipsec_t *this,
|
|||
|
||||
if (src_ts && dst_ts && local && remote)
|
||||
{
|
||||
hydra->kernel_interface->migrate(hydra->kernel_interface, reqid,
|
||||
src_ts, dst_ts, dir, local, remote);
|
||||
charon->kernel->migrate(charon->kernel, reqid, src_ts, dst_ts, dir,
|
||||
local, remote);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1437,8 +1434,7 @@ static void process_mapping(private_kernel_pfkey_ipsec_t *this,
|
|||
new = host_create_from_sockaddr(sa);
|
||||
if (new)
|
||||
{
|
||||
hydra->kernel_interface->mapping(hydra->kernel_interface,
|
||||
IPPROTO_ESP, spi, dst, new);
|
||||
charon->kernel->mapping(charon->kernel, IPPROTO_ESP, spi, dst, new);
|
||||
new->destroy(new);
|
||||
}
|
||||
dst->destroy(dst);
|
||||
|
@ -2142,15 +2138,13 @@ static void add_exclude_route(private_kernel_pfkey_ipsec_t *this,
|
|||
if (!route->exclude)
|
||||
{
|
||||
DBG2(DBG_KNL, "installing new exclude route for %H src %H", dst, src);
|
||||
gtw = hydra->kernel_interface->get_nexthop(hydra->kernel_interface,
|
||||
dst, -1, NULL);
|
||||
gtw = charon->kernel->get_nexthop(charon->kernel, dst, -1, NULL);
|
||||
if (gtw)
|
||||
{
|
||||
char *if_name = NULL;
|
||||
|
||||
if (hydra->kernel_interface->get_interface(
|
||||
hydra->kernel_interface, src, &if_name) &&
|
||||
hydra->kernel_interface->add_route(hydra->kernel_interface,
|
||||
if (charon->kernel->get_interface(charon->kernel, src, &if_name) &&
|
||||
charon->kernel->add_route(charon->kernel,
|
||||
dst->get_address(dst),
|
||||
dst->get_family(dst) == AF_INET ? 32 : 128,
|
||||
gtw, src, if_name) == SUCCESS)
|
||||
|
@ -2213,10 +2207,10 @@ static void remove_exclude_route(private_kernel_pfkey_ipsec_t *this,
|
|||
dst = route->exclude->dst;
|
||||
DBG2(DBG_KNL, "uninstalling exclude route for %H src %H",
|
||||
dst, route->exclude->src);
|
||||
if (hydra->kernel_interface->get_interface(
|
||||
hydra->kernel_interface,
|
||||
if (charon->kernel->get_interface(
|
||||
charon->kernel,
|
||||
route->exclude->src, &if_name) &&
|
||||
hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
charon->kernel->del_route(charon->kernel,
|
||||
dst->get_address(dst),
|
||||
dst->get_family(dst) == AF_INET ? 32 : 128,
|
||||
route->exclude->gtw, route->exclude->src,
|
||||
|
@ -2241,8 +2235,8 @@ static bool install_route(private_kernel_pfkey_ipsec_t *this,
|
|||
host_t *host, *src, *dst;
|
||||
bool is_virtual;
|
||||
|
||||
if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface,
|
||||
in->dst_ts, &host, &is_virtual) != SUCCESS)
|
||||
if (charon->kernel->get_address_by_ts(charon->kernel, in->dst_ts, &host,
|
||||
&is_virtual) != SUCCESS)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
@ -2259,8 +2253,8 @@ static bool install_route(private_kernel_pfkey_ipsec_t *this,
|
|||
|
||||
if (!dst->is_anyaddr(dst))
|
||||
{
|
||||
route->gateway = hydra->kernel_interface->get_nexthop(
|
||||
hydra->kernel_interface, dst, -1, src);
|
||||
route->gateway = charon->kernel->get_nexthop(charon->kernel, dst, -1,
|
||||
src);
|
||||
|
||||
/* if the IP is virtual, we install the route over the interface it has
|
||||
* been installed on. Otherwise we use the interface we use for IKE, as
|
||||
|
@ -2272,17 +2266,16 @@ static bool install_route(private_kernel_pfkey_ipsec_t *this,
|
|||
}
|
||||
else
|
||||
{ /* for shunt policies */
|
||||
route->gateway = hydra->kernel_interface->get_nexthop(
|
||||
hydra->kernel_interface, policy->src.net,
|
||||
policy->src.mask, route->src_ip);
|
||||
route->gateway = charon->kernel->get_nexthop(charon->kernel,
|
||||
policy->src.net, policy->src.mask,
|
||||
route->src_ip);
|
||||
|
||||
/* we don't have a source address, use the address we found */
|
||||
src = route->src_ip;
|
||||
}
|
||||
|
||||
/* get interface for route, using source address */
|
||||
if (!hydra->kernel_interface->get_interface(hydra->kernel_interface,
|
||||
src, &route->if_name))
|
||||
if (!charon->kernel->get_interface(charon->kernel, src, &route->if_name))
|
||||
{
|
||||
route_entry_destroy(route);
|
||||
return FALSE;
|
||||
|
@ -2298,9 +2291,9 @@ static bool install_route(private_kernel_pfkey_ipsec_t *this,
|
|||
return TRUE;
|
||||
}
|
||||
/* uninstall previously installed route */
|
||||
if (hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
old->dst_net, old->prefixlen, old->gateway,
|
||||
old->src_ip, old->if_name) != SUCCESS)
|
||||
if (charon->kernel->del_route(charon->kernel, old->dst_net,
|
||||
old->prefixlen, old->gateway,
|
||||
old->src_ip, old->if_name) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_KNL, "error uninstalling route installed with policy "
|
||||
"%R === %R %N", in->src_ts, in->dst_ts,
|
||||
|
@ -2311,8 +2304,7 @@ static bool install_route(private_kernel_pfkey_ipsec_t *this,
|
|||
}
|
||||
|
||||
/* if remote traffic selector covers the IKE peer, add an exclude route */
|
||||
if (hydra->kernel_interface->get_features(
|
||||
hydra->kernel_interface) & KERNEL_REQUIRE_EXCLUDE_ROUTE)
|
||||
if (charon->kernel->get_features(charon->kernel) & KERNEL_REQUIRE_EXCLUDE_ROUTE)
|
||||
{
|
||||
if (in->src_ts->is_host(in->src_ts, dst))
|
||||
{
|
||||
|
@ -2331,9 +2323,9 @@ static bool install_route(private_kernel_pfkey_ipsec_t *this,
|
|||
DBG2(DBG_KNL, "installing route: %R via %H src %H dev %s",
|
||||
in->src_ts, route->gateway, route->src_ip, route->if_name);
|
||||
|
||||
switch (hydra->kernel_interface->add_route(hydra->kernel_interface,
|
||||
route->dst_net, route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name))
|
||||
switch (charon->kernel->add_route(charon->kernel, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name))
|
||||
{
|
||||
case ALREADY_DONE:
|
||||
/* route exists, do not uninstall */
|
||||
|
@ -2813,9 +2805,9 @@ METHOD(kernel_ipsec_t, del_policy, status_t,
|
|||
if (policy->route)
|
||||
{
|
||||
route_entry_t *route = policy->route;
|
||||
if (hydra->kernel_interface->del_route(hydra->kernel_interface,
|
||||
route->dst_net, route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name) != SUCCESS)
|
||||
if (charon->kernel->del_route(charon->kernel, route->dst_net,
|
||||
route->prefixlen, route->gateway,
|
||||
route->src_ip, route->if_name) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_KNL, "error uninstalling route installed with "
|
||||
"policy %R === %R %N", src_ts, dst_ts,
|
||||
|
|
|
@ -18,8 +18,6 @@
|
|||
|
||||
#include "kernel_pfkey_ipsec.h"
|
||||
|
||||
#include <hydra.h>
|
||||
|
||||
typedef struct private_kernel_pfkey_plugin_t private_kernel_pfkey_plugin_t;
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
AM_CPPFLAGS = \
|
||||
-I${linux_headers} \
|
||||
-I$(top_srcdir)/src/libstrongswan \
|
||||
-I$(top_srcdir)/src/libhydra
|
||||
-I$(top_srcdir)/src/libcharon
|
||||
|
||||
AM_CFLAGS = \
|
||||
$(PLUGIN_CFLAGS)
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "kernel_pfroute_net.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <utils/debug.h>
|
||||
#include <networking/host.h>
|
||||
#include <networking/tun_device.h>
|
||||
|
@ -555,7 +555,7 @@ static job_requeue_t roam_event(private_kernel_pfroute_net_t *this)
|
|||
address = this->roam_address;
|
||||
this->roam_address = FALSE;
|
||||
this->roam_lock->unlock(this->roam_lock);
|
||||
hydra->kernel_interface->roam(hydra->kernel_interface, address);
|
||||
charon->kernel->roam(charon->kernel, address);
|
||||
return JOB_REQUEUE_NONE;
|
||||
}
|
||||
|
||||
|
@ -862,8 +862,8 @@ static void process_link(private_kernel_pfroute_net_t *this,
|
|||
if (if_indextoname(iface->ifindex, iface->ifname))
|
||||
{
|
||||
DBG1(DBG_KNL, "interface %s appeared", iface->ifname);
|
||||
iface->usable = hydra->kernel_interface->is_interface_usable(
|
||||
hydra->kernel_interface, iface->ifname);
|
||||
iface->usable = charon->kernel->is_interface_usable(charon->kernel,
|
||||
iface->ifname);
|
||||
repopulate_iface(this, iface);
|
||||
this->ifaces->insert_last(this->ifaces, iface);
|
||||
if (iface->usable)
|
||||
|
@ -1266,7 +1266,7 @@ METHOD(kernel_net_t, add_ip, status_t,
|
|||
/* lets do this while holding the lock, thus preventing another thread
|
||||
* from deleting the TUN device concurrently, hopefully listeners are quick
|
||||
* and cause no deadlocks */
|
||||
hydra->kernel_interface->tun(hydra->kernel_interface, tun, TRUE);
|
||||
charon->kernel->tun(charon->kernel, tun, TRUE);
|
||||
this->lock->unlock(this->lock);
|
||||
|
||||
return SUCCESS;
|
||||
|
@ -1294,8 +1294,7 @@ METHOD(kernel_net_t, del_ip, status_t,
|
|||
if (addr && addr->ip_equals(addr, vip))
|
||||
{
|
||||
this->tuns->remove_at(this->tuns, enumerator);
|
||||
hydra->kernel_interface->tun(hydra->kernel_interface, tun,
|
||||
FALSE);
|
||||
charon->kernel->tun(charon->kernel, tun, FALSE);
|
||||
tun->destroy(tun);
|
||||
found = TRUE;
|
||||
break;
|
||||
|
@ -1738,8 +1737,8 @@ static status_t init_address_list(private_kernel_pfroute_net_t *this)
|
|||
.ifindex = if_nametoindex(ifa->ifa_name),
|
||||
.flags = ifa->ifa_flags,
|
||||
.addrs = linked_list_create(),
|
||||
.usable = hydra->kernel_interface->is_interface_usable(
|
||||
hydra->kernel_interface, ifa->ifa_name),
|
||||
.usable = charon->kernel->is_interface_usable(
|
||||
charon->kernel, ifa->ifa_name),
|
||||
);
|
||||
memcpy(iface->ifname, ifa->ifa_name, IFNAMSIZ);
|
||||
this->ifaces->insert_last(this->ifaces, iface);
|
||||
|
|
|
@ -18,8 +18,6 @@
|
|||
|
||||
#include "kernel_pfroute_net.h"
|
||||
|
||||
#include <hydra.h>
|
||||
|
||||
typedef struct private_kernel_pfroute_plugin_t private_kernel_pfroute_plugin_t;
|
||||
|
||||
/**
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include <netdb.h>
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <attributes/mem_pool.h>
|
||||
#include <collections/hashtable.h>
|
||||
#include <threading/mutex.h>
|
||||
|
@ -656,8 +655,8 @@ static host_t *allocate_addr(private_load_tester_config_t *this, uint num)
|
|||
id->destroy(id);
|
||||
return NULL;
|
||||
}
|
||||
if (hydra->kernel_interface->add_ip(hydra->kernel_interface,
|
||||
found, this->prefix, iface) != SUCCESS)
|
||||
if (charon->kernel->add_ip(charon->kernel, found, this->prefix,
|
||||
iface) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_CFG, "installing load-tester IP %H on %s failed", found, iface);
|
||||
found->destroy(found);
|
||||
|
@ -852,8 +851,8 @@ METHOD(load_tester_config_t, delete_ip, void,
|
|||
{
|
||||
if (pool->release_address(pool, entry->host, entry->id))
|
||||
{
|
||||
hydra->kernel_interface->del_ip(hydra->kernel_interface,
|
||||
entry->host, this->prefix, FALSE);
|
||||
charon->kernel->del_ip(charon->kernel, entry->host,
|
||||
this->prefix, FALSE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -882,8 +881,8 @@ static void cleanup_leases(private_load_tester_config_t *this)
|
|||
{
|
||||
if (online)
|
||||
{
|
||||
hydra->kernel_interface->del_ip(hydra->kernel_interface,
|
||||
addr, this->prefix, FALSE);
|
||||
charon->kernel->del_ip(charon->kernel, addr, this->prefix,
|
||||
FALSE);
|
||||
entry = this->leases->remove(this->leases, addr);
|
||||
if (entry)
|
||||
{
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include <unistd.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <processing/jobs/callback_job.h>
|
||||
#include <threading/condvar.h>
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <utils/debug.h>
|
||||
#include <threading/mutex.h>
|
||||
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
#include <netinet/udp.h>
|
||||
#include <net/if.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/thread.h>
|
||||
|
||||
|
@ -720,16 +719,15 @@ static int open_socket(private_socket_default_socket_t *this,
|
|||
}
|
||||
#endif
|
||||
|
||||
if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
|
||||
skt, family))
|
||||
if (!charon->kernel->bypass_socket(charon->kernel, skt, family))
|
||||
{
|
||||
DBG1(DBG_NET, "installing IKE bypass policy failed");
|
||||
}
|
||||
|
||||
/* enable UDP decapsulation for NAT-T sockets */
|
||||
if (port == &this->natt &&
|
||||
!hydra->kernel_interface->enable_udp_decap(hydra->kernel_interface,
|
||||
skt, family, this->natt))
|
||||
!charon->kernel->enable_udp_decap(charon->kernel, skt, family,
|
||||
this->natt))
|
||||
{
|
||||
DBG1(DBG_NET, "enabling UDP decapsulation for %s on port %d failed",
|
||||
family == AF_INET ? "IPv4" : "IPv6", this->natt);
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
#include <netinet/udp.h>
|
||||
#include <net/if.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/thread.h>
|
||||
#include <threading/rwlock.h>
|
||||
|
@ -438,15 +437,13 @@ static int open_socket(private_socket_dynamic_socket_t *this,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
|
||||
fd, family))
|
||||
if (!charon->kernel->bypass_socket(charon->kernel, fd, family))
|
||||
{
|
||||
DBG1(DBG_NET, "installing IKE bypass policy failed");
|
||||
}
|
||||
|
||||
/* enable UDP decapsulation on each socket */
|
||||
if (!hydra->kernel_interface->enable_udp_decap(hydra->kernel_interface,
|
||||
fd, family, *port))
|
||||
if (!charon->kernel->enable_udp_decap(charon->kernel, fd, family, *port))
|
||||
{
|
||||
DBG1(DBG_NET, "enabling UDP decapsulation for %s on port %d failed",
|
||||
family == AF_INET ? "IPv4" : "IPv6", *port);
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include "socket_win_socket.h"
|
||||
|
||||
#include <library.h>
|
||||
#include <hydra.h>
|
||||
#include <threading/thread.h>
|
||||
#include <daemon.h>
|
||||
|
||||
|
@ -397,13 +396,11 @@ static SOCKET open_socket(private_socket_win_socket_t *this, int i)
|
|||
closesocket(s);
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
|
||||
s, AF_INET))
|
||||
if (!charon->kernel->bypass_socket(charon->kernel, s, AF_INET))
|
||||
{
|
||||
DBG1(DBG_NET, "installing IPv4 IKE bypass policy failed");
|
||||
}
|
||||
if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
|
||||
s, AF_INET6))
|
||||
if (!charon->kernel->bypass_socket(charon->kernel, s, AF_INET6))
|
||||
{
|
||||
DBG1(DBG_NET, "installing IPv6 IKE bypass policy failed");
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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))
|
||||
{
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "tnc_ifmap_renew_session_job.h"
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <utils/debug.h>
|
||||
|
||||
#define IFMAP_RENEW_SESSION_INTERVAL 150
|
||||
|
@ -51,8 +50,8 @@ static bool publish_device_ip_addresses(private_tnc_ifmap_listener_t *this)
|
|||
host_t *host;
|
||||
bool success = TRUE;
|
||||
|
||||
enumerator = hydra->kernel_interface->create_address_enumerator(
|
||||
hydra->kernel_interface, ADDR_TYPE_REGULAR);
|
||||
enumerator = charon->kernel->create_address_enumerator(charon->kernel,
|
||||
ADDR_TYPE_REGULAR);
|
||||
while (enumerator->enumerate(enumerator, &host))
|
||||
{
|
||||
if (!this->ifmap->publish_device_ip(this->ifmap, host))
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "updown_listener.h"
|
||||
|
||||
#include <utils/process.h>
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <config/child_cfg.h>
|
||||
|
||||
|
@ -265,8 +264,7 @@ static void invoke_once(private_updown_listener_t *this, ike_sa_t *ike_sa,
|
|||
config->get_name(config));
|
||||
if (up)
|
||||
{
|
||||
if (hydra->kernel_interface->get_interface(hydra->kernel_interface,
|
||||
me, &iface))
|
||||
if (charon->kernel->get_interface(charon->kernel, me, &iface))
|
||||
{
|
||||
cache_iface(this, child_sa->get_reqid(child_sa), iface);
|
||||
}
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include <test_runner.h>
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
|
||||
/* declare test suite constructors */
|
||||
#define TEST_SUITE(x) test_suite_t* x();
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include "adopt_children_job.h"
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <collections/array.h>
|
||||
#include <processing/jobs/delete_ike_sa_job.h>
|
||||
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <collections/array.h>
|
||||
|
||||
|
@ -469,10 +468,10 @@ static status_t update_usebytes(private_child_sa_t *this, bool inbound)
|
|||
{
|
||||
if (this->my_spi)
|
||||
{
|
||||
status = hydra->kernel_interface->query_sa(hydra->kernel_interface,
|
||||
this->other_addr, this->my_addr, this->my_spi,
|
||||
proto_ike2ip(this->protocol), this->mark_in,
|
||||
&bytes, &packets, &time);
|
||||
status = charon->kernel->query_sa(charon->kernel, this->other_addr,
|
||||
this->my_addr, this->my_spi,
|
||||
proto_ike2ip(this->protocol), this->mark_in,
|
||||
&bytes, &packets, &time);
|
||||
if (status == SUCCESS)
|
||||
{
|
||||
if (bytes > this->my_usebytes)
|
||||
|
@ -493,10 +492,10 @@ static status_t update_usebytes(private_child_sa_t *this, bool inbound)
|
|||
{
|
||||
if (this->other_spi)
|
||||
{
|
||||
status = hydra->kernel_interface->query_sa(hydra->kernel_interface,
|
||||
this->my_addr, this->other_addr, this->other_spi,
|
||||
proto_ike2ip(this->protocol), this->mark_out,
|
||||
&bytes, &packets, &time);
|
||||
status = charon->kernel->query_sa(charon->kernel, this->my_addr,
|
||||
this->other_addr, this->other_spi,
|
||||
proto_ike2ip(this->protocol), this->mark_out,
|
||||
&bytes, &packets, &time);
|
||||
if (status == SUCCESS)
|
||||
{
|
||||
if (bytes > this->other_usebytes)
|
||||
|
@ -532,15 +531,15 @@ static bool update_usetime(private_child_sa_t *this, bool inbound)
|
|||
|
||||
if (inbound)
|
||||
{
|
||||
if (hydra->kernel_interface->query_policy(hydra->kernel_interface,
|
||||
other_ts, my_ts, POLICY_IN, this->mark_in, &in) == SUCCESS)
|
||||
if (charon->kernel->query_policy(charon->kernel, other_ts,
|
||||
my_ts, POLICY_IN, this->mark_in, &in) == SUCCESS)
|
||||
{
|
||||
last_use = max(last_use, in);
|
||||
}
|
||||
if (this->mode != MODE_TRANSPORT)
|
||||
{
|
||||
if (hydra->kernel_interface->query_policy(hydra->kernel_interface,
|
||||
other_ts, my_ts, POLICY_FWD, this->mark_in, &fwd) == SUCCESS)
|
||||
if (charon->kernel->query_policy(charon->kernel, other_ts,
|
||||
my_ts, POLICY_FWD, this->mark_in, &fwd) == SUCCESS)
|
||||
{
|
||||
last_use = max(last_use, fwd);
|
||||
}
|
||||
|
@ -548,8 +547,8 @@ static bool update_usetime(private_child_sa_t *this, bool inbound)
|
|||
}
|
||||
else
|
||||
{
|
||||
if (hydra->kernel_interface->query_policy(hydra->kernel_interface,
|
||||
my_ts, other_ts, POLICY_OUT, this->mark_out, &out) == SUCCESS)
|
||||
if (charon->kernel->query_policy(charon->kernel, my_ts,
|
||||
other_ts, POLICY_OUT, this->mark_out, &out) == SUCCESS)
|
||||
{
|
||||
last_use = max(last_use, out);
|
||||
}
|
||||
|
@ -629,10 +628,8 @@ METHOD(child_sa_t, get_installtime, time_t,
|
|||
METHOD(child_sa_t, alloc_spi, u_int32_t,
|
||||
private_child_sa_t *this, protocol_id_t protocol)
|
||||
{
|
||||
if (hydra->kernel_interface->get_spi(hydra->kernel_interface,
|
||||
this->other_addr, this->my_addr,
|
||||
proto_ike2ip(protocol),
|
||||
&this->my_spi) == SUCCESS)
|
||||
if (charon->kernel->get_spi(charon->kernel, this->other_addr, this->my_addr,
|
||||
proto_ike2ip(protocol), &this->my_spi) == SUCCESS)
|
||||
{
|
||||
/* if we allocate a SPI, but then are unable to establish the SA, we
|
||||
* need to know the protocol family to delete the partial SA */
|
||||
|
@ -645,9 +642,8 @@ METHOD(child_sa_t, alloc_spi, u_int32_t,
|
|||
METHOD(child_sa_t, alloc_cpi, u_int16_t,
|
||||
private_child_sa_t *this)
|
||||
{
|
||||
if (hydra->kernel_interface->get_cpi(hydra->kernel_interface,
|
||||
this->other_addr, this->my_addr,
|
||||
&this->my_cpi) == SUCCESS)
|
||||
if (charon->kernel->get_cpi(charon->kernel, this->other_addr, this->my_addr,
|
||||
&this->my_cpi) == SUCCESS)
|
||||
{
|
||||
return this->my_cpi;
|
||||
}
|
||||
|
@ -711,9 +707,8 @@ METHOD(child_sa_t, install, status_t,
|
|||
|
||||
if (!this->reqid_allocated && !this->static_reqid)
|
||||
{
|
||||
status = hydra->kernel_interface->alloc_reqid(hydra->kernel_interface,
|
||||
my_ts, other_ts, this->mark_in, this->mark_out,
|
||||
&this->reqid);
|
||||
status = charon->kernel->alloc_reqid(charon->kernel, my_ts, other_ts,
|
||||
this->mark_in, this->mark_out, &this->reqid);
|
||||
if (status != SUCCESS)
|
||||
{
|
||||
return status;
|
||||
|
@ -757,7 +752,7 @@ METHOD(child_sa_t, install, status_t,
|
|||
dst_ts = other_ts;
|
||||
}
|
||||
|
||||
status = hydra->kernel_interface->add_sa(hydra->kernel_interface,
|
||||
status = charon->kernel->add_sa(charon->kernel,
|
||||
src, dst, spi, proto_ike2ip(this->protocol), this->reqid,
|
||||
inbound ? this->mark_in : this->mark_out, tfc,
|
||||
lifetime, enc_alg, encr, int_alg, integ, this->mode,
|
||||
|
@ -776,7 +771,7 @@ static bool require_policy_update()
|
|||
{
|
||||
kernel_feature_t f;
|
||||
|
||||
f = hydra->kernel_interface->get_features(hydra->kernel_interface);
|
||||
f = charon->kernel->get_features(charon->kernel);
|
||||
return !(f & KERNEL_NO_POLICY_UPDATES);
|
||||
}
|
||||
|
||||
|
@ -833,18 +828,18 @@ static status_t install_policies_internal(private_child_sa_t *this,
|
|||
ipsec_sa_cfg_t *other_sa, policy_type_t type, policy_priority_t priority)
|
||||
{
|
||||
status_t status = SUCCESS;
|
||||
status |= hydra->kernel_interface->add_policy(hydra->kernel_interface,
|
||||
status |= charon->kernel->add_policy(charon->kernel,
|
||||
my_addr, other_addr, my_ts, other_ts,
|
||||
POLICY_OUT, type, other_sa,
|
||||
this->mark_out, priority);
|
||||
|
||||
status |= hydra->kernel_interface->add_policy(hydra->kernel_interface,
|
||||
status |= charon->kernel->add_policy(charon->kernel,
|
||||
other_addr, my_addr, other_ts, my_ts,
|
||||
POLICY_IN, type, my_sa,
|
||||
this->mark_in, priority);
|
||||
if (this->mode != MODE_TRANSPORT)
|
||||
{
|
||||
status |= hydra->kernel_interface->add_policy(hydra->kernel_interface,
|
||||
status |= charon->kernel->add_policy(charon->kernel,
|
||||
other_addr, my_addr, other_ts, my_ts,
|
||||
POLICY_FWD, type, my_sa,
|
||||
this->mark_in, priority);
|
||||
|
@ -861,15 +856,15 @@ static void del_policies_internal(private_child_sa_t *this,
|
|||
ipsec_sa_cfg_t *other_sa, policy_type_t type, policy_priority_t priority)
|
||||
{
|
||||
|
||||
hydra->kernel_interface->del_policy(hydra->kernel_interface,
|
||||
charon->kernel->del_policy(charon->kernel,
|
||||
my_addr, other_addr, my_ts, other_ts, POLICY_OUT, type,
|
||||
other_sa, this->mark_out, priority);
|
||||
hydra->kernel_interface->del_policy(hydra->kernel_interface,
|
||||
charon->kernel->del_policy(charon->kernel,
|
||||
other_addr, my_addr, other_ts, my_ts, POLICY_IN,
|
||||
type, my_sa, this->mark_in, priority);
|
||||
if (this->mode != MODE_TRANSPORT)
|
||||
{
|
||||
hydra->kernel_interface->del_policy(hydra->kernel_interface,
|
||||
charon->kernel->del_policy(charon->kernel,
|
||||
other_addr, my_addr, other_ts, my_ts, POLICY_FWD,
|
||||
type, my_sa, this->mark_in, priority);
|
||||
}
|
||||
|
@ -886,8 +881,8 @@ METHOD(child_sa_t, add_policies, status_t,
|
|||
if (!this->reqid_allocated && !this->static_reqid)
|
||||
{
|
||||
/* trap policy, get or confirm reqid */
|
||||
status = hydra->kernel_interface->alloc_reqid(
|
||||
hydra->kernel_interface, my_ts_list, other_ts_list,
|
||||
status = charon->kernel->alloc_reqid(
|
||||
charon->kernel, my_ts_list, other_ts_list,
|
||||
this->mark_in, this->mark_out, &this->reqid);
|
||||
if (status != SUCCESS)
|
||||
{
|
||||
|
@ -967,11 +962,10 @@ static void reinstall_vip(host_t *vip, host_t *me)
|
|||
{
|
||||
char *iface;
|
||||
|
||||
if (hydra->kernel_interface->get_interface(hydra->kernel_interface,
|
||||
me, &iface))
|
||||
if (charon->kernel->get_interface(charon->kernel, me, &iface))
|
||||
{
|
||||
hydra->kernel_interface->del_ip(hydra->kernel_interface, vip, -1, TRUE);
|
||||
hydra->kernel_interface->add_ip(hydra->kernel_interface, vip, -1, iface);
|
||||
charon->kernel->del_ip(charon->kernel, vip, -1, TRUE);
|
||||
charon->kernel->add_ip(charon->kernel, vip, -1, iface);
|
||||
free(iface);
|
||||
}
|
||||
}
|
||||
|
@ -1000,7 +994,7 @@ METHOD(child_sa_t, update, status_t,
|
|||
/* update our (initiator) SA */
|
||||
if (this->my_spi)
|
||||
{
|
||||
if (hydra->kernel_interface->update_sa(hydra->kernel_interface,
|
||||
if (charon->kernel->update_sa(charon->kernel,
|
||||
this->my_spi, proto_ike2ip(this->protocol),
|
||||
this->ipcomp != IPCOMP_NONE ? this->my_cpi : 0,
|
||||
this->other_addr, this->my_addr, other, me,
|
||||
|
@ -1014,7 +1008,7 @@ METHOD(child_sa_t, update, status_t,
|
|||
/* update his (responder) SA */
|
||||
if (this->other_spi)
|
||||
{
|
||||
if (hydra->kernel_interface->update_sa(hydra->kernel_interface,
|
||||
if (charon->kernel->update_sa(charon->kernel,
|
||||
this->other_spi, proto_ike2ip(this->protocol),
|
||||
this->ipcomp != IPCOMP_NONE ? this->other_cpi : 0,
|
||||
this->my_addr, this->other_addr, me, other,
|
||||
|
@ -1143,14 +1137,14 @@ METHOD(child_sa_t, destroy, void,
|
|||
/* delete SAs in the kernel, if they are set up */
|
||||
if (this->my_spi)
|
||||
{
|
||||
hydra->kernel_interface->del_sa(hydra->kernel_interface,
|
||||
charon->kernel->del_sa(charon->kernel,
|
||||
this->other_addr, this->my_addr, this->my_spi,
|
||||
proto_ike2ip(this->protocol), this->my_cpi,
|
||||
this->mark_in);
|
||||
}
|
||||
if (this->other_spi)
|
||||
{
|
||||
hydra->kernel_interface->del_sa(hydra->kernel_interface,
|
||||
charon->kernel->del_sa(charon->kernel,
|
||||
this->my_addr, this->other_addr, this->other_spi,
|
||||
proto_ike2ip(this->protocol), this->other_cpi,
|
||||
this->mark_out);
|
||||
|
@ -1158,7 +1152,7 @@ METHOD(child_sa_t, destroy, void,
|
|||
|
||||
if (this->reqid_allocated)
|
||||
{
|
||||
if (hydra->kernel_interface->release_reqid(hydra->kernel_interface,
|
||||
if (charon->kernel->release_reqid(charon->kernel,
|
||||
this->reqid, this->mark_in, this->mark_out) != SUCCESS)
|
||||
{
|
||||
DBG1(DBG_CHD, "releasing reqid %u failed", this->reqid);
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <sa/ikev1/keymat_v1.h>
|
||||
#include <config/peer_cfg.h>
|
||||
|
@ -104,7 +103,7 @@ static bool force_encap(ike_cfg_t *ike_cfg)
|
|||
{
|
||||
if (!ike_cfg->force_encap(ike_cfg))
|
||||
{
|
||||
return hydra->kernel_interface->get_features(hydra->kernel_interface) &
|
||||
return charon->kernel->get_features(charon->kernel) &
|
||||
KERNEL_REQUIRE_UDP_ENCAPSULATION;
|
||||
}
|
||||
return TRUE;
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "xauth.h"
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <encoding/payloads/cp_payload.h>
|
||||
#include <processing/jobs/adopt_children_job.h>
|
||||
#include <sa/ikev1/tasks/mode_config.h>
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "child_create.h"
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <sa/ikev2/keymat_v2.h>
|
||||
#include <crypto/diffie_hellman.h>
|
||||
#include <credentials/certificates/x509.h>
|
||||
|
@ -786,7 +785,7 @@ static bool build_payloads(private_child_create_t *this, message_t *message)
|
|||
break;
|
||||
}
|
||||
|
||||
features = hydra->kernel_interface->get_features(hydra->kernel_interface);
|
||||
features = charon->kernel->get_features(charon->kernel);
|
||||
if (!(features & KERNEL_ESP_V3_TFC))
|
||||
{
|
||||
message->add_notify(message, FALSE, ESP_TFC_PADDING_NOT_SUPPORTED,
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <config/peer_cfg.h>
|
||||
#include <encoding/payloads/id_payload.h>
|
||||
|
@ -135,8 +134,8 @@ static void gather_and_add_endpoints(private_ike_me_t *this, message_t *message)
|
|||
host = this->ike_sa->get_my_host(this->ike_sa);
|
||||
port = host->get_port(host);
|
||||
|
||||
enumerator = hydra->kernel_interface->create_address_enumerator(
|
||||
hydra->kernel_interface, ADDR_TYPE_REGULAR);
|
||||
enumerator = charon->kernel->create_address_enumerator(charon->kernel,
|
||||
ADDR_TYPE_REGULAR);
|
||||
while (enumerator->enumerate(enumerator, (void**)&addr))
|
||||
{
|
||||
host = addr->clone(addr);
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <sa/ikev2/tasks/ike_natd.h>
|
||||
#include <encoding/payloads/notify_payload.h>
|
||||
|
@ -196,8 +195,8 @@ static void build_address_list(private_ike_mobike_t *this, message_t *message)
|
|||
int added = 0;
|
||||
|
||||
me = this->ike_sa->get_my_host(this->ike_sa);
|
||||
enumerator = hydra->kernel_interface->create_address_enumerator(
|
||||
hydra->kernel_interface, ADDR_TYPE_REGULAR);
|
||||
enumerator = charon->kernel->create_address_enumerator(charon->kernel,
|
||||
ADDR_TYPE_REGULAR);
|
||||
while (enumerator->enumerate(enumerator, (void**)&host))
|
||||
{
|
||||
if (me->ip_equals(me, host))
|
||||
|
@ -333,8 +332,7 @@ METHOD(ike_mobike_t, transmit, bool,
|
|||
|
||||
if (!this->check)
|
||||
{
|
||||
me = hydra->kernel_interface->get_source_addr(hydra->kernel_interface,
|
||||
other_old, me_old);
|
||||
me = charon->kernel->get_source_addr(charon->kernel, other_old, me_old);
|
||||
if (me)
|
||||
{
|
||||
if (me->ip_equals(me, me_old))
|
||||
|
@ -372,8 +370,7 @@ METHOD(ike_mobike_t, transmit, bool,
|
|||
{
|
||||
continue;
|
||||
}
|
||||
me = hydra->kernel_interface->get_source_addr(
|
||||
hydra->kernel_interface, other, NULL);
|
||||
me = charon->kernel->get_source_addr(charon->kernel, other, NULL);
|
||||
if (me)
|
||||
{
|
||||
/* reuse port for an active address, 4500 otherwise */
|
||||
|
@ -407,7 +404,7 @@ METHOD(task_t, build_i, status_t,
|
|||
|
||||
/* we check if the existing address is still valid */
|
||||
old = message->get_source(message);
|
||||
new = hydra->kernel_interface->get_source_addr(hydra->kernel_interface,
|
||||
new = charon->kernel->get_source_addr(charon->kernel,
|
||||
message->get_destination(message), old);
|
||||
if (new)
|
||||
{
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <config/peer_cfg.h>
|
||||
#include <crypto/hashers/hasher.h>
|
||||
|
@ -86,7 +85,7 @@ static bool force_encap(ike_cfg_t *ike_cfg)
|
|||
{
|
||||
if (!ike_cfg->force_encap(ike_cfg))
|
||||
{
|
||||
return hydra->kernel_interface->get_features(hydra->kernel_interface) &
|
||||
return charon->kernel->get_features(charon->kernel) &
|
||||
KERNEL_REQUIRE_UDP_ENCAPSULATION;
|
||||
}
|
||||
return TRUE;
|
||||
|
@ -327,7 +326,7 @@ METHOD(task_t, build_i, status_t,
|
|||
}
|
||||
else
|
||||
{
|
||||
host = hydra->kernel_interface->get_source_addr(hydra->kernel_interface,
|
||||
host = charon->kernel->get_source_addr(charon->kernel,
|
||||
this->ike_sa->get_other_host(this->ike_sa), NULL);
|
||||
if (host)
|
||||
{ /* 2. */
|
||||
|
@ -341,8 +340,8 @@ METHOD(task_t, build_i, status_t,
|
|||
}
|
||||
else
|
||||
{ /* 3. */
|
||||
enumerator = hydra->kernel_interface->create_address_enumerator(
|
||||
hydra->kernel_interface, ADDR_TYPE_REGULAR);
|
||||
enumerator = charon->kernel->create_address_enumerator(
|
||||
charon->kernel, ADDR_TYPE_REGULAR);
|
||||
while (enumerator->enumerate(enumerator, (void**)&host))
|
||||
{
|
||||
/* apply port 500 to host, but work on a copy */
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
#include "shunt_manager.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/rwlock.h>
|
||||
#include <threading/rwlock_condvar.h>
|
||||
|
@ -111,22 +110,22 @@ static bool install_shunt_policy(child_cfg_t *child)
|
|||
continue;
|
||||
}
|
||||
/* install out policy */
|
||||
status |= hydra->kernel_interface->add_policy(
|
||||
hydra->kernel_interface, host_any, host_any,
|
||||
status |= charon->kernel->add_policy(charon->kernel,
|
||||
host_any, host_any,
|
||||
my_ts, other_ts, POLICY_OUT, policy_type,
|
||||
&sa, child->get_mark(child, FALSE),
|
||||
policy_prio);
|
||||
|
||||
/* install in policy */
|
||||
status |= hydra->kernel_interface->add_policy(
|
||||
hydra->kernel_interface, host_any, host_any,
|
||||
status |= charon->kernel->add_policy(charon->kernel,
|
||||
host_any, host_any,
|
||||
other_ts, my_ts, POLICY_IN, policy_type,
|
||||
&sa, child->get_mark(child, TRUE),
|
||||
policy_prio);
|
||||
|
||||
/* install forward policy */
|
||||
status |= hydra->kernel_interface->add_policy(
|
||||
hydra->kernel_interface, host_any, host_any,
|
||||
status |= charon->kernel->add_policy(charon->kernel,
|
||||
host_any, host_any,
|
||||
other_ts, my_ts, POLICY_FWD, policy_type,
|
||||
&sa, child->get_mark(child, TRUE),
|
||||
policy_prio);
|
||||
|
@ -248,22 +247,22 @@ static void uninstall_shunt_policy(child_cfg_t *child)
|
|||
continue;
|
||||
}
|
||||
/* uninstall out policy */
|
||||
status |= hydra->kernel_interface->del_policy(
|
||||
hydra->kernel_interface, host_any, host_any,
|
||||
status |= charon->kernel->del_policy(charon->kernel,
|
||||
host_any, host_any,
|
||||
my_ts, other_ts, POLICY_OUT, policy_type,
|
||||
&sa, child->get_mark(child, FALSE),
|
||||
policy_prio);
|
||||
|
||||
/* uninstall in policy */
|
||||
status |= hydra->kernel_interface->del_policy(
|
||||
hydra->kernel_interface, host_any, host_any,
|
||||
status |= charon->kernel->del_policy(charon->kernel,
|
||||
host_any, host_any,
|
||||
other_ts, my_ts, POLICY_IN, policy_type,
|
||||
&sa, child->get_mark(child, TRUE),
|
||||
policy_prio);
|
||||
|
||||
/* uninstall forward policy */
|
||||
status |= hydra->kernel_interface->del_policy(
|
||||
hydra->kernel_interface, host_any, host_any,
|
||||
status |= charon->kernel->del_policy(charon->kernel,
|
||||
host_any, host_any,
|
||||
other_ts, my_ts, POLICY_FWD, policy_type,
|
||||
&sa, child->get_mark(child, TRUE),
|
||||
policy_prio);
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
#include "trap_manager.h"
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/mutex.h>
|
||||
#include <threading/rwlock.h>
|
||||
|
@ -195,8 +194,7 @@ METHOD(trap_manager_t, install, u_int32_t,
|
|||
if (!me || me->is_anyaddr(me))
|
||||
{
|
||||
DESTROY_IF(me);
|
||||
me = hydra->kernel_interface->get_source_addr(
|
||||
hydra->kernel_interface, other, NULL);
|
||||
me = charon->kernel->get_source_addr(charon->kernel, other, NULL);
|
||||
if (!me)
|
||||
{
|
||||
DBG1(DBG_CFG, "installing trap failed, local address unknown");
|
||||
|
|
|
@ -3,11 +3,7 @@ include $(CLEAR_VARS)
|
|||
|
||||
# copy-n-paste from Makefile.am
|
||||
libhydra_la_SOURCES := \
|
||||
hydra.c hydra.h \
|
||||
kernel/kernel_interface.c kernel/kernel_interface.h \
|
||||
kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
|
||||
kernel/kernel_net.c kernel/kernel_net.h \
|
||||
kernel/kernel_listener.h
|
||||
hydra.c hydra.h
|
||||
|
||||
LOCAL_SRC_FILES := $(filter %.c,$(libhydra_la_SOURCES))
|
||||
|
||||
|
|
|
@ -1,11 +1,7 @@
|
|||
ipseclib_LTLIBRARIES = libhydra.la
|
||||
|
||||
libhydra_la_SOURCES = \
|
||||
hydra.c hydra.h \
|
||||
kernel/kernel_interface.c kernel/kernel_interface.h \
|
||||
kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
|
||||
kernel/kernel_net.c kernel/kernel_net.h \
|
||||
kernel/kernel_listener.h
|
||||
hydra.c hydra.h
|
||||
|
||||
libhydra_la_LIBADD = \
|
||||
$(top_builddir)/src/libstrongswan/libstrongswan.la
|
||||
|
|
|
@ -57,7 +57,6 @@ void libhydra_deinit()
|
|||
return;
|
||||
}
|
||||
|
||||
this->public.kernel_interface->destroy(this->public.kernel_interface);
|
||||
free(this);
|
||||
hydra = NULL;
|
||||
}
|
||||
|
@ -81,8 +80,6 @@ bool libhydra_init()
|
|||
);
|
||||
hydra = &this->public;
|
||||
|
||||
this->public.kernel_interface = kernel_interface_create();
|
||||
|
||||
if (lib->integrity &&
|
||||
!lib->integrity->check(lib->integrity, "libhydra", libhydra_init))
|
||||
{
|
||||
|
|
|
@ -31,8 +31,6 @@
|
|||
|
||||
typedef struct hydra_t hydra_t;
|
||||
|
||||
#include <kernel/kernel_interface.h>
|
||||
|
||||
#include <library.h>
|
||||
|
||||
/**
|
||||
|
@ -40,10 +38,6 @@ typedef struct hydra_t hydra_t;
|
|||
*/
|
||||
struct hydra_t {
|
||||
|
||||
/**
|
||||
* kernel interface to communicate with kernel
|
||||
*/
|
||||
kernel_interface_t *kernel_interface;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -16,6 +16,7 @@ AM_CPPFLAGS = \
|
|||
-I${linux_headers} \
|
||||
-I$(top_srcdir)/src/libstrongswan \
|
||||
-I$(top_srcdir)/src/libhydra \
|
||||
-I$(top_srcdir)/src/libcharon \
|
||||
-I$(top_srcdir)/src/starter \
|
||||
-I$(top_srcdir)/src/stroke \
|
||||
-DIPSEC_DIR=\"${ipsecdir}\" \
|
||||
|
@ -33,6 +34,7 @@ AM_YFLAGS = -v -d
|
|||
starter_LDADD = \
|
||||
$(top_builddir)/src/libstrongswan/libstrongswan.la \
|
||||
$(top_builddir)/src/libhydra/libhydra.la \
|
||||
$(top_builddir)/src/libcharon/libcharon.la \
|
||||
libstarter.la \
|
||||
$(SOCKLIB) $(PTHREADLIB)
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#include <library.h>
|
||||
#include <hydra.h>
|
||||
#include <utils/debug.h>
|
||||
|
||||
#include "files.h"
|
||||
|
|
Loading…
Reference in New Issue