From 8a0c88cd8d9a906689e9ee8a0a8282009c07644a Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sat, 28 Oct 2017 12:34:22 +0300 Subject: [PATCH] Initialize packet flow adapter inside completion handler --- OpenVPN Adapter/OpenVPNAdapter.mm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/OpenVPN Adapter/OpenVPNAdapter.mm b/OpenVPN Adapter/OpenVPNAdapter.mm index c34f6c1..c68856b 100644 --- a/OpenVPN Adapter/OpenVPNAdapter.mm +++ b/OpenVPN Adapter/OpenVPNAdapter.mm @@ -179,19 +179,13 @@ public: return -1; } - __block NEPacketTunnelFlow *packetFlow; - dispatch_semaphore_t semaphore = dispatch_semaphore_create(0); [client.delegate openVPNAdapter:client configureTunnelWithNetworkSettings:networkSettings completionHandler:^(NEPacketTunnelFlow * _Nullable flow) { - packetFlow = flow; + client.packetFlowAdapter = [[OpenVPNPacketFlowAdapter alloc] initWithPacketFlow:flow]; dispatch_semaphore_signal(semaphore); }]; dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC)); - if (packetFlow) { - client.packetFlowAdapter = [[OpenVPNPacketFlowAdapter alloc] initWithPacketFlow:packetFlow]; - } - if (client.packetFlowAdapter) { return client.packetFlowAdapter.socketHandle; } else {