From 9932456cda4bd78ed4cda3b9a58d10bff1f29495 Mon Sep 17 00:00:00 2001
From: Sergey Abramchuk <ss.abramchuk@gmail.com>
Date: Sat, 23 Sep 2017 12:28:54 +0300
Subject: [PATCH] Fix variable names corrupted during incomplete conflict
 resolving

---
 OpenVPN Adapter/OpenVPNAdapter.mm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/OpenVPN Adapter/OpenVPNAdapter.mm b/OpenVPN Adapter/OpenVPNAdapter.mm
index c392e74..fb61b64 100644
--- a/OpenVPN Adapter/OpenVPNAdapter.mm	
+++ b/OpenVPN Adapter/OpenVPNAdapter.mm	
@@ -327,16 +327,16 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
 - (void)teardownTunnel:(BOOL)disconnect {
     [self resetTunnelSettings];
     
-    if (self.vpnSocket) {
-        CFSocketInvalidate(self.vpnSocket);
-        CFRelease(self.vpnSocket);
-        self.vpnSocket = nil;
+    if (_vpnSocket) {
+        CFSocketInvalidate(_vpnSocket);
+        CFRelease(_vpnSocket);
+        _vpnSocket = nil;
     }
     
-    if (self.tunSocket) {
-        CFSocketInvalidate(self.tunSocket);
-        CFRelease(self.tunSocket);
-        self.tunSocket = nil;
+    if (_tunSocket) {
+        CFSocketInvalidate(_tunSocket);
+        CFRelease(_tunSocket);
+        _tunSocket = nil;
     }
 }
 
@@ -556,7 +556,7 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
 
 - (void)writeVPNPackets:(NSArray<NSData *> *)packets protocols:(NSArray<NSNumber *> *)protocols {
     [packets enumerateObjectsUsingBlock:^(NSData *data, NSUInteger idx, BOOL *stop) {
-        if (!self.vpnSocket) {
+        if (!_vpnSocket) {
             *stop = YES;
             return;
         }