diff options
author | Tobias Brunner <tobias@strongswan.org> | 2016-03-03 17:39:27 +0100 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2016-03-03 17:39:58 +0100 |
commit | 88ce12a927f03d88f29609a46e7880dc0ecfb8be (patch) | |
tree | 7966167225b3e6f2ac51554f6092a28ab132c2b0 /src/libcharon/plugins/socket_win/socket_win_socket.c | |
parent | 91d80298f9de5e7d792b7cb0a6c7a2c61784d744 (diff) | |
parent | 28649f6d91971e0fe50078aec2937010e8c61cd8 (diff) | |
download | strongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.bz2 strongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.xz |
Merge branch 'libhydra-bye-bye'
Moves kernel plugins to libcharon and removes the unused libhydra. The
kernel interface is now accessible under charon->kernel.
Diffstat (limited to 'src/libcharon/plugins/socket_win/socket_win_socket.c')
-rw-r--r-- | src/libcharon/plugins/socket_win/socket_win_socket.c | 7 |
1 files changed, 2 insertions, 5 deletions
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 <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"); } |