From f7678976c5c90c6234692a1f4e1b2e248b6d8ab2 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sat, 28 Oct 2017 13:12:25 +0300 Subject: [PATCH] Rename OpenVPNPacketFlow to OpenVPNPacketFlowBridge --- OpenVPN Adapter.xcodeproj/project.pbxproj | 24 +++++++++---------- OpenVPN Adapter/OpenVPNAdapter.mm | 12 +++++----- ...PacketFlow.h => OpenVPNPacketFlowBridge.h} | 4 ++-- ...cketFlow.mm => OpenVPNPacketFlowBridge.mm} | 10 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) rename OpenVPN Adapter/{OpenVPNPacketFlow.h => OpenVPNPacketFlowBridge.h} (84%) rename OpenVPN Adapter/{OpenVPNPacketFlow.mm => OpenVPNPacketFlowBridge.mm} (95%) diff --git a/OpenVPN Adapter.xcodeproj/project.pbxproj b/OpenVPN Adapter.xcodeproj/project.pbxproj index a23411a..2ff6418 100644 --- a/OpenVPN Adapter.xcodeproj/project.pbxproj +++ b/OpenVPN Adapter.xcodeproj/project.pbxproj @@ -11,10 +11,10 @@ ABD6EF0A1F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = ABD6EF071F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.h */; }; ABD6EF0B1F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = ABD6EF081F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m */; }; ABD6EF0C1F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = ABD6EF081F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m */; }; - ABD6EF101F8F93AB007D3D90 /* OpenVPNPacketFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlow.h */; }; - ABD6EF111F8F93AB007D3D90 /* OpenVPNPacketFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlow.h */; }; - ABD6EF121F8F93AB007D3D90 /* OpenVPNPacketFlow.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlow.mm */; }; - ABD6EF131F8F93AB007D3D90 /* OpenVPNPacketFlow.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlow.mm */; }; + ABD6EF101F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h */; }; + ABD6EF111F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h */; }; + ABD6EF121F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm */; }; + ABD6EF131F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm */; }; ABD6EF171F8F9C38007D3D90 /* OpenVPNAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = ABD6EF151F8F9C37007D3D90 /* OpenVPNAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; ABD6EF181F8F9C38007D3D90 /* OpenVPNAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD6EF161F8F9C38007D3D90 /* OpenVPNAdapter.mm */; }; ABD6EF191F8F9C3B007D3D90 /* OpenVPNAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = ABD6EF151F8F9C37007D3D90 /* OpenVPNAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -168,8 +168,8 @@ /* Begin PBXFileReference section */ ABD6EF071F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNNetworkSettingsBuilder.h; sourceTree = ""; }; ABD6EF081F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OpenVPNNetworkSettingsBuilder.m; sourceTree = ""; }; - ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNPacketFlow.h; sourceTree = ""; }; - ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlow.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNPacketFlow.mm; sourceTree = ""; }; + ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNPacketFlowBridge.h; sourceTree = ""; }; + ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNPacketFlowBridge.mm; sourceTree = ""; }; ABD6EF151F8F9C37007D3D90 /* OpenVPNAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapter.h; sourceTree = ""; }; ABD6EF161F8F9C38007D3D90 /* OpenVPNAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNAdapter.mm; sourceTree = ""; }; C90BAD261E73F47E00DEFB32 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = ""; }; @@ -436,8 +436,8 @@ ABD6EF161F8F9C38007D3D90 /* OpenVPNAdapter.mm */, ABD6EF071F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.h */, ABD6EF081F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m */, - ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlow.h */, - ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlow.mm */, + ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h */, + ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm */, ); name = Adapter; sourceTree = ""; @@ -586,7 +586,7 @@ C98467AB1EAA5BE100272A9A /* OpenVPNConfiguration+Internal.h in Headers */, C98467A61EAA5B7700272A9A /* OpenVPNConfiguration.h in Headers */, C9B7956B1F1D26C900CF35FE /* OpenVPNReachability+Internal.h in Headers */, - ABD6EF101F8F93AB007D3D90 /* OpenVPNPacketFlow.h in Headers */, + ABD6EF101F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h in Headers */, C9657A2B1EB0B6FA00EFF210 /* OpenVPNTransportStats+Internal.h in Headers */, C9BB47601E71663A00F3F98C /* Umbrella-Header.h in Headers */, C9657A5E1EB0D60700EFF210 /* OpenVPNTransportProtocol.h in Headers */, @@ -629,7 +629,7 @@ C98467AC1EAA5BE200272A9A /* OpenVPNConfiguration+Internal.h in Headers */, C98467A71EAA5B7700272A9A /* OpenVPNConfiguration.h in Headers */, C9B7956C1F1D26C900CF35FE /* OpenVPNReachability+Internal.h in Headers */, - ABD6EF111F8F93AB007D3D90 /* OpenVPNPacketFlow.h in Headers */, + ABD6EF111F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h in Headers */, C9657A2F1EB0B79500EFF210 /* OpenVPNTransportStats+Internal.h in Headers */, C9D2ABE61EA20F99007EDF9D /* Umbrella-Header.h in Headers */, C9657A5F1EB0D60700EFF210 /* OpenVPNTransportProtocol.h in Headers */, @@ -862,7 +862,7 @@ C9BCE25A1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */, ABD6EF0B1F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m in Sources */, C98467A81EAA5B7700272A9A /* OpenVPNConfiguration.mm in Sources */, - ABD6EF121F8F93AB007D3D90 /* OpenVPNPacketFlow.mm in Sources */, + ABD6EF121F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm in Sources */, C9E4401F1F6086A1001D7C41 /* NSError+Message.m in Sources */, C9657A311EB0B7A900EFF210 /* OpenVPNTransportStats.mm in Sources */, C9B795661F1D182500CF35FE /* OpenVPNReachabilityTracker.mm in Sources */, @@ -901,7 +901,7 @@ C9BCE25B1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */, ABD6EF0C1F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m in Sources */, C98467A91EAA5B7700272A9A /* OpenVPNConfiguration.mm in Sources */, - ABD6EF131F8F93AB007D3D90 /* OpenVPNPacketFlow.mm in Sources */, + ABD6EF131F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm in Sources */, C9E440201F6086A1001D7C41 /* NSError+Message.m in Sources */, C9657A301EB0B7A600EFF210 /* OpenVPNTransportStats.mm in Sources */, C9B795671F1D182500CF35FE /* OpenVPNReachabilityTracker.mm in Sources */, diff --git a/OpenVPN Adapter/OpenVPNAdapter.mm b/OpenVPN Adapter/OpenVPNAdapter.mm index 5b13b62..e7f83d8 100644 --- a/OpenVPN Adapter/OpenVPNAdapter.mm +++ b/OpenVPN Adapter/OpenVPNAdapter.mm @@ -18,7 +18,7 @@ #import "OpenVPNError.h" #import "OpenVPNInterfaceStats+Internal.h" #import "OpenVPNNetworkSettingsBuilder.h" -#import "OpenVPNPacketFlow.h" +#import "OpenVPNPacketFlowBridge.h" #import "OpenVPNProperties+Internal.h" #import "OpenVPNSessionToken+Internal.h" #import "OpenVPNTransportStats+Internal.h" @@ -34,7 +34,7 @@ class Client; @property (nonatomic) OpenVPNNetworkSettingsBuilder *networkSettingsBuilder; -@property (nonatomic) OpenVPNPacketFlow *packetFlow; +@property (nonatomic) OpenVPNPacketFlowBridge *packetFlowBridge; - (OpenVPNAdapterError)errorByName:(NSString *)errorName; - (OpenVPNAdapterEvent)eventByName:(NSString *)errorName; @@ -181,13 +181,13 @@ public: dispatch_semaphore_t semaphore = dispatch_semaphore_create(0); [adapter.delegate openVPNAdapter:adapter configureTunnelWithNetworkSettings:networkSettings completionHandler:^(NEPacketTunnelFlow * _Nullable flow) { - adapter.packetFlow = [[OpenVPNPacketFlow alloc] initWithPacketFlow:flow]; + adapter.packetFlowBridge = [[OpenVPNPacketFlowBridge alloc] initWithPacketFlow:flow]; dispatch_semaphore_signal(semaphore); }]; dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC)); - if (adapter.packetFlow) { - return adapter.packetFlow.socketHandle; + if (adapter.packetFlowBridge) { + return adapter.packetFlowBridge.socketHandle; } else { return -1; } @@ -251,7 +251,7 @@ public: } void reset_tun() { - adapter.packetFlow = nil; + adapter.packetFlowBridge = nil; adapter.networkSettingsBuilder = nil; adapter.sessionName = nil; } diff --git a/OpenVPN Adapter/OpenVPNPacketFlow.h b/OpenVPN Adapter/OpenVPNPacketFlowBridge.h similarity index 84% rename from OpenVPN Adapter/OpenVPNPacketFlow.h rename to OpenVPN Adapter/OpenVPNPacketFlowBridge.h index c711a3a..438e881 100644 --- a/OpenVPN Adapter/OpenVPNPacketFlow.h +++ b/OpenVPN Adapter/OpenVPNPacketFlowBridge.h @@ -1,5 +1,5 @@ // -// OpenVPNPacketFlow.h +// OpenVPNPacketFlowBridge.h // OpenVPN Adapter // // Created by Jonathan Downing on 12/10/2017. @@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN @class NEPacketTunnelFlow; -@interface OpenVPNPacketFlow : NSObject +@interface OpenVPNPacketFlowBridge : NSObject @property (nonatomic, readonly) CFSocketNativeHandle socketHandle; diff --git a/OpenVPN Adapter/OpenVPNPacketFlow.mm b/OpenVPN Adapter/OpenVPNPacketFlowBridge.mm similarity index 95% rename from OpenVPN Adapter/OpenVPNPacketFlow.mm rename to OpenVPN Adapter/OpenVPNPacketFlowBridge.mm index 589f127..e4efd36 100644 --- a/OpenVPN Adapter/OpenVPNPacketFlow.mm +++ b/OpenVPN Adapter/OpenVPNPacketFlowBridge.mm @@ -1,5 +1,5 @@ // -// OpenVPNPacketFlow.mm +// OpenVPNPacketFlowBridge.mm // OpenVPN Adapter // // Created by Jonathan Downing on 12/10/2017. @@ -7,9 +7,9 @@ #import #import -#import "OpenVPNPacketFlow.h" +#import "OpenVPNPacketFlowBridge.h" -@interface OpenVPNPacketFlow () { +@interface OpenVPNPacketFlowBridge () { CFSocketRef _openVPNClientSocket; CFSocketRef _packetFlowSocket; } @@ -18,7 +18,7 @@ @end -@implementation OpenVPNPacketFlow +@implementation OpenVPNPacketFlowBridge - (CFSocketNativeHandle)socketHandle { return CFSocketGetNative(_openVPNClientSocket); @@ -38,7 +38,7 @@ } static inline void PacketFlowSocketCallback(CFSocketRef socket, CFSocketCallBackType type, CFDataRef address, const void *data, void *adapter) { - [(__bridge OpenVPNPacketFlow *)adapter writeDataToPacketFlow:(__bridge NSData *)data]; + [(__bridge OpenVPNPacketFlowBridge *)adapter writeDataToPacketFlow:(__bridge NSData *)data]; } - (BOOL)configureSockets {