mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 04:02:15 +02:00
Code

dcocli: Do not use KoTun with ENABLE_PG and USE_TUN_BUILDER

Browse Source 
Signed-off-by: David Sommerseth <davids@openvpn.net>
Signed-off-by: Arne Schwabe <arne@openvpn.net>
This commit is contained in:
David Sommerseth 2019-11-09 19:34:47 +01:00 committed by Arne Schwabe
parent d1fd4ef1f1
commit 22d0f2bf28
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openvpn/dco/dcocli.hpp
View File

@ -161,7 +161,10 @@ namespace openvpn {
UDPTransport::AsioEndpoint server_endpoint;
};
#ifdef ENABLE_PG
#if defined(ENABLE_PG)
#if defined(USE_TUN_BUILDER)
#error ENABLE_PG and USE_TUN_BUILDER cannot be used together
#endif
typedef KoTun::Tun<Client*> TunImpl;
#else
typedef KoTun::TunClient<Client*> TunImpl;
@ -202,9 +205,13 @@ namespace openvpn {
*/
if (config->builder)
{
int fd = config->builder->tun_builder_open_kovpn(devconf);
#ifdef ENABLE_PG
throw Exception("tun builder does not work with ENABLE_PG");
#else
int fd = config->builder->tun_builder_open_kovpn(devconf);
impl.reset (new TunImpl(io_context, fd, devconf.dc.dev_name,
this, config->transport.frame));
#endif
}
else
{