From 8394ea2a42eb23ba22471d913dcf47e6067109e1 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 12 Feb 2016 15:30:18 +0100 Subject: libhydra: Move kernel interface to libcharon This moves hydra->kernel_interface to charon->kernel. --- src/libcharon/plugins/socket_win/socket_win_socket.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/libcharon/plugins/socket_win') diff --git a/src/libcharon/plugins/socket_win/socket_win_socket.c b/src/libcharon/plugins/socket_win/socket_win_socket.c index fbfbedae1..94af08e80 100644 --- a/src/libcharon/plugins/socket_win/socket_win_socket.c +++ b/src/libcharon/plugins/socket_win/socket_win_socket.c @@ -19,7 +19,6 @@ #include "socket_win_socket.h" #include -#include #include #include @@ -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"); } -- cgit v1.2.3 From 28649f6d91971e0fe50078aec2937010e8c61cd8 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 12 Feb 2016 16:35:54 +0100 Subject: libhydra: Remove empty unused library --- src/libcharon/plugins/socket_win/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'src/libcharon/plugins/socket_win') diff --git a/src/libcharon/plugins/socket_win/Makefile.am b/src/libcharon/plugins/socket_win/Makefile.am index f01178fcc..293d9bc9f 100644 --- a/src/libcharon/plugins/socket_win/Makefile.am +++ b/src/libcharon/plugins/socket_win/Makefile.am @@ -1,7 +1,6 @@ AM_CPPFLAGS = \ -I${linux_headers} \ -I$(top_srcdir)/src/libstrongswan \ - -I$(top_srcdir)/src/libhydra \ -I$(top_srcdir)/src/libcharon AM_CFLAGS = \ -- cgit v1.2.3