diff options
Diffstat (limited to 'src/libcharon/plugins')
17 files changed, 95 insertions, 82 deletions
diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c index 4a6b4514a..5bca514af 100644 --- a/src/libcharon/plugins/dhcp/dhcp_socket.c +++ b/src/libcharon/plugins/dhcp/dhcp_socket.c @@ -206,8 +206,8 @@ static int prepare_dhcp(private_dhcp_socket_t *this, else { /* act as relay agent */ - src = charon->kernel_interface->get_source_addr( - charon->kernel_interface, this->dst, NULL); + src = hydra->kernel_interface->get_source_addr(hydra->kernel_interface, + this->dst, NULL); if (src) { memcpy(&dhcp->gateway_address, src->get_address(src).ptr, diff --git a/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c b/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c index 7fa307f9a..68cab1762 100644 --- a/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c +++ b/src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c @@ -1293,8 +1293,8 @@ static void process_acquire(private_kernel_klips_ipsec_t *this, struct sadb_msg* this->mutex->unlock(this->mutex); - charon->kernel_interface->acquire(charon->kernel_interface, reqid, NULL, - NULL); + hydra->kernel_interface->acquire(hydra->kernel_interface, reqid, NULL, + NULL); } /** @@ -1353,8 +1353,8 @@ static void process_mapping(private_kernel_klips_ipsec_t *this, struct sadb_msg* new_src = host_create_from_sockaddr(addr); if (new_src) { - charon->kernel_interface->mapping(charon->kernel_interface, reqid, - spi, new_src); + hydra->kernel_interface->mapping(hydra->kernel_interface, reqid, + spi, new_src); } } } @@ -1491,8 +1491,8 @@ static job_requeue_t sa_expires(sa_expire_t *expire) DBG2(DBG_KNL, "%N CHILD_SA with SPI %.8x and reqid {%d} expired", protocol_id_names, protocol, ntohl(spi), reqid); - charon->kernel_interface->expire(charon->kernel_interface, reqid, protocol, - spi, hard); + hydra->kernel_interface->expire(hydra->kernel_interface, reqid, protocol, + spi, hard); return JOB_REQUEUE_NONE; } @@ -2105,8 +2105,8 @@ METHOD(kernel_ipsec_t, add_policy, status_t, if (mode != MODE_TRANSPORT && src->get_family(src) != AF_INET6 && this->install_routes) { - charon->kernel_interface->get_address_by_ts(charon->kernel_interface, - src_ts, &route->src_ip); + hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface, + src_ts, &route->src_ip); } if (!route->src_ip) @@ -2115,8 +2115,8 @@ METHOD(kernel_ipsec_t, add_policy, status_t, } /* find the virtual interface */ - iface = charon->kernel_interface->get_interface(charon->kernel_interface, - src); + iface = hydra->kernel_interface->get_interface(hydra->kernel_interface, + src); if (find_ipsec_dev(this, iface, &dev) == SUCCESS) { /* above, we got either the name of a virtual or a physical @@ -2162,12 +2162,12 @@ METHOD(kernel_ipsec_t, add_policy, status_t, route->if_name = strdup(dev->name); /* get the nexthop to dst */ - route->gateway = charon->kernel_interface->get_nexthop( - charon->kernel_interface, dst); + route->gateway = hydra->kernel_interface->get_nexthop( + hydra->kernel_interface, dst); route->dst_net = chunk_clone(policy->dst.net->get_address(policy->dst.net)); route->prefixlen = policy->dst.mask; - switch (charon->kernel_interface->add_route(charon->kernel_interface, + switch (hydra->kernel_interface->add_route(hydra->kernel_interface, route->dst_net, route->prefixlen, route->gateway, route->src_ip, route->if_name)) { @@ -2449,7 +2449,7 @@ METHOD(kernel_ipsec_t, del_policy, status_t, { ipsec_dev_t *dev; - if (charon->kernel_interface->del_route(charon->kernel_interface, + if (hydra->kernel_interface->del_route(hydra->kernel_interface, route->dst_net, route->prefixlen, route->gateway, route->src_ip, route->if_name) != SUCCESS) { diff --git a/src/libcharon/plugins/kernel_klips/kernel_klips_plugin.c b/src/libcharon/plugins/kernel_klips/kernel_klips_plugin.c index fa5e9eb29..1a22835c0 100644 --- a/src/libcharon/plugins/kernel_klips/kernel_klips_plugin.c +++ b/src/libcharon/plugins/kernel_klips/kernel_klips_plugin.c @@ -18,7 +18,7 @@ #include "kernel_klips_ipsec.h" -#include <daemon.h> +#include <hydra.h> typedef struct private_kernel_klips_plugin_t private_kernel_klips_plugin_t; @@ -37,7 +37,8 @@ struct private_kernel_klips_plugin_t { */ static void destroy(private_kernel_klips_plugin_t *this) { - charon->kernel_interface->remove_ipsec_interface(charon->kernel_interface, (kernel_ipsec_constructor_t)kernel_klips_ipsec_create); + hydra->kernel_interface->remove_ipsec_interface(hydra->kernel_interface, + (kernel_ipsec_constructor_t)kernel_klips_ipsec_create); free(this); } @@ -50,7 +51,8 @@ plugin_t *kernel_klips_plugin_create() this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - charon->kernel_interface->add_ipsec_interface(charon->kernel_interface, (kernel_ipsec_constructor_t)kernel_klips_ipsec_create); + hydra->kernel_interface->add_ipsec_interface(hydra->kernel_interface, + (kernel_ipsec_constructor_t)kernel_klips_ipsec_create); return &this->public.plugin; } diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c index c366efde2..7de60b00a 100644 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -554,8 +554,8 @@ static void process_acquire(private_kernel_netlink_ipsec_t *this, struct nlmsghd src_ts = selector2ts(&acquire->sel, TRUE); dst_ts = selector2ts(&acquire->sel, FALSE); - charon->kernel_interface->acquire(charon->kernel_interface, reqid, src_ts, - dst_ts); + hydra->kernel_interface->acquire(hydra->kernel_interface, reqid, src_ts, + dst_ts); } /** @@ -581,8 +581,8 @@ static void process_expire(private_kernel_netlink_ipsec_t *this, struct nlmsghdr return; } - charon->kernel_interface->expire(charon->kernel_interface, reqid, protocol, - spi, expire->hard != 0); + hydra->kernel_interface->expire(hydra->kernel_interface, reqid, protocol, + spi, expire->hard != 0); } /** @@ -646,8 +646,8 @@ static void process_migrate(private_kernel_netlink_ipsec_t *this, struct nlmsghd if (src_ts && dst_ts && local && remote) { - charon->kernel_interface->migrate(charon->kernel_interface, reqid, - src_ts, dst_ts, dir, local, remote); + hydra->kernel_interface->migrate(hydra->kernel_interface, reqid, + src_ts, dst_ts, dir, local, remote); } else { @@ -680,8 +680,8 @@ static void process_mapping(private_kernel_netlink_ipsec_t *this, mapping->new_sport); if (host) { - charon->kernel_interface->mapping(charon->kernel_interface, reqid, - spi, host); + hydra->kernel_interface->mapping(hydra->kernel_interface, reqid, + spi, host); } } } @@ -1791,23 +1791,23 @@ METHOD(kernel_ipsec_t, add_policy, status_t, { route_entry_t *route = malloc_thing(route_entry_t); - if (charon->kernel_interface->get_address_by_ts(charon->kernel_interface, + if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface, dst_ts, &route->src_ip) == SUCCESS) { /* get the nexthop to src (src as we are in POLICY_FWD).*/ - route->gateway = charon->kernel_interface->get_nexthop( - charon->kernel_interface, src); + route->gateway = hydra->kernel_interface->get_nexthop( + hydra->kernel_interface, src); /* install route via outgoing interface */ - route->if_name = charon->kernel_interface->get_interface( - charon->kernel_interface, dst); + route->if_name = hydra->kernel_interface->get_interface( + hydra->kernel_interface, dst); route->dst_net = chunk_alloc(policy->sel.family == AF_INET ? 4 : 16); memcpy(route->dst_net.ptr, &policy->sel.saddr, route->dst_net.len); route->prefixlen = policy->sel.prefixlen_s; if (route->if_name) { - switch (charon->kernel_interface->add_route( - charon->kernel_interface, route->dst_net, + switch (hydra->kernel_interface->add_route( + hydra->kernel_interface, route->dst_net, route->prefixlen, route->gateway, route->src_ip, route->if_name)) { @@ -2053,7 +2053,7 @@ METHOD(kernel_ipsec_t, del_policy, status_t, if (route) { - if (charon->kernel_interface->del_route(charon->kernel_interface, + if (hydra->kernel_interface->del_route(hydra->kernel_interface, route->dst_net, route->prefixlen, route->gateway, route->src_ip, route->if_name) != SUCCESS) { diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c index e55329e84..0beb32d4b 100644 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c @@ -227,7 +227,7 @@ static int get_vip_refcount(private_kernel_netlink_net_t *this, host_t* ip) */ static job_requeue_t roam_event(uintptr_t address) { - charon->kernel_interface->roam(charon->kernel_interface, address != 0); + hydra->kernel_interface->roam(hydra->kernel_interface, address != 0); return JOB_REQUEUE_NONE; } diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c index 4c61265aa..212675d1a 100644 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c @@ -19,7 +19,7 @@ #include "kernel_netlink_ipsec.h" #include "kernel_netlink_net.h" -#include <daemon.h> +#include <hydra.h> typedef struct private_kernel_netlink_plugin_t private_kernel_netlink_plugin_t; @@ -38,8 +38,10 @@ struct private_kernel_netlink_plugin_t { */ static void destroy(private_kernel_netlink_plugin_t *this) { - charon->kernel_interface->remove_ipsec_interface(charon->kernel_interface, (kernel_ipsec_constructor_t)kernel_netlink_ipsec_create); - charon->kernel_interface->remove_net_interface(charon->kernel_interface, (kernel_net_constructor_t)kernel_netlink_net_create); + hydra->kernel_interface->remove_ipsec_interface(hydra->kernel_interface, + (kernel_ipsec_constructor_t)kernel_netlink_ipsec_create); + hydra->kernel_interface->remove_net_interface(hydra->kernel_interface, + (kernel_net_constructor_t)kernel_netlink_net_create); free(this); } @@ -52,8 +54,10 @@ plugin_t *kernel_netlink_plugin_create() this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - charon->kernel_interface->add_ipsec_interface(charon->kernel_interface, (kernel_ipsec_constructor_t)kernel_netlink_ipsec_create); - charon->kernel_interface->add_net_interface(charon->kernel_interface, (kernel_net_constructor_t)kernel_netlink_net_create); + hydra->kernel_interface->add_ipsec_interface(hydra->kernel_interface, + (kernel_ipsec_constructor_t)kernel_netlink_ipsec_create); + hydra->kernel_interface->add_net_interface(hydra->kernel_interface, + (kernel_net_constructor_t)kernel_netlink_net_create); return &this->public.plugin; } diff --git a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index 4cb175bfa..735978317 100644 --- a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -916,8 +916,8 @@ static void process_acquire(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* dst_ts = sadb_address2ts(response.dst); this->mutex->unlock(this->mutex); - charon->kernel_interface->acquire(charon->kernel_interface, reqid, src_ts, - dst_ts); + hydra->kernel_interface->acquire(hydra->kernel_interface, reqid, src_ts, + dst_ts); } /** @@ -950,8 +950,8 @@ static void process_expire(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* return; } - charon->kernel_interface->expire(charon->kernel_interface, reqid, protocol, - spi, hard); + hydra->kernel_interface->expire(hydra->kernel_interface, reqid, protocol, + spi, hard); } #ifdef SADB_X_MIGRATE @@ -996,8 +996,8 @@ static void process_migrate(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* if (src_ts && dst_ts && local && remote) { - charon->kernel_interface->migrate(charon->kernel_interface, reqid, - src_ts, dst_ts, dir, local, remote); + hydra->kernel_interface->migrate(hydra->kernel_interface, reqid, + src_ts, dst_ts, dir, local, remote); } else { @@ -1058,8 +1058,8 @@ static void process_mapping(private_kernel_pfkey_ipsec_t *this, struct sadb_msg* host = host_create_from_sockaddr(sa); if (host) { - charon->kernel_interface->mapping(charon->kernel_interface, reqid, - spi, host); + hydra->kernel_interface->mapping(hydra->kernel_interface, reqid, + spi, host); } } } @@ -1745,21 +1745,21 @@ METHOD(kernel_ipsec_t, add_policy, status_t, { route_entry_t *route = malloc_thing(route_entry_t); - if (charon->kernel_interface->get_address_by_ts(charon->kernel_interface, + if (hydra->kernel_interface->get_address_by_ts(hydra->kernel_interface, dst_ts, &route->src_ip) == SUCCESS) { /* get the nexthop to src (src as we are in POLICY_FWD).*/ - route->gateway = charon->kernel_interface->get_nexthop( - charon->kernel_interface, src); - route->if_name = charon->kernel_interface->get_interface( - charon->kernel_interface, dst); + route->gateway = hydra->kernel_interface->get_nexthop( + hydra->kernel_interface, src); + route->if_name = hydra->kernel_interface->get_interface( + hydra->kernel_interface, dst); route->dst_net = chunk_clone(policy->src.net->get_address(policy->src.net)); route->prefixlen = policy->src.mask; if (route->if_name) { - switch (charon->kernel_interface->add_route( - charon->kernel_interface, route->dst_net, + switch (hydra->kernel_interface->add_route( + hydra->kernel_interface, route->dst_net, route->prefixlen, route->gateway, route->src_ip, route->if_name)) { @@ -1991,7 +1991,7 @@ METHOD(kernel_ipsec_t, del_policy, status_t, if (route) { - if (charon->kernel_interface->del_route(charon->kernel_interface, + if (hydra->kernel_interface->del_route(hydra->kernel_interface, route->dst_net, route->prefixlen, route->gateway, route->src_ip, route->if_name) != SUCCESS) { diff --git a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c index b84ccf150..781ba5008 100644 --- a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c +++ b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c @@ -18,7 +18,7 @@ #include "kernel_pfkey_ipsec.h" -#include <daemon.h> +#include <hydra.h> typedef struct private_kernel_pfkey_plugin_t private_kernel_pfkey_plugin_t; @@ -37,7 +37,8 @@ struct private_kernel_pfkey_plugin_t { */ static void destroy(private_kernel_pfkey_plugin_t *this) { - charon->kernel_interface->remove_ipsec_interface(charon->kernel_interface, (kernel_ipsec_constructor_t)kernel_pfkey_ipsec_create); + hydra->kernel_interface->remove_ipsec_interface(hydra->kernel_interface, + (kernel_ipsec_constructor_t)kernel_pfkey_ipsec_create); free(this); } @@ -50,7 +51,8 @@ plugin_t *kernel_pfkey_plugin_create() this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - charon->kernel_interface->add_ipsec_interface(charon->kernel_interface, (kernel_ipsec_constructor_t)kernel_pfkey_ipsec_create); + hydra->kernel_interface->add_ipsec_interface(hydra->kernel_interface, + (kernel_ipsec_constructor_t)kernel_pfkey_ipsec_create); return &this->public.plugin; } diff --git a/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c index 9f40daeaa..b471a10a0 100644 --- a/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c +++ b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c @@ -155,7 +155,7 @@ struct private_kernel_pfroute_net_t */ static job_requeue_t roam_event(uintptr_t address) { - charon->kernel_interface->roam(charon->kernel_interface, address != 0); + hydra->kernel_interface->roam(hydra->kernel_interface, address != 0); return JOB_REQUEUE_NONE; } diff --git a/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c index 97139fb56..5f351bd72 100644 --- a/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c +++ b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c @@ -18,7 +18,7 @@ #include "kernel_pfroute_net.h" -#include <daemon.h> +#include <hydra.h> typedef struct private_kernel_pfroute_plugin_t private_kernel_pfroute_plugin_t; @@ -37,7 +37,7 @@ struct private_kernel_pfroute_plugin_t { */ static void destroy(private_kernel_pfroute_plugin_t *this) { - charon->kernel_interface->remove_net_interface(charon->kernel_interface, + hydra->kernel_interface->remove_net_interface(hydra->kernel_interface, (kernel_net_constructor_t)kernel_pfroute_net_create); free(this); } @@ -51,7 +51,7 @@ plugin_t *kernel_pfroute_plugin_create() this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - charon->kernel_interface->add_net_interface(charon->kernel_interface, + hydra->kernel_interface->add_net_interface(hydra->kernel_interface, (kernel_net_constructor_t)kernel_pfroute_net_create); return &this->public.plugin; diff --git a/src/libcharon/plugins/load_tester/load_tester_plugin.c b/src/libcharon/plugins/load_tester/load_tester_plugin.c index c9384d558..a1956d17c 100644 --- a/src/libcharon/plugins/load_tester/load_tester_plugin.c +++ b/src/libcharon/plugins/load_tester/load_tester_plugin.c @@ -156,7 +156,7 @@ static void destroy(private_load_tester_plugin_t *this) this->condvar->wait(this->condvar, this->mutex); } this->mutex->unlock(this->mutex); - charon->kernel_interface->remove_ipsec_interface(charon->kernel_interface, + hydra->kernel_interface->remove_ipsec_interface(hydra->kernel_interface, (kernel_ipsec_constructor_t)load_tester_ipsec_create); charon->backends->remove_backend(charon->backends, &this->config->backend); lib->credmgr->remove_set(lib->credmgr, &this->creds->credential_set); @@ -216,7 +216,7 @@ plugin_t *load_tester_plugin_create() if (lib->settings->get_bool(lib->settings, "charon.plugins.load-tester.fake_kernel", FALSE)) { - charon->kernel_interface->add_ipsec_interface(charon->kernel_interface, + hydra->kernel_interface->add_ipsec_interface(hydra->kernel_interface, (kernel_ipsec_constructor_t)load_tester_ipsec_create); } this->running = 0; diff --git a/src/libcharon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c index 04d4f211f..983481808 100644 --- a/src/libcharon/plugins/socket_default/socket_default_socket.c +++ b/src/libcharon/plugins/socket_default/socket_default_socket.c @@ -42,6 +42,7 @@ #include <sys/sysctl.h> #endif +#include <hydra.h> #include <daemon.h> #include <threading/thread.h> @@ -525,8 +526,8 @@ static int open_socket(private_socket_default_socket_t *this, } } - if (!charon->kernel_interface->bypass_socket(charon->kernel_interface, - skt, family)) + if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface, + skt, family)) { DBG1(DBG_NET, "installing IKE bypass policy failed"); } diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c index fa2f2f07b..861ebfd6f 100644 --- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c +++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c @@ -36,6 +36,7 @@ #include <netinet/udp.h> #include <net/if.h> +#include <hydra.h> #include <daemon.h> #include <threading/thread.h> #include <threading/rwlock.h> @@ -422,8 +423,8 @@ static int open_socket(private_socket_dynamic_socket_t *this, return 0; } - if (!charon->kernel_interface->bypass_socket(charon->kernel_interface, - fd, family)) + if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface, + fd, family)) { DBG1(DBG_NET, "installing IKE bypass policy failed"); } diff --git a/src/libcharon/plugins/socket_raw/socket_raw_socket.c b/src/libcharon/plugins/socket_raw/socket_raw_socket.c index 6cc2375c4..66bc78526 100644 --- a/src/libcharon/plugins/socket_raw/socket_raw_socket.c +++ b/src/libcharon/plugins/socket_raw/socket_raw_socket.c @@ -36,6 +36,7 @@ #include <linux/filter.h> #include <net/if.h> +#include <hydra.h> #include <daemon.h> #include <threading/thread.h> @@ -496,8 +497,8 @@ static int open_send_socket(private_socket_raw_socket_t *this, } } - if (!charon->kernel_interface->bypass_socket(charon->kernel_interface, - skt, family)) + if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface, + skt, family)) { DBG1(DBG_NET, "installing bypass policy on send socket failed"); } @@ -602,8 +603,8 @@ static int open_recv_socket(private_socket_raw_socket_t *this, int family) return 0; } - if (!charon->kernel_interface->bypass_socket(charon->kernel_interface, - skt, family)) + if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface, + skt, family)) { DBG1(DBG_NET, "installing bypass policy on receive socket failed"); } diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c index 86b958b0d..165212a5e 100644 --- a/src/libcharon/plugins/stroke/stroke_config.c +++ b/src/libcharon/plugins/stroke/stroke_config.c @@ -15,6 +15,7 @@ #include "stroke_config.h" +#include <hydra.h> #include <daemon.h> #include <threading/mutex.h> #include <utils/lexparser.h> @@ -199,8 +200,8 @@ static ike_cfg_t *build_ike_cfg(private_stroke_config_t *this, stroke_msg_t *msg host = host_create_from_dns(msg->add_conn.other.address, 0, 0); if (host) { - interface = charon->kernel_interface->get_interface( - charon->kernel_interface, host); + interface = hydra->kernel_interface->get_interface( + hydra->kernel_interface, host); host->destroy(host); if (interface) { @@ -215,8 +216,8 @@ static ike_cfg_t *build_ike_cfg(private_stroke_config_t *this, stroke_msg_t *msg host = host_create_from_dns(msg->add_conn.me.address, 0, 0); if (host) { - interface = charon->kernel_interface->get_interface( - charon->kernel_interface, host); + interface = hydra->kernel_interface->get_interface( + hydra->kernel_interface, host); host->destroy(host); if (!interface) { diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c index d21e1f070..ee7927f3c 100644 --- a/src/libcharon/plugins/stroke/stroke_list.c +++ b/src/libcharon/plugins/stroke/stroke_list.c @@ -455,8 +455,8 @@ static void status(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bo } enumerator->destroy(enumerator); - enumerator = charon->kernel_interface->create_address_enumerator( - charon->kernel_interface, FALSE, FALSE); + enumerator = hydra->kernel_interface->create_address_enumerator( + hydra->kernel_interface, FALSE, FALSE); fprintf(out, "Listening IP addresses:\n"); while (enumerator->enumerate(enumerator, (void**)&host)) { diff --git a/src/libcharon/plugins/updown/updown_listener.c b/src/libcharon/plugins/updown/updown_listener.c index ea4a792c2..8e58b1a9b 100644 --- a/src/libcharon/plugins/updown/updown_listener.c +++ b/src/libcharon/plugins/updown/updown_listener.c @@ -18,6 +18,7 @@ #include "updown_listener.h" +#include <hydra.h> #include <daemon.h> #include <config/child_cfg.h> @@ -218,8 +219,8 @@ METHOD(listener_t, child_updown, bool, if (up) { - iface = charon->kernel_interface->get_interface( - charon->kernel_interface, me); + iface = hydra->kernel_interface->get_interface( + hydra->kernel_interface, me); if (iface) { cache_iface(this, child_sa->get_reqid(child_sa), iface); |