github/OpenVPNAdapter
3
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2026-06-01 00:00:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix variable names corrupted during incomplete conflict resolving

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-09-23 12:28:54 +03:00
parent 435663953e
commit 9932456cda
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenVPN Adapter/OpenVPNAdapter.mm
+9 -9
View File
@@ -327,16 +327,16 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
- (void)teardownTunnel:(BOOL)disconnect { - (void)teardownTunnel:(BOOL)disconnect {
[self resetTunnelSettings]; [self resetTunnelSettings];
if (self.vpnSocket) { if (_vpnSocket) {
CFSocketInvalidate(self.vpnSocket); CFSocketInvalidate(_vpnSocket);
CFRelease(self.vpnSocket); CFRelease(_vpnSocket);
self.vpnSocket = nil; _vpnSocket = nil;
} }
if (self.tunSocket) { if (_tunSocket) {
CFSocketInvalidate(self.tunSocket); CFSocketInvalidate(_tunSocket);
CFRelease(self.tunSocket); CFRelease(_tunSocket);
self.tunSocket = nil; _tunSocket = nil;
} }
} }
@@ -556,7 +556,7 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
- (void)writeVPNPackets:(NSArray<NSData *> *)packets protocols:(NSArray<NSNumber *> *)protocols { - (void)writeVPNPackets:(NSArray<NSData *> *)packets protocols:(NSArray<NSNumber *> *)protocols {
[packets enumerateObjectsUsingBlock:^(NSData *data, NSUInteger idx, BOOL *stop) { [packets enumerateObjectsUsingBlock:^(NSData *data, NSUInteger idx, BOOL *stop) {
if (!self.vpnSocket) { if (!_vpnSocket) {
*stop = YES; *stop = YES;
return; return;
} }