github/OpenVPNAdapter
github/OpenVPNAdapter
3
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2024-10-06 17:22:07 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenVPN Adapter/OpenVPNAdapter.mm
View File

@ -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;
}