rms/OpenVPNAdapter
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/OpenVPNAdapter.git synced 2026-05-17 00:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/0.8.0

Browse Source
This commit is contained in:
Sergey Abramchuk
2021-06-27 13:42:05 +03:00
parent e51f828680 ba4a17f49b
commit a0b40a5862
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenVPNAdapter.xcodeproj/project.pbxproj
View File

@@ -7,17 +7,17 @@
objects = {
/* Begin PBXBuildFile section */
C90F316D2683BC12002F1A6C /* OpenVPNAdapterDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = C90F316C2683BC11002F1A6C /* OpenVPNAdapterDeclaration.h */; settings = {ATTRIBUTES = (Public, ); }; };
C910EAE524EBB1DA0081AF13 /* OpenVPNReachabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FD624123F48005C2EBC /* OpenVPNReachabilityTests.swift */; };
C910EAE724EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h in Headers */ = {isa = PBXBuildFile; fileRef = C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */; settings = {ATTRIBUTES = (Public, ); }; };
C910EAEE24EBBFB60081AF13 /* client.crt in Resources */ = {isa = PBXBuildFile; fileRef = C910EAEB24EBBFB60081AF13 /* client.crt */; };
C910EAEF24EBBFB60081AF13 /* ca.crt in Resources */ = {isa = PBXBuildFile; fileRef = C910EAEC24EBBFB60081AF13 /* ca.crt */; };
C910EAF024EBBFB60081AF13 /* client.key in Resources */ = {isa = PBXBuildFile; fileRef = C910EAED24EBBFB60081AF13 /* client.key */; };
C910EAF224EBC6F90081AF13 /* client.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = C910EAF124EBC6F90081AF13 /* client.ovpn */; };
C96B36B326888CF20054CA12 /* OpenVPNAdapterImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C96B36B226888CF20054CA12 /* OpenVPNAdapterImpl.h */; settings = {ATTRIBUTES = (Public, ); }; };
C97E5F6E24122F12005C2EBC /* NSArray+OpenVPNAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F6D24122F12005C2EBC /* NSArray+OpenVPNAdditions.h */; };
C97E5F7024122F22005C2EBC /* NSError+OpenVPNError.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F6F24122F22005C2EBC /* NSError+OpenVPNError.h */; };
C97E5F7224122F5C005C2EBC /* OpenVPNClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F7124122F5C005C2EBC /* OpenVPNClient.h */; };
C97E5F7424122FE6005C2EBC /* OpenVPNAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F7324122FE6005C2EBC /* OpenVPNAdapter.h */; };
C97E5F7424122FE6005C2EBC /* OpenVPNAdapterImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F7324122FE6005C2EBC /* OpenVPNAdapterImpl.h */; };
C97E5F762412300A005C2EBC /* OpenVPNAdapterEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F752412300A005C2EBC /* OpenVPNAdapterEvent.h */; };
C97E5F7824123019005C2EBC /* OpenVPNAdapterPacketFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F7724123019005C2EBC /* OpenVPNAdapterPacketFlow.h */; };
C97E5F7A24123022005C2EBC /* OpenVPNCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F7924123022005C2EBC /* OpenVPNCertificate.h */; };
@@ -67,7 +67,7 @@
OBJ_253 /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* xxhash.c */; };
OBJ_260 /* NSArray+OpenVPNAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_28 /* NSArray+OpenVPNAdditions.m */; };
OBJ_261 /* NSError+OpenVPNError.m in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_29 /* NSError+OpenVPNError.m */; };
OBJ_262 /* OpenVPNAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_30 /* OpenVPNAdapter.mm */; };
OBJ_262 /* OpenVPNAdapterImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_30 /* OpenVPNAdapterImpl.mm */; };
OBJ_263 /* OpenVPNCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_31 /* OpenVPNCertificate.m */; };
OBJ_264 /* OpenVPNClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_32 /* OpenVPNClient.mm */; };
OBJ_265 /* OpenVPNConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_33 /* OpenVPNConfiguration.mm */; };
@@ -229,16 +229,16 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
C90F316C2683BC11002F1A6C /* OpenVPNAdapterDeclaration.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = OpenVPNAdapterDeclaration.h; sourceTree = "<group>"; };
C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = OpenVPNConfigurationEvaluation.h; sourceTree = "<group>"; };
C910EAEB24EBBFB60081AF13 /* client.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = client.crt; sourceTree = "<group>"; };
C910EAEC24EBBFB60081AF13 /* ca.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.crt; sourceTree = "<group>"; };
C910EAED24EBBFB60081AF13 /* client.key */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = client.key; sourceTree = "<group>"; };
C910EAF124EBC6F90081AF13 /* client.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = client.ovpn; sourceTree = "<group>"; };
C96B36B226888CF20054CA12 /* OpenVPNAdapterImpl.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = OpenVPNAdapterImpl.h; sourceTree = "<group>"; };
C97E5F6D24122F12005C2EBC /* NSArray+OpenVPNAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+OpenVPNAdditions.h"; sourceTree = "<group>"; };
C97E5F6F24122F22005C2EBC /* NSError+OpenVPNError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+OpenVPNError.h"; sourceTree = "<group>"; };
C97E5F7124122F5C005C2EBC /* OpenVPNClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNClient.h; sourceTree = "<group>"; };
C97E5F7324122FE6005C2EBC /* OpenVPNAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapter.h; sourceTree = "<group>"; };
C97E5F7324122FE6005C2EBC /* OpenVPNAdapterImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapterImpl.h; sourceTree = "<group>"; };
C97E5F752412300A005C2EBC /* OpenVPNAdapterEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapterEvent.h; sourceTree = "<group>"; };
C97E5F7724123019005C2EBC /* OpenVPNAdapterPacketFlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapterPacketFlow.h; sourceTree = "<group>"; };
C97E5F7924123022005C2EBC /* OpenVPNCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNCertificate.h; sourceTree = "<group>"; };
@@ -428,7 +428,7 @@
OBJ_24 /* lz4frame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lz4frame.h; sourceTree = "<group>"; };
OBJ_28 /* NSArray+OpenVPNAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+OpenVPNAdditions.m"; sourceTree = "<group>"; };
OBJ_29 /* NSError+OpenVPNError.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSError+OpenVPNError.m"; sourceTree = "<group>"; };
OBJ_30 /* OpenVPNAdapter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNAdapter.mm; sourceTree = "<group>"; };
OBJ_30 /* OpenVPNAdapterImpl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNAdapterImpl.mm; sourceTree = "<group>"; };
OBJ_31 /* OpenVPNCertificate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OpenVPNCertificate.m; sourceTree = "<group>"; };
OBJ_32 /* OpenVPNClient.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNClient.mm; sourceTree = "<group>"; };
OBJ_33 /* OpenVPNConfiguration.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNConfiguration.mm; sourceTree = "<group>"; };
@@ -737,8 +737,8 @@
OBJ_28 /* NSArray+OpenVPNAdditions.m */,
C97E5F6F24122F22005C2EBC /* NSError+OpenVPNError.h */,
OBJ_29 /* NSError+OpenVPNError.m */,
C97E5F7324122FE6005C2EBC /* OpenVPNAdapter.h */,
OBJ_30 /* OpenVPNAdapter.mm */,
C97E5F7324122FE6005C2EBC /* OpenVPNAdapterImpl.h */,
OBJ_30 /* OpenVPNAdapterImpl.mm */,
C97E5F7924123022005C2EBC /* OpenVPNCertificate.h */,
OBJ_31 /* OpenVPNCertificate.m */,
C97E5F7124122F5C005C2EBC /* OpenVPNClient.h */,
@@ -800,7 +800,7 @@
C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */,
OBJ_58 /* OpenVPNReachability.h */,
OBJ_59 /* OpenVPNIPv6Preference.h */,
C90F316C2683BC11002F1A6C /* OpenVPNAdapterDeclaration.h */,
C96B36B226888CF20054CA12 /* OpenVPNAdapterImpl.h */,
OBJ_60 /* OpenVPNAdapterPacketFlow.h */,
OBJ_61 /* OpenVPNMinTLSVersion.h */,
OBJ_63 /* OpenVPNConnectionInfo.h */,
@@ -996,7 +996,7 @@
C97E5F9E2412314A005C2EBC /* OpenVPNConfigurationEvaluation.h in Headers */,
C97E5FA62412317B005C2EBC /* OpenVPNReachabilityStatus.h in Headers */,
OBJ_287 /* OpenVPNPrivateKey.h in Headers */,
C97E5F7424122FE6005C2EBC /* OpenVPNAdapter.h in Headers */,
C97E5F7424122FE6005C2EBC /* OpenVPNAdapterImpl.h in Headers */,
OBJ_288 /* OpenVPNInterfaceStats.h in Headers */,
OBJ_290 /* OpenVPNReachability.h in Headers */,
OBJ_291 /* OpenVPNIPv6Preference.h in Headers */,
@@ -1017,12 +1017,12 @@
C97E5F882412307B005C2EBC /* OpenVPNCredentials+Internal.h in Headers */,
OBJ_297 /* OpenVPNServerEntry.h in Headers */,
OBJ_298 /* OpenVPNConfiguration.h in Headers */,
C90F316D2683BC12002F1A6C /* OpenVPNAdapterDeclaration.h in Headers */,
C97E5F9A24123135005C2EBC /* OpenVPNPacketFlowBridge.h in Headers */,
C97E5F8624123072005C2EBC /* OpenVPNCredentials.h in Headers */,
C97E5FB0241231BB005C2EBC /* OpenVPNSessionToken+Internal.h in Headers */,
C97E5F8024123051005C2EBC /* OpenVPNConfiguration+Internal.h in Headers */,
OBJ_299 /* OpenVPNCredentials.h in Headers */,
C96B36B326888CF20054CA12 /* OpenVPNAdapterImpl.h in Headers */,
OBJ_300 /* OpenVPNTransportStats.h in Headers */,
OBJ_301 /* OpenVPNSessionToken.h in Headers */,
C97E5FA424123168005C2EBC /* OpenVPNReachability+Internal.h in Headers */,
@@ -1205,7 +1205,7 @@
files = (
OBJ_260 /* NSArray+OpenVPNAdditions.m in Sources */,
OBJ_261 /* NSError+OpenVPNError.m in Sources */,
OBJ_262 /* OpenVPNAdapter.mm in Sources */,
OBJ_262 /* OpenVPNAdapterImpl.mm in Sources */,
OBJ_263 /* OpenVPNCertificate.m in Sources */,
OBJ_264 /* OpenVPNClient.mm in Sources */,
OBJ_265 /* OpenVPNConfiguration.mm in Sources */,

2
Sources/OpenVPNAdapter/Umbrella-Header.h
View File

@@ -31,7 +31,7 @@ FOUNDATION_EXPORT const unsigned char OpenVPNAdapterVersionString[];
#import <OpenVPNAdapter/OpenVPNSessionToken.h>
#import <OpenVPNAdapter/OpenVPNTransportStats.h>
#import <OpenVPNAdapter/OpenVPNInterfaceStats.h>
#import <OpenVPNAdapter/OpenVPNAdapterDeclaration.h>
#import <OpenVPNAdapter/OpenVPNAdapterImpl.h>
#import <OpenVPNAdapter/OpenVPNAdapterPacketFlow.h>
#import <OpenVPNAdapter/OpenVPNKeyType.h>
#import <OpenVPNAdapter/OpenVPNCertificate.h>

1
Sources/OpenVPNAdapter/include/OpenVPNAdapterDeclaration.h
View File

@@ -1 +0,0 @@
../library/OpenVPNAdapter.h

1
Sources/OpenVPNAdapter/include/OpenVPNAdapterImpl.h Symbolic link
View File

@@ -0,0 +1 @@
../library/OpenVPNAdapterImpl.h

0
Sources/OpenVPNAdapter/library/OpenVPNAdapter.h → Sources/OpenVPNAdapter/library/OpenVPNAdapterImpl.h
View File

2
Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm → Sources/OpenVPNAdapter/library/OpenVPNAdapterImpl.mm
View File

@@ -10,7 +10,7 @@
#define TUNNEL_CONFIGURATION_TIMEOUT 30
#import "OpenVPNAdapter.h"
#import "OpenVPNAdapterImpl.h"
#import <NetworkExtension/NetworkExtension.h>