Reorganize project structure

Configuration/Framework.xcconfig

@@ -1,16 +1,16 @@
 PRODUCT_NAME = OpenVPNAdapter
 PRODUCT_BUNDLE_IDENTIFIER = me.ss-abramchuk.openvpn-adapter
 INFOPLIST_FILE = Configuration/Info-Framework.plist
-MODULEMAP_FILE = OpenVPN Adapter/OpenVPNAdapter.modulemap
+MODULEMAP_FILE = Sources/OpenVPNAdapter/OpenVPNAdapter.modulemap
 DYLIB_CURRENT_VERSION = $(CURRENT_PROJECT_VERSION)
 APPLICATION_EXTENSION_API_ONLY = YES
 CLANG_CXX_LANGUAGE_STANDARD = gnu++14
 CLANG_CXX_LIBRARY = libc++
-VENDORS_PATH = $(PROJECT_DIR)/OpenVPN Adapter/Vendors
-HEADER_SEARCH_PATHS = "$(VENDORS_PATH)/asio/asio/include" "$(VENDORS_PATH)/lz4/include" "$(VENDORS_PATH)/mbedtls/include" "$(VENDORS_PATH)/openvpn"
-LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*] = "$(VENDORS_PATH)/lz4/lib/sim" "$(VENDORS_PATH)/mbedtls/lib/sim"
-LIBRARY_SEARCH_PATHS[sdk=iphoneos*] = "$(VENDORS_PATH)/lz4/lib/ios" "$(VENDORS_PATH)/mbedtls/lib/ios"
-LIBRARY_SEARCH_PATHS[sdk=macosx*] = "$(VENDORS_PATH)/lz4/lib/macos" "$(VENDORS_PATH)/mbedtls/lib/macos"
+VENDORS_DIR = $(PROJECT_DIR)/Sources/OpenVPNAdapter/Libraries/Vendors
+HEADER_SEARCH_PATHS = "$(VENDORS_DIR)/asio/asio/include" "$(VENDORS_DIR)/lz4/include" "$(VENDORS_DIR)/mbedtls/include" "$(VENDORS_DIR)/openvpn"
+LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*] = "$(VENDORS_DIR)/lz4/lib/sim" "$(VENDORS_DIR)/mbedtls/lib/sim"
+LIBRARY_SEARCH_PATHS[sdk=iphoneos*] = "$(VENDORS_DIR)/lz4/lib/ios" "$(VENDORS_DIR)/mbedtls/lib/ios"
+LIBRARY_SEARCH_PATHS[sdk=macosx*] = "$(VENDORS_DIR)/lz4/lib/macos" "$(VENDORS_DIR)/mbedtls/lib/macos"
 OTHER_LDFLAGS = -lmbedtls -lmbedx509 -lmbedcrypto -llz4
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -DUSE_ASIO -DUSE_ASIO_THREADLOCAL -DASIO_STANDALONE -DASIO_NO_DEPRECATED -DHAVE_LZ4 -DUSE_MBEDTLS -DOPENVPN_FORCE_TUN_NULL -DUSE_TUN_BUILDER
 GCC_WARN_64_TO_32_BIT_CONVERSION = NO

OpenVPN Adapter.xcodeproj/project.pbxproj

@@ -109,7 +109,7 @@
 		C9B795671F1D182500CF35FE /* OpenVPNReachabilityTracker.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9B795631F1D182500CF35FE /* OpenVPNReachabilityTracker.mm */; };
 		C9B7956B1F1D26C900CF35FE /* OpenVPNReachability+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C9B795691F1D26C900CF35FE /* OpenVPNReachability+Internal.h */; };
 		C9B7956C1F1D26C900CF35FE /* OpenVPNReachability+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C9B795691F1D26C900CF35FE /* OpenVPNReachability+Internal.h */; };
-		C9BB47601E71663A00F3F98C /* Umbrella-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB475E1E71663A00F3F98C /* Umbrella-Header.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C9BB47601E71663A00F3F98C /* OpenVPNAdapter in Headers */ = {isa = PBXBuildFile; fileRef = C9BB475E1E71663A00F3F98C /* OpenVPNAdapter */; settings = {ATTRIBUTES = (Public, ); }; };
 		C9BB47711E7171A100F3F98C /* OpenVPNError.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB476F1E7171A100F3F98C /* OpenVPNError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C9BB47721E7171A100F3F98C /* OpenVPNAdapterEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB47701E7171A100F3F98C /* OpenVPNAdapterEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C9BB47911E71821A00F3F98C /* OpenVPNAdapterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47901E71821A00F3F98C /* OpenVPNAdapterTests.swift */; };
@@ -145,7 +145,7 @@
 		C9D2ABE01EA20F99007EDF9D /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C912BB241E7C3339002B9414 /* NetworkExtension.framework */; };
 		C9D2ABE11EA20F99007EDF9D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C90BAD301E73FF6C00DEFB32 /* SystemConfiguration.framework */; };
 		C9D2ABE41EA20F99007EDF9D /* OpenVPNAdapterEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB47701E7171A100F3F98C /* OpenVPNAdapterEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C9D2ABE61EA20F99007EDF9D /* Umbrella-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB475E1E71663A00F3F98C /* Umbrella-Header.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C9D2ABE61EA20F99007EDF9D /* OpenVPNAdapter in Headers */ = {isa = PBXBuildFile; fileRef = C9BB475E1E71663A00F3F98C /* OpenVPNAdapter */; settings = {ATTRIBUTES = (Public, ); }; };
 		C9D2ABE81EA20F99007EDF9D /* OpenVPNError.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BB476F1E7171A100F3F98C /* OpenVPNError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C9D2ABEA1EA20F99007EDF9D /* ovpncli.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C9FD92181E9A667600374FC4 /* ovpncli.hpp */; };
 		C9D2ABF61EA212A3007EDF9D /* OpenVPNAdapterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47901E71821A00F3F98C /* OpenVPNAdapterTests.swift */; };
@@ -177,12 +177,12 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		ABD6EF071F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNNetworkSettingsBuilder.h; sourceTree = "<group>"; };
-		ABD6EF081F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OpenVPNNetworkSettingsBuilder.m; sourceTree = "<group>"; };
-		ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNPacketFlowBridge.h; sourceTree = "<group>"; };
-		ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNPacketFlowBridge.mm; sourceTree = "<group>"; };
-		ABD6EF151F8F9C37007D3D90 /* OpenVPNAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapter.h; sourceTree = "<group>"; };
-		ABD6EF161F8F9C38007D3D90 /* OpenVPNAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNAdapter.mm; sourceTree = "<group>"; };
+		ABD6EF071F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenVPNNetworkSettingsBuilder.h; path = OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.h; sourceTree = "<group>"; };
+		ABD6EF081F8F8CCD007D3D90 /* OpenVPNNetworkSettingsBuilder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OpenVPNNetworkSettingsBuilder.m; path = OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.m; sourceTree = "<group>"; };
+		ABD6EF0E1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenVPNPacketFlowBridge.h; path = OpenVPNAdapter/OpenVPNPacketFlowBridge.h; sourceTree = "<group>"; };
+		ABD6EF0F1F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNPacketFlowBridge.mm; path = OpenVPNAdapter/OpenVPNPacketFlowBridge.mm; sourceTree = "<group>"; };
+		ABD6EF151F8F9C37007D3D90 /* OpenVPNAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNAdapter.h; path = OpenVPNAdapter/OpenVPNAdapter.h; sourceTree = "<group>"; };
+		ABD6EF161F8F9C38007D3D90 /* OpenVPNAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNAdapter.mm; path = OpenVPNAdapter/OpenVPNAdapter.mm; sourceTree = "<group>"; };
 		C90BAD261E73F47E00DEFB32 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
 		C90BAD271E73F47E00DEFB32 /* Info-Tests.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Tests.plist"; sourceTree = "<group>"; };
 		C90BAD291E73F56800DEFB32 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = "<group>"; };
@@ -201,68 +201,68 @@
 		C915F2241F61B22300B3DF23 /* test-ca.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "test-ca.crt"; sourceTree = "<group>"; };
 		C9310BBD20FF63A400838910 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		C9354F431F1E49A500F4C935 /* OpenVPNReachabilityTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenVPNReachabilityTests.swift; sourceTree = "<group>"; };
-		C93779D31EAE32670030A362 /* OpenVPNCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNCredentials.h; sourceTree = "<group>"; };
-		C93779D41EAE32670030A362 /* OpenVPNCredentials.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNCredentials.mm; sourceTree = "<group>"; };
-		C93779D91EAE32880030A362 /* OpenVPNCredentials+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNCredentials+Internal.h"; sourceTree = "<group>"; };
-		C93A4F611EE18009004DC561 /* OpenVPNError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpenVPNError.m; sourceTree = "<group>"; };
+		C93779D31EAE32670030A362 /* OpenVPNCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNCredentials.h; path = OpenVPNAdapter/OpenVPNCredentials.h; sourceTree = "<group>"; };
+		C93779D41EAE32670030A362 /* OpenVPNCredentials.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNCredentials.mm; path = OpenVPNAdapter/OpenVPNCredentials.mm; sourceTree = "<group>"; };
+		C93779D91EAE32880030A362 /* OpenVPNCredentials+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNCredentials+Internal.h"; path = "OpenVPNAdapter/OpenVPNCredentials+Internal.h"; sourceTree = "<group>"; };
+		C93A4F611EE18009004DC561 /* OpenVPNError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OpenVPNError.m; path = OpenVPNAdapter/OpenVPNError.m; sourceTree = "<group>"; };
 		C94605E81EAA656B00971516 /* OpenVPNConfigurationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenVPNConfigurationTests.swift; sourceTree = "<group>"; };
-		C9657A151EB0A7F800EFF210 /* OpenVPNConnectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNConnectionInfo.h; sourceTree = "<group>"; };
-		C9657A161EB0A7F800EFF210 /* OpenVPNConnectionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNConnectionInfo.mm; sourceTree = "<group>"; };
-		C9657A1B1EB0A8D800EFF210 /* OpenVPNConnectionInfo+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNConnectionInfo+Internal.h"; sourceTree = "<group>"; };
-		C9657A231EB0B60200EFF210 /* OpenVPNTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNTransportStats.h; sourceTree = "<group>"; };
-		C9657A241EB0B60200EFF210 /* OpenVPNTransportStats.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNTransportStats.mm; sourceTree = "<group>"; };
-		C9657A291EB0B6FA00EFF210 /* OpenVPNTransportStats+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNTransportStats+Internal.h"; sourceTree = "<group>"; };
-		C9657A321EB0BA3900EFF210 /* OpenVPNInterfaceStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNInterfaceStats.h; sourceTree = "<group>"; };
-		C9657A331EB0BA3900EFF210 /* OpenVPNInterfaceStats.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNInterfaceStats.mm; sourceTree = "<group>"; };
-		C9657A381EB0BAAB00EFF210 /* OpenVPNInterfaceStats+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNInterfaceStats+Internal.h"; sourceTree = "<group>"; };
-		C9657A3E1EB0CAC200EFF210 /* OpenVPNServerEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNServerEntry.h; sourceTree = "<group>"; };
-		C9657A3F1EB0CAC200EFF210 /* OpenVPNServerEntry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNServerEntry.mm; sourceTree = "<group>"; };
-		C9657A441EB0CB5900EFF210 /* OpenVPNServerEntry+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNServerEntry+Internal.h"; sourceTree = "<group>"; };
-		C9657A4A1EB0CD6C00EFF210 /* OpenVPNProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNProperties.h; sourceTree = "<group>"; };
-		C9657A4B1EB0CD6C00EFF210 /* OpenVPNProperties.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNProperties.mm; sourceTree = "<group>"; };
-		C9657A501EB0CD9200EFF210 /* OpenVPNProperties+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNProperties+Internal.h"; sourceTree = "<group>"; };
-		C9657A5D1EB0D60700EFF210 /* OpenVPNTransportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNTransportProtocol.h; sourceTree = "<group>"; };
-		C9657A601EB0D64E00EFF210 /* OpenVPNIPv6Preference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNIPv6Preference.h; sourceTree = "<group>"; };
-		C9657A631EB0D6AD00EFF210 /* OpenVPNCompressionMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNCompressionMode.h; sourceTree = "<group>"; };
-		C9657A661EB0D73200EFF210 /* OpenVPNMinTLSVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNMinTLSVersion.h; sourceTree = "<group>"; };
-		C9657A691EB0D75700EFF210 /* OpenVPNTLSCertProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNTLSCertProfile.h; sourceTree = "<group>"; };
+		C9657A151EB0A7F800EFF210 /* OpenVPNConnectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNConnectionInfo.h; path = OpenVPNAdapter/OpenVPNConnectionInfo.h; sourceTree = "<group>"; };
+		C9657A161EB0A7F800EFF210 /* OpenVPNConnectionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNConnectionInfo.mm; path = OpenVPNAdapter/OpenVPNConnectionInfo.mm; sourceTree = "<group>"; };
+		C9657A1B1EB0A8D800EFF210 /* OpenVPNConnectionInfo+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNConnectionInfo+Internal.h"; path = "OpenVPNAdapter/OpenVPNConnectionInfo+Internal.h"; sourceTree = "<group>"; };
+		C9657A231EB0B60200EFF210 /* OpenVPNTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNTransportStats.h; path = OpenVPNAdapter/OpenVPNTransportStats.h; sourceTree = "<group>"; };
+		C9657A241EB0B60200EFF210 /* OpenVPNTransportStats.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNTransportStats.mm; path = OpenVPNAdapter/OpenVPNTransportStats.mm; sourceTree = "<group>"; };
+		C9657A291EB0B6FA00EFF210 /* OpenVPNTransportStats+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNTransportStats+Internal.h"; path = "OpenVPNAdapter/OpenVPNTransportStats+Internal.h"; sourceTree = "<group>"; };
+		C9657A321EB0BA3900EFF210 /* OpenVPNInterfaceStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNInterfaceStats.h; path = OpenVPNAdapter/OpenVPNInterfaceStats.h; sourceTree = "<group>"; };
+		C9657A331EB0BA3900EFF210 /* OpenVPNInterfaceStats.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNInterfaceStats.mm; path = OpenVPNAdapter/OpenVPNInterfaceStats.mm; sourceTree = "<group>"; };
+		C9657A381EB0BAAB00EFF210 /* OpenVPNInterfaceStats+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNInterfaceStats+Internal.h"; path = "OpenVPNAdapter/OpenVPNInterfaceStats+Internal.h"; sourceTree = "<group>"; };
+		C9657A3E1EB0CAC200EFF210 /* OpenVPNServerEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNServerEntry.h; path = OpenVPNAdapter/OpenVPNServerEntry.h; sourceTree = "<group>"; };
+		C9657A3F1EB0CAC200EFF210 /* OpenVPNServerEntry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNServerEntry.mm; path = OpenVPNAdapter/OpenVPNServerEntry.mm; sourceTree = "<group>"; };
+		C9657A441EB0CB5900EFF210 /* OpenVPNServerEntry+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNServerEntry+Internal.h"; path = "OpenVPNAdapter/OpenVPNServerEntry+Internal.h"; sourceTree = "<group>"; };
+		C9657A4A1EB0CD6C00EFF210 /* OpenVPNProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNProperties.h; path = OpenVPNAdapter/OpenVPNProperties.h; sourceTree = "<group>"; };
+		C9657A4B1EB0CD6C00EFF210 /* OpenVPNProperties.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNProperties.mm; path = OpenVPNAdapter/OpenVPNProperties.mm; sourceTree = "<group>"; };
+		C9657A501EB0CD9200EFF210 /* OpenVPNProperties+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNProperties+Internal.h"; path = "OpenVPNAdapter/OpenVPNProperties+Internal.h"; sourceTree = "<group>"; };
+		C9657A5D1EB0D60700EFF210 /* OpenVPNTransportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNTransportProtocol.h; path = OpenVPNAdapter/OpenVPNTransportProtocol.h; sourceTree = "<group>"; };
+		C9657A601EB0D64E00EFF210 /* OpenVPNIPv6Preference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNIPv6Preference.h; path = OpenVPNAdapter/OpenVPNIPv6Preference.h; sourceTree = "<group>"; };
+		C9657A631EB0D6AD00EFF210 /* OpenVPNCompressionMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenVPNCompressionMode.h; path = OpenVPNAdapter/OpenVPNCompressionMode.h; sourceTree = "<group>"; };
+		C9657A661EB0D73200EFF210 /* OpenVPNMinTLSVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNMinTLSVersion.h; path = OpenVPNAdapter/OpenVPNMinTLSVersion.h; sourceTree = "<group>"; };
+		C9657A691EB0D75700EFF210 /* OpenVPNTLSCertProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNTLSCertProfile.h; path = OpenVPNAdapter/OpenVPNTLSCertProfile.h; sourceTree = "<group>"; };
 		C98467A11EAA559B00272A9A /* local_vpn_server.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = local_vpn_server.ovpn; sourceTree = "<group>"; };
-		C98467A41EAA5B7700272A9A /* OpenVPNConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNConfiguration.h; sourceTree = "<group>"; };
-		C98467A51EAA5B7700272A9A /* OpenVPNConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNConfiguration.mm; sourceTree = "<group>"; };
-		C98467AA1EAA5BB500272A9A /* OpenVPNConfiguration+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpenVPNConfiguration+Internal.h"; sourceTree = "<group>"; };
+		C98467A41EAA5B7700272A9A /* OpenVPNConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNConfiguration.h; path = OpenVPNAdapter/OpenVPNConfiguration.h; sourceTree = "<group>"; };
+		C98467A51EAA5B7700272A9A /* OpenVPNConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNConfiguration.mm; path = OpenVPNAdapter/OpenVPNConfiguration.mm; sourceTree = "<group>"; };
+		C98467AA1EAA5BB500272A9A /* OpenVPNConfiguration+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "OpenVPNConfiguration+Internal.h"; path = "OpenVPNAdapter/OpenVPNConfiguration+Internal.h"; sourceTree = "<group>"; };
 		C9B03A7A1EABA6B500268B85 /* ProfileLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileLoader.swift; sourceTree = "<group>"; };
-		C9B7955C1F1D16AA00CF35FE /* OpenVPNReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNReachability.h; sourceTree = "<group>"; };
-		C9B7955D1F1D16AA00CF35FE /* OpenVPNReachability.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNReachability.mm; sourceTree = "<group>"; };
-		C9B795621F1D182500CF35FE /* OpenVPNReachabilityTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNReachabilityTracker.h; sourceTree = "<group>"; };
-		C9B795631F1D182500CF35FE /* OpenVPNReachabilityTracker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNReachabilityTracker.mm; sourceTree = "<group>"; };
-		C9B795681F1D219C00CF35FE /* OpenVPNReachabilityStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNReachabilityStatus.h; sourceTree = "<group>"; };
-		C9B795691F1D26C900CF35FE /* OpenVPNReachability+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNReachability+Internal.h"; sourceTree = "<group>"; };
+		C9B7955C1F1D16AA00CF35FE /* OpenVPNReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNReachability.h; path = OpenVPNAdapter/OpenVPNReachability.h; sourceTree = "<group>"; };
+		C9B7955D1F1D16AA00CF35FE /* OpenVPNReachability.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNReachability.mm; path = OpenVPNAdapter/OpenVPNReachability.mm; sourceTree = "<group>"; };
+		C9B795621F1D182500CF35FE /* OpenVPNReachabilityTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNReachabilityTracker.h; path = OpenVPNAdapter/OpenVPNReachabilityTracker.h; sourceTree = "<group>"; };
+		C9B795631F1D182500CF35FE /* OpenVPNReachabilityTracker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNReachabilityTracker.mm; path = OpenVPNAdapter/OpenVPNReachabilityTracker.mm; sourceTree = "<group>"; };
+		C9B795681F1D219C00CF35FE /* OpenVPNReachabilityStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenVPNReachabilityStatus.h; path = OpenVPNAdapter/OpenVPNReachabilityStatus.h; sourceTree = "<group>"; };
+		C9B795691F1D26C900CF35FE /* OpenVPNReachability+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNReachability+Internal.h"; path = "OpenVPNAdapter/OpenVPNReachability+Internal.h"; sourceTree = "<group>"; };
 		C9BB475C1E71663A00F3F98C /* OpenVPNAdapter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenVPNAdapter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		C9BB475E1E71663A00F3F98C /* Umbrella-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Umbrella-Header.h"; sourceTree = "<group>"; };
-		C9BB476F1E7171A100F3F98C /* OpenVPNError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = OpenVPNError.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		C9BB47701E7171A100F3F98C /* OpenVPNAdapterEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapterEvent.h; sourceTree = "<group>"; };
+		C9BB475E1E71663A00F3F98C /* OpenVPNAdapter */ = {isa = PBXFileReference; lastKnownFileType = folder; path = OpenVPNAdapter; sourceTree = "<group>"; };
+		C9BB476F1E7171A100F3F98C /* OpenVPNError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = OpenVPNError.h; path = OpenVPNAdapter/OpenVPNError.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		C9BB47701E7171A100F3F98C /* OpenVPNAdapterEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNAdapterEvent.h; path = OpenVPNAdapter/OpenVPNAdapterEvent.h; sourceTree = "<group>"; };
 		C9BB478E1E71821A00F3F98C /* OpenVPNAdapterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenVPNAdapterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9BB47901E71821A00F3F98C /* OpenVPNAdapterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenVPNAdapterTests.swift; sourceTree = "<group>"; };
 		C9BB47A11E7183DB00F3F98C /* Bundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = "<group>"; };
-		C9BCE2561EB3C0D9009D6AC1 /* OpenVPNSessionToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNSessionToken.h; sourceTree = "<group>"; };
-		C9BCE2571EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNSessionToken.mm; sourceTree = "<group>"; };
-		C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNSessionToken+Internal.h"; sourceTree = "<group>"; };
+		C9BCE2561EB3C0D9009D6AC1 /* OpenVPNSessionToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenVPNSessionToken.h; path = OpenVPNAdapter/OpenVPNSessionToken.h; sourceTree = "<group>"; };
+		C9BCE2571EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNSessionToken.mm; path = OpenVPNAdapter/OpenVPNSessionToken.mm; sourceTree = "<group>"; };
+		C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OpenVPNSessionToken+Internal.h"; path = "OpenVPNAdapter/OpenVPNSessionToken+Internal.h"; sourceTree = "<group>"; };
 		C9C1E40F1FA47117006ECA7D /* remote_vpn_server.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = remote_vpn_server.ovpn; sourceTree = "<group>"; };
 		C9C1E4131FA475B7006ECA7D /* CustomFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomFlow.swift; sourceTree = "<group>"; };
-		C9C2B2B6200CB42F00CA0FF3 /* OpenVPNAdapterPacketFlow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapterPacketFlow.h; sourceTree = "<group>"; };
-		C9C2B2B9200CC42A00CA0FF3 /* OpenVPNPacket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNPacket.h; sourceTree = "<group>"; };
-		C9C2B2BA200CC42A00CA0FF3 /* OpenVPNPacket.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNPacket.mm; sourceTree = "<group>"; };
+		C9C2B2B6200CB42F00CA0FF3 /* OpenVPNAdapterPacketFlow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenVPNAdapterPacketFlow.h; path = OpenVPNAdapter/OpenVPNAdapterPacketFlow.h; sourceTree = "<group>"; };
+		C9C2B2B9200CC42A00CA0FF3 /* OpenVPNPacket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenVPNPacket.h; path = OpenVPNAdapter/OpenVPNPacket.h; sourceTree = "<group>"; };
+		C9C2B2BA200CC42A00CA0FF3 /* OpenVPNPacket.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNPacket.mm; path = OpenVPNAdapter/OpenVPNPacket.mm; sourceTree = "<group>"; };
 		C9CA4DD11F602F7B00C4F184 /* OpenVPNCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNCertificate.h; sourceTree = "<group>"; };
 		C9CA4DD21F602F7B00C4F184 /* OpenVPNCertificate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpenVPNCertificate.m; sourceTree = "<group>"; };
 		C9CA4DE01F603A5300C4F184 /* OpenVPNCertificateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenVPNCertificateTests.swift; sourceTree = "<group>"; };
-		C9CDFDD9200781AF00323B73 /* OpenVPNClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNClient.h; sourceTree = "<group>"; };
-		C9CDFDDA200781AF00323B73 /* OpenVPNClient.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNClient.mm; sourceTree = "<group>"; };
+		C9CDFDD9200781AF00323B73 /* OpenVPNClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenVPNClient.h; path = OpenVPNAdapter/OpenVPNClient.h; sourceTree = "<group>"; };
+		C9CDFDDA200781AF00323B73 /* OpenVPNClient.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenVPNClient.mm; path = OpenVPNAdapter/OpenVPNClient.mm; sourceTree = "<group>"; };
 		C9D2ABF01EA20F99007EDF9D /* OpenVPNAdapter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenVPNAdapter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9D2ABFF1EA212A3007EDF9D /* OpenVPNAdapterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenVPNAdapterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		C9E350BF200F6EC0000820D9 /* NSError+OpenVPNError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSError+OpenVPNError.h"; sourceTree = "<group>"; };
-		C9E350C0200F6EC0000820D9 /* NSError+OpenVPNError.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSError+OpenVPNError.m"; sourceTree = "<group>"; };
-		C9FD92181E9A667600374FC4 /* ovpncli.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; name = ovpncli.hpp; path = Vendors/openvpn/client/ovpncli.hpp; sourceTree = "<group>"; };
-		C9FD92191E9A667600374FC4 /* ovpncli.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ovpncli.cpp; path = Vendors/openvpn/client/ovpncli.cpp; sourceTree = "<group>"; };
+		C9E350BF200F6EC0000820D9 /* NSError+OpenVPNError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSError+OpenVPNError.h"; path = "../NSError+OpenVPNError.h"; sourceTree = "<group>"; };
+		C9E350C0200F6EC0000820D9 /* NSError+OpenVPNError.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "NSError+OpenVPNError.m"; path = "../NSError+OpenVPNError.m"; sourceTree = "<group>"; };
+		C9FD92181E9A667600374FC4 /* ovpncli.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; name = ovpncli.hpp; path = client/ovpncli.hpp; sourceTree = "<group>"; };
+		C9FD92191E9A667600374FC4 /* ovpncli.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ovpncli.cpp; path = client/ovpncli.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -322,8 +322,8 @@
 			isa = PBXGroup;
 			children = (
 				C90BAD251E73F47E00DEFB32 /* Configuration */,
-				C9BB475D1E71663A00F3F98C /* OpenVPN Adapter */,
-				C9BB478F1E71821A00F3F98C /* OpenVPN Adapter Tests */,
+				C9BB475D1E71663A00F3F98C /* Sources */,
+				C9BB478F1E71821A00F3F98C /* Tests */,
 				C91031031E47237A0004DFFE /* Products */,
 				C91031361E472C870004DFFE /* Frameworks */,
 			);
@@ -372,6 +372,7 @@
 				C9657A4B1EB0CD6C00EFF210 /* OpenVPNProperties.mm */,
 			);
 			name = Configuration;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		C9235AC51EB24F1100C7D303 /* Stats and Info */ = {
@@ -391,6 +392,21 @@
 				C9657A331EB0BA3900EFF210 /* OpenVPNInterfaceStats.mm */,
 			);
 			name = "Stats and Info";
+			path = ..;
+			sourceTree = "<group>";
+		};
+		C9310BBF20FF667F00838910 /* OpenVPNAdapter */ = {
+			isa = PBXGroup;
+			children = (
+				C9CA4DD01F602D8300C4F184 /* Certificates and Keys */,
+				C9B7955B1F1D165700CF35FE /* Reachability */,
+				C9235AC41EB24F0100C7D303 /* Configuration */,
+				C9235AC51EB24F1100C7D303 /* Stats and Info */,
+				C9BB47671E7169F000F3F98C /* Adapter */,
+				C9BB47641E7169AF00F3F98C /* Libraries */,
+				C9BB47651E7169B700F3F98C /* Framework */,
+			);
+			path = OpenVPNAdapter;
 			sourceTree = "<group>";
 		};
 		C9B7955B1F1D165700CF35FE /* Reachability */ = {
@@ -404,20 +420,15 @@
 				C9B7955D1F1D16AA00CF35FE /* OpenVPNReachability.mm */,
 			);
 			name = Reachability;
+			path = ..;
 			sourceTree = "<group>";
 		};
-		C9BB475D1E71663A00F3F98C /* OpenVPN Adapter */ = {
+		C9BB475D1E71663A00F3F98C /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				C9CA4DD01F602D8300C4F184 /* Certificates and Keys */,
-				C9B7955B1F1D165700CF35FE /* Reachability */,
-				C9235AC41EB24F0100C7D303 /* Configuration */,
-				C9235AC51EB24F1100C7D303 /* Stats and Info */,
-				C9BB47671E7169F000F3F98C /* Adapter */,
-				C9BB47641E7169AF00F3F98C /* Libraries */,
-				C9BB47651E7169B700F3F98C /* Framework */,
+				C9310BBF20FF667F00838910 /* OpenVPNAdapter */,
 			);
-			path = "OpenVPN Adapter";
+			path = Sources;
 			sourceTree = "<group>";
 		};
 		C9BB47641E7169AF00F3F98C /* Libraries */ = {
@@ -426,15 +437,16 @@
 				C9FF73B71EB7421600E995AC /* Helpers */,
 				C9BB47681E716ABF00F3F98C /* Vendors */,
 			);
-			name = Libraries;
+			path = Libraries;
 			sourceTree = "<group>";
 		};
 		C9BB47651E7169B700F3F98C /* Framework */ = {
 			isa = PBXGroup;
 			children = (
-				C9BB475E1E71663A00F3F98C /* Umbrella-Header.h */,
+				C9BB475E1E71663A00F3F98C /* OpenVPNAdapter */,
 			);
 			name = Framework;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		C9BB47671E7169F000F3F98C /* Adapter */ = {
@@ -456,6 +468,7 @@
 				ABD6EF161F8F9C38007D3D90 /* OpenVPNAdapter.mm */,
 			);
 			name = Adapter;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		C9BB47681E716ABF00F3F98C /* Vendors */ = {
@@ -463,7 +476,7 @@
 			children = (
 				C9BB47691E716AC500F3F98C /* OpenVPN */,
 			);
-			name = Vendors;
+			path = Vendors;
 			sourceTree = "<group>";
 		};
 		C9BB47691E716AC500F3F98C /* OpenVPN */ = {
@@ -473,16 +486,17 @@
 				C9FD92191E9A667600374FC4 /* ovpncli.cpp */,
 			);
 			name = OpenVPN;
+			path = openvpn;
 			sourceTree = "<group>";
 		};
-		C9BB478F1E71821A00F3F98C /* OpenVPN Adapter Tests */ = {
+		C9BB478F1E71821A00F3F98C /* Tests */ = {
 			isa = PBXGroup;
 			children = (
 				C9BB479D1E71837200F3F98C /* Adapter Tests */,
 				C9BB479E1E7183B800F3F98C /* Libraries */,
 				C9BB479A1E71836100F3F98C /* Resources */,
 			);
-			path = "OpenVPN Adapter Tests";
+			path = Tests;
 			sourceTree = "<group>";
 		};
 		C9BB479A1E71836100F3F98C /* Resources */ = {
@@ -605,7 +619,7 @@
 				C9B7956B1F1D26C900CF35FE /* OpenVPNReachability+Internal.h in Headers */,
 				ABD6EF101F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h in Headers */,
 				C9657A2B1EB0B6FA00EFF210 /* OpenVPNTransportStats+Internal.h in Headers */,
-				C9BB47601E71663A00F3F98C /* Umbrella-Header.h in Headers */,
+				C9BB47601E71663A00F3F98C /* OpenVPNAdapter in Headers */,
 				C9657A5E1EB0D60700EFF210 /* OpenVPNTransportProtocol.h in Headers */,
 				C9657A1D1EB0A8D800EFF210 /* OpenVPNConnectionInfo+Internal.h in Headers */,
 				C9B7955E1F1D16AA00CF35FE /* OpenVPNReachability.h in Headers */,
@@ -651,7 +665,7 @@
 				C9B7956C1F1D26C900CF35FE /* OpenVPNReachability+Internal.h in Headers */,
 				ABD6EF111F8F93AB007D3D90 /* OpenVPNPacketFlowBridge.h in Headers */,
 				C9657A2F1EB0B79500EFF210 /* OpenVPNTransportStats+Internal.h in Headers */,
-				C9D2ABE61EA20F99007EDF9D /* Umbrella-Header.h in Headers */,
+				C9D2ABE61EA20F99007EDF9D /* OpenVPNAdapter in Headers */,
 				C9657A5F1EB0D60700EFF210 /* OpenVPNTransportProtocol.h in Headers */,
 				C9657A1E1EB0A8D800EFF210 /* OpenVPNConnectionInfo+Internal.h in Headers */,
 				C9B7955F1F1D16AA00CF35FE /* OpenVPNReachability.h in Headers */,
@@ -856,7 +870,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "TAGS=\"TODO:|FIXME:|\\?\\?\\?|\\!\\!\\!\"\nERRORTAG=\"ERROR:\"\nfind \"${SRCROOT}/OpenVPN Adapter\" \\( -name \"*.h\" -or -name \"*.mm\" -or -name \"*.m\" -or -name \"*.swift\" \\) ! -path \"*/Vendors/*\" -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$|($ERRORTAG).*\\$\" | perl -p -e \"s/($TAGS)/ warning: \\$1/\" | perl -p -e \"s/($ERRORTAG)/ error: \\$1/\"";
+			shellScript = "TAGS=\"TODO:|FIXME:|\\?\\?\\?|\\!\\!\\!\"\nERRORTAG=\"ERROR:\"\nfind \"${SRCROOT}/Sources/OpenVPNAdapter\" \\( -name \"*.h\" -or -name \"*.mm\" -or -name \"*.m\" -or -name \"*.swift\" \\) ! -path \"*/Vendors/*\" -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$|($ERRORTAG).*\\$\" | perl -p -e \"s/($TAGS)/ warning: \\$1/\" | perl -p -e \"s/($ERRORTAG)/ error: \\$1/\"";
 		};
 		C9D2ABD91EA20F99007EDF9D /* Check Warning And Error Tags */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -870,7 +884,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "TAGS=\"TODO:|FIXME:|\\?\\?\\?|\\!\\!\\!\"\nERRORTAG=\"ERROR:\"\nfind \"${SRCROOT}/OpenVPN Adapter\" \\( -name \"*.h\" -or -name \"*.mm\" -or -name \"*.m\" -or -name \"*.swift\" \\) ! -path \"*/Vendors/*\" -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$|($ERRORTAG).*\\$\" | perl -p -e \"s/($TAGS)/ warning: \\$1/\" | perl -p -e \"s/($ERRORTAG)/ error: \\$1/\"";
+			shellScript = "TAGS=\"TODO:|FIXME:|\\?\\?\\?|\\!\\!\\!\"\nERRORTAG=\"ERROR:\"\nfind \"${SRCROOT}/Sources/OpenVPNAdapter\" \\( -name \"*.h\" -or -name \"*.mm\" -or -name \"*.m\" -or -name \"*.swift\" \\) ! -path \"*/Vendors/*\" -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$|($ERRORTAG).*\\$\" | perl -p -e \"s/($TAGS)/ warning: \\$1/\" | perl -p -e \"s/($ERRORTAG)/ error: \\$1/\"";
 		};
 /* End PBXShellScriptBuildPhase section */
 

OpenVPN Adapter/Vendors/asio/asio/src/tests/unit/ip/address_v4.cpp

@@ -1,324 +0,0 @@
-//
-// address_v4.cpp
-// ~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-// Disable autolinking for unit tests.
-#if !defined(BOOST_ALL_NO_LIB)
-#define BOOST_ALL_NO_LIB 1
-#endif // !defined(BOOST_ALL_NO_LIB)
-
-// Test that header file is self-contained.
-#include "asio/ip/address_v4.hpp"
-
-#include "../unit_test.hpp"
-#include <sstream>
-
-//------------------------------------------------------------------------------
-
-// ip_address_v4_compile test
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~
-// The following test checks that all public member functions on the class
-// ip::address_v4 compile and link correctly. Runtime failures are ignored.
-
-namespace ip_address_v4_compile {
-
-void test()
-{
-  using namespace asio;
-  namespace ip = asio::ip;
-
-  try
-  {
-    asio::error_code ec;
-
-    // address_v4 constructors.
-
-    ip::address_v4 addr1;
-    const ip::address_v4::bytes_type const_bytes_value = { { 127, 0, 0, 1 } };
-    ip::address_v4 addr2(const_bytes_value);
-    const unsigned long const_ulong_value = 0x7F000001;
-    ip::address_v4 addr3(const_ulong_value);
-
-    // address_v4 functions.
-
-    bool b = addr1.is_loopback();
-    (void)b;
-
-    b = addr1.is_unspecified();
-    (void)b;
-
-#if !defined(ASIO_NO_DEPRECATED)
-    b = addr1.is_class_a();
-    (void)b;
-
-    b = addr1.is_class_b();
-    (void)b;
-
-    b = addr1.is_class_c();
-    (void)b;
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    b = addr1.is_multicast();
-    (void)b;
-
-    ip::address_v4::bytes_type bytes_value = addr1.to_bytes();
-    (void)bytes_value;
-
-    ip::address_v4::uint_type uint_value = addr1.to_uint();
-    (void)uint_value;
-
-#if !defined(ASIO_NO_DEPRECATED)
-    unsigned long ulong_value = addr1.to_ulong();
-    (void)ulong_value;
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    std::string string_value = addr1.to_string();
-#if !defined(ASIO_NO_DEPRECATED)
-    string_value = addr1.to_string(ec);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    // address_v4 static functions.
-
-#if !defined(ASIO_NO_DEPRECATED)
-    addr1 = ip::address_v4::from_string("127.0.0.1");
-    addr1 = ip::address_v4::from_string("127.0.0.1", ec);
-    addr1 = ip::address_v4::from_string(string_value);
-    addr1 = ip::address_v4::from_string(string_value, ec);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    addr1 = ip::address_v4::any();
-
-    addr1 = ip::address_v4::loopback();
-
-    addr1 = ip::address_v4::broadcast();
-
-#if !defined(ASIO_NO_DEPRECATED)
-    addr1 = ip::address_v4::broadcast(addr2, addr3);
-
-    addr1 = ip::address_v4::netmask(addr2);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    // address_v4 comparisons.
-
-    b = (addr1 == addr2);
-    (void)b;
-
-    b = (addr1 != addr2);
-    (void)b;
-
-    b = (addr1 < addr2);
-    (void)b;
-
-    b = (addr1 > addr2);
-    (void)b;
-
-    b = (addr1 <= addr2);
-    (void)b;
-
-    b = (addr1 >= addr2);
-    (void)b;
-
-    // address_v4 creation functions.
-
-    addr1 = ip::make_address_v4(const_bytes_value);
-    addr1 = ip::make_address_v4(const_ulong_value);
-    addr1 = ip::make_address_v4("127.0.0.1");
-    addr1 = ip::make_address_v4("127.0.0.1", ec);
-    addr1 = ip::make_address_v4(string_value);
-    addr1 = ip::make_address_v4(string_value, ec);
-#if defined(ASIO_HAS_STD_STRING_VIEW)
-# if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-    std::experimental::string_view string_view_value("127.0.0.1");
-# else // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-    std::string_view string_view_value("127.0.0.1");
-# endif // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-    addr1 = ip::make_address_v4(string_view_value);
-    addr1 = ip::make_address_v4(string_view_value, ec);
-#endif // defined(ASIO_HAS_STD_STRING_VIEW)
-
-    // address_v4 I/O.
-
-    std::ostringstream os;
-    os << addr1;
-
-#if !defined(BOOST_NO_STD_WSTREAMBUF)
-    std::wostringstream wos;
-    wos << addr1;
-#endif // !defined(BOOST_NO_STD_WSTREAMBUF)
-  }
-  catch (std::exception&)
-  {
-  }
-}
-
-} // namespace ip_address_v4_compile
-
-//------------------------------------------------------------------------------
-
-// ip_address_v4_runtime test
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~
-// The following test checks that the various public member functions meet the
-// necessary postconditions.
-
-namespace ip_address_v4_runtime {
-
-void test()
-{
-  using asio::ip::address_v4;
-
-  address_v4 a1;
-  ASIO_CHECK(a1.to_bytes()[0] == 0);
-  ASIO_CHECK(a1.to_bytes()[1] == 0);
-  ASIO_CHECK(a1.to_bytes()[2] == 0);
-  ASIO_CHECK(a1.to_bytes()[3] == 0);
-  ASIO_CHECK(a1.to_uint() == 0);
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(a1.to_ulong() == 0);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-  address_v4::bytes_type b1 = {{ 1, 2, 3, 4 }};
-  address_v4 a2(b1);
-  ASIO_CHECK(a2.to_bytes()[0] == 1);
-  ASIO_CHECK(a2.to_bytes()[1] == 2);
-  ASIO_CHECK(a2.to_bytes()[2] == 3);
-  ASIO_CHECK(a2.to_bytes()[3] == 4);
-  ASIO_CHECK(((a2.to_uint() >> 24) & 0xFF) == b1[0]);
-  ASIO_CHECK(((a2.to_uint() >> 16) & 0xFF) == b1[1]);
-  ASIO_CHECK(((a2.to_uint() >> 8) & 0xFF) == b1[2]);
-  ASIO_CHECK((a2.to_uint() & 0xFF) == b1[3]);
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(((a2.to_ulong() >> 24) & 0xFF) == b1[0]);
-  ASIO_CHECK(((a2.to_ulong() >> 16) & 0xFF) == b1[1]);
-  ASIO_CHECK(((a2.to_ulong() >> 8) & 0xFF) == b1[2]);
-  ASIO_CHECK((a2.to_ulong() & 0xFF) == b1[3]);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-  address_v4 a3(0x01020304);
-  ASIO_CHECK(a3.to_bytes()[0] == 1);
-  ASIO_CHECK(a3.to_bytes()[1] == 2);
-  ASIO_CHECK(a3.to_bytes()[2] == 3);
-  ASIO_CHECK(a3.to_bytes()[3] == 4);
-  ASIO_CHECK(a3.to_uint() == 0x01020304);
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(a3.to_ulong() == 0x01020304);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-  ASIO_CHECK(address_v4(0x7F000001).is_loopback());
-  ASIO_CHECK(address_v4(0x7F000002).is_loopback());
-  ASIO_CHECK(!address_v4(0x00000000).is_loopback());
-  ASIO_CHECK(!address_v4(0x01020304).is_loopback());
-
-  ASIO_CHECK(address_v4(0x00000000).is_unspecified());
-  ASIO_CHECK(!address_v4(0x7F000001).is_unspecified());
-  ASIO_CHECK(!address_v4(0x01020304).is_unspecified());
-
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(address_v4(0x01000000).is_class_a());
-  ASIO_CHECK(address_v4(0x7F000000).is_class_a());
-  ASIO_CHECK(!address_v4(0x80000000).is_class_a());
-  ASIO_CHECK(!address_v4(0xBFFF0000).is_class_a());
-  ASIO_CHECK(!address_v4(0xC0000000).is_class_a());
-  ASIO_CHECK(!address_v4(0xDFFFFF00).is_class_a());
-  ASIO_CHECK(!address_v4(0xE0000000).is_class_a());
-  ASIO_CHECK(!address_v4(0xEFFFFFFF).is_class_a());
-  ASIO_CHECK(!address_v4(0xF0000000).is_class_a());
-  ASIO_CHECK(!address_v4(0xFFFFFFFF).is_class_a());
-
-  ASIO_CHECK(!address_v4(0x01000000).is_class_b());
-  ASIO_CHECK(!address_v4(0x7F000000).is_class_b());
-  ASIO_CHECK(address_v4(0x80000000).is_class_b());
-  ASIO_CHECK(address_v4(0xBFFF0000).is_class_b());
-  ASIO_CHECK(!address_v4(0xC0000000).is_class_b());
-  ASIO_CHECK(!address_v4(0xDFFFFF00).is_class_b());
-  ASIO_CHECK(!address_v4(0xE0000000).is_class_b());
-  ASIO_CHECK(!address_v4(0xEFFFFFFF).is_class_b());
-  ASIO_CHECK(!address_v4(0xF0000000).is_class_b());
-  ASIO_CHECK(!address_v4(0xFFFFFFFF).is_class_b());
-
-  ASIO_CHECK(!address_v4(0x01000000).is_class_c());
-  ASIO_CHECK(!address_v4(0x7F000000).is_class_c());
-  ASIO_CHECK(!address_v4(0x80000000).is_class_c());
-  ASIO_CHECK(!address_v4(0xBFFF0000).is_class_c());
-  ASIO_CHECK(address_v4(0xC0000000).is_class_c());
-  ASIO_CHECK(address_v4(0xDFFFFF00).is_class_c());
-  ASIO_CHECK(!address_v4(0xE0000000).is_class_c());
-  ASIO_CHECK(!address_v4(0xEFFFFFFF).is_class_c());
-  ASIO_CHECK(!address_v4(0xF0000000).is_class_c());
-  ASIO_CHECK(!address_v4(0xFFFFFFFF).is_class_c());
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-  ASIO_CHECK(!address_v4(0x01000000).is_multicast());
-  ASIO_CHECK(!address_v4(0x7F000000).is_multicast());
-  ASIO_CHECK(!address_v4(0x80000000).is_multicast());
-  ASIO_CHECK(!address_v4(0xBFFF0000).is_multicast());
-  ASIO_CHECK(!address_v4(0xC0000000).is_multicast());
-  ASIO_CHECK(!address_v4(0xDFFFFF00).is_multicast());
-  ASIO_CHECK(address_v4(0xE0000000).is_multicast());
-  ASIO_CHECK(address_v4(0xEFFFFFFF).is_multicast());
-  ASIO_CHECK(!address_v4(0xF0000000).is_multicast());
-  ASIO_CHECK(!address_v4(0xFFFFFFFF).is_multicast());
-
-  address_v4 a4 = address_v4::any();
-  ASIO_CHECK(a4.to_bytes()[0] == 0);
-  ASIO_CHECK(a4.to_bytes()[1] == 0);
-  ASIO_CHECK(a4.to_bytes()[2] == 0);
-  ASIO_CHECK(a4.to_bytes()[3] == 0);
-  ASIO_CHECK(a4.to_uint() == 0);
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(a4.to_ulong() == 0);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-  address_v4 a5 = address_v4::loopback();
-  ASIO_CHECK(a5.to_bytes()[0] == 0x7F);
-  ASIO_CHECK(a5.to_bytes()[1] == 0);
-  ASIO_CHECK(a5.to_bytes()[2] == 0);
-  ASIO_CHECK(a5.to_bytes()[3] == 0x01);
-  ASIO_CHECK(a5.to_uint() == 0x7F000001);
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(a5.to_ulong() == 0x7F000001);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-  address_v4 a6 = address_v4::broadcast();
-  ASIO_CHECK(a6.to_bytes()[0] == 0xFF);
-  ASIO_CHECK(a6.to_bytes()[1] == 0xFF);
-  ASIO_CHECK(a6.to_bytes()[2] == 0xFF);
-  ASIO_CHECK(a6.to_bytes()[3] == 0xFF);
-  ASIO_CHECK(a6.to_uint() == 0xFFFFFFFF);
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(a6.to_ulong() == 0xFFFFFFFF);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-#if !defined(ASIO_NO_DEPRECATED)
-  address_v4 class_a_net(0xFF000000);
-  address_v4 class_b_net(0xFFFF0000);
-  address_v4 class_c_net(0xFFFFFF00);
-  address_v4 other_net(0xFFFFFFFF);
-  ASIO_CHECK(address_v4::netmask(address_v4(0x01000000)) == class_a_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0x7F000000)) == class_a_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0x80000000)) == class_b_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0xBFFF0000)) == class_b_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0xC0000000)) == class_c_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0xDFFFFF00)) == class_c_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0xE0000000)) == other_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0xEFFFFFFF)) == other_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0xF0000000)) == other_net);
-  ASIO_CHECK(address_v4::netmask(address_v4(0xFFFFFFFF)) == other_net);
-#endif // !defined(ASIO_NO_DEPRECATED)
-}
-
-} // namespace ip_address_v4_runtime
-
-//------------------------------------------------------------------------------
-
-ASIO_TEST_SUITE
-(
-  "ip/address_v4",
-  ASIO_TEST_CASE(ip_address_v4_compile::test)
-  ASIO_TEST_CASE(ip_address_v4_runtime::test)
-)

OpenVPN Adapter/Vendors/asio/asio/src/tests/unit/ip/address_v4_iterator.cpp

@@ -1,27 +0,0 @@
-//
-// address_v4_iterator.cpp
-// ~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-// Disable autolinking for unit tests.
-#if !defined(BOOST_ALL_NO_LIB)
-#define BOOST_ALL_NO_LIB 1
-#endif // !defined(BOOST_ALL_NO_LIB)
-
-// Test that header file is self-contained.
-#include "asio/ip/address_v4_iterator.hpp"
-
-#include "../unit_test.hpp"
-
-//------------------------------------------------------------------------------
-
-ASIO_TEST_SUITE
-(
-  "ip/address_v4_iterator",
-  ASIO_TEST_CASE(null_test)
-)

OpenVPN Adapter/Vendors/asio/asio/src/tests/unit/ip/address_v4_range.cpp

@@ -1,27 +0,0 @@
-//
-// address_v4_range.cpp
-// ~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-// Disable autolinking for unit tests.
-#if !defined(BOOST_ALL_NO_LIB)
-#define BOOST_ALL_NO_LIB 1
-#endif // !defined(BOOST_ALL_NO_LIB)
-
-// Test that header file is self-contained.
-#include "asio/ip/address_v4_range.hpp"
-
-#include "../unit_test.hpp"
-
-//------------------------------------------------------------------------------
-
-ASIO_TEST_SUITE
-(
-  "ip/address_v4_range",
-  ASIO_TEST_CASE(null_test)
-)

OpenVPN Adapter/Vendors/asio/asio/src/tests/unit/ip/address_v6.cpp

@@ -1,409 +0,0 @@
-//
-// address_v6.cpp
-// ~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-// Disable autolinking for unit tests.
-#if !defined(BOOST_ALL_NO_LIB)
-#define BOOST_ALL_NO_LIB 1
-#endif // !defined(BOOST_ALL_NO_LIB)
-
-// Test that header file is self-contained.
-#include "asio/ip/address_v6.hpp"
-
-#include "../unit_test.hpp"
-#include <sstream>
-
-//------------------------------------------------------------------------------
-
-// ip_address_v6_compile test
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~
-// The following test checks that all public member functions on the class
-// ip::address_v6 compile and link correctly. Runtime failures are ignored.
-
-namespace ip_address_v6_compile {
-
-void test()
-{
-  using namespace asio;
-  namespace ip = asio::ip;
-
-  try
-  {
-    asio::error_code ec;
-
-    // address_v6 constructors.
-
-    ip::address_v6 addr1;
-    const ip::address_v6::bytes_type const_bytes_value = { { 0 } };
-    ip::address_v6 addr2(const_bytes_value);
-
-    // address_v6 functions.
-
-    unsigned long scope_id = addr1.scope_id();
-    addr1.scope_id(scope_id);
-
-    bool b = addr1.is_unspecified();
-    (void)b;
-
-    b = addr1.is_loopback();
-    (void)b;
-
-    b = addr1.is_multicast();
-    (void)b;
-
-    b = addr1.is_link_local();
-    (void)b;
-
-    b = addr1.is_site_local();
-    (void)b;
-
-    b = addr1.is_v4_mapped();
-    (void)b;
-
-#if !defined(ASIO_NO_DEPRECATED)
-    b = addr1.is_v4_compatible();
-    (void)b;
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    b = addr1.is_multicast_node_local();
-    (void)b;
-
-    b = addr1.is_multicast_link_local();
-    (void)b;
-
-    b = addr1.is_multicast_site_local();
-    (void)b;
-
-    b = addr1.is_multicast_org_local();
-    (void)b;
-
-    b = addr1.is_multicast_global();
-    (void)b;
-
-    ip::address_v6::bytes_type bytes_value = addr1.to_bytes();
-    (void)bytes_value;
-
-    std::string string_value = addr1.to_string();
-#if !defined(ASIO_NO_DEPRECATED)
-    string_value = addr1.to_string(ec);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-#if !defined(ASIO_NO_DEPRECATED)
-    ip::address_v4 addr3 = addr1.to_v4();
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    // address_v6 static functions.
-
-#if !defined(ASIO_NO_DEPRECATED)
-    addr1 = ip::address_v6::from_string("0::0");
-    addr1 = ip::address_v6::from_string("0::0", ec);
-    addr1 = ip::address_v6::from_string(string_value);
-    addr1 = ip::address_v6::from_string(string_value, ec);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    addr1 = ip::address_v6::any();
-
-    addr1 = ip::address_v6::loopback();
-
-#if !defined(ASIO_NO_DEPRECATED)
-    addr1 = ip::address_v6::v4_mapped(addr3);
-
-    addr1 = ip::address_v6::v4_compatible(addr3);
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-    // address_v6 comparisons.
-
-    b = (addr1 == addr2);
-    (void)b;
-
-    b = (addr1 != addr2);
-    (void)b;
-
-    b = (addr1 < addr2);
-    (void)b;
-
-    b = (addr1 > addr2);
-    (void)b;
-
-    b = (addr1 <= addr2);
-    (void)b;
-
-    b = (addr1 >= addr2);
-    (void)b;
-
-    // address_v6 creation functions.
-
-    addr1 = ip::make_address_v6(const_bytes_value, scope_id);
-    addr1 = ip::make_address_v6("0::0");
-    addr1 = ip::make_address_v6("0::0", ec);
-    addr1 = ip::make_address_v6(string_value);
-    addr1 = ip::make_address_v6(string_value, ec);
-#if defined(ASIO_HAS_STD_STRING_VIEW)
-# if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-    std::experimental::string_view string_view_value("0::0");
-# else // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-    std::string_view string_view_value("0::0");
-# endif // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-    addr1 = ip::make_address_v6(string_view_value);
-    addr1 = ip::make_address_v6(string_view_value, ec);
-#endif // defined(ASIO_HAS_STD_STRING_VIEW)
-
-    // address_v6 IPv4-mapped conversion.
-#if defined(ASIO_NO_DEPRECATED)
-    ip::address_v4 addr3;
-#endif // defined(ASIO_NO_DEPRECATED)
-    addr1 = ip::make_address_v6(ip::v4_mapped, addr3);
-    addr3 = ip::make_address_v4(ip::v4_mapped, addr1);
-
-    // address_v6 I/O.
-
-    std::ostringstream os;
-    os << addr1;
-
-#if !defined(BOOST_NO_STD_WSTREAMBUF)
-    std::wostringstream wos;
-    wos << addr1;
-#endif // !defined(BOOST_NO_STD_WSTREAMBUF)
-  }
-  catch (std::exception&)
-  {
-  }
-}
-
-} // namespace ip_address_v6_compile
-
-//------------------------------------------------------------------------------
-
-// ip_address_v6_runtime test
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~
-// The following test checks that the various public member functions meet the
-// necessary postconditions.
-
-namespace ip_address_v6_runtime {
-
-void test()
-{
-  using asio::ip::address_v6;
-
-  address_v6 a1;
-  ASIO_CHECK(a1.is_unspecified());
-  ASIO_CHECK(a1.scope_id() == 0);
-
-  address_v6::bytes_type b1 = {{ 1, 2, 3, 4, 5,
-    6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }};
-  address_v6 a2(b1, 12345);
-  ASIO_CHECK(a2.to_bytes()[0] == 1);
-  ASIO_CHECK(a2.to_bytes()[1] == 2);
-  ASIO_CHECK(a2.to_bytes()[2] == 3);
-  ASIO_CHECK(a2.to_bytes()[3] == 4);
-  ASIO_CHECK(a2.to_bytes()[4] == 5);
-  ASIO_CHECK(a2.to_bytes()[5] == 6);
-  ASIO_CHECK(a2.to_bytes()[6] == 7);
-  ASIO_CHECK(a2.to_bytes()[7] == 8);
-  ASIO_CHECK(a2.to_bytes()[8] == 9);
-  ASIO_CHECK(a2.to_bytes()[9] == 10);
-  ASIO_CHECK(a2.to_bytes()[10] == 11);
-  ASIO_CHECK(a2.to_bytes()[11] == 12);
-  ASIO_CHECK(a2.to_bytes()[12] == 13);
-  ASIO_CHECK(a2.to_bytes()[13] == 14);
-  ASIO_CHECK(a2.to_bytes()[14] == 15);
-  ASIO_CHECK(a2.to_bytes()[15] == 16);
-  ASIO_CHECK(a2.scope_id() == 12345);
-
-  address_v6 a3;
-  a3.scope_id(12345);
-  ASIO_CHECK(a3.scope_id() == 12345);
-
-  address_v6 unspecified_address;
-  address_v6::bytes_type loopback_bytes = {{ 0 }};
-  loopback_bytes[15] = 1;
-  address_v6 loopback_address(loopback_bytes);
-  address_v6::bytes_type link_local_bytes = {{ 0xFE, 0x80, 1 }};
-  address_v6 link_local_address(link_local_bytes);
-  address_v6::bytes_type site_local_bytes = {{ 0xFE, 0xC0, 1 }};
-  address_v6 site_local_address(site_local_bytes);
-  address_v6::bytes_type v4_mapped_bytes = {{ 0 }};
-  v4_mapped_bytes[10] = 0xFF, v4_mapped_bytes[11] = 0xFF;
-  v4_mapped_bytes[12] = 1, v4_mapped_bytes[13] = 2;
-  v4_mapped_bytes[14] = 3, v4_mapped_bytes[15] = 4;
-  address_v6 v4_mapped_address(v4_mapped_bytes);
-  address_v6::bytes_type v4_compat_bytes = {{ 0 }};
-  v4_compat_bytes[12] = 1, v4_compat_bytes[13] = 2;
-  v4_compat_bytes[14] = 3, v4_compat_bytes[15] = 4;
-  address_v6 v4_compat_address(v4_compat_bytes);
-  address_v6::bytes_type mcast_global_bytes = {{ 0xFF, 0x0E, 1 }};
-  address_v6 mcast_global_address(mcast_global_bytes);
-  address_v6::bytes_type mcast_link_local_bytes = {{ 0xFF, 0x02, 1 }};
-  address_v6 mcast_link_local_address(mcast_link_local_bytes);
-  address_v6::bytes_type mcast_node_local_bytes = {{ 0xFF, 0x01, 1 }};
-  address_v6 mcast_node_local_address(mcast_node_local_bytes);
-  address_v6::bytes_type mcast_org_local_bytes = {{ 0xFF, 0x08, 1 }};
-  address_v6 mcast_org_local_address(mcast_org_local_bytes);
-  address_v6::bytes_type mcast_site_local_bytes = {{ 0xFF, 0x05, 1 }};
-  address_v6 mcast_site_local_address(mcast_site_local_bytes);
-
-  ASIO_CHECK(!unspecified_address.is_loopback());
-  ASIO_CHECK(loopback_address.is_loopback());
-  ASIO_CHECK(!link_local_address.is_loopback());
-  ASIO_CHECK(!site_local_address.is_loopback());
-  ASIO_CHECK(!v4_mapped_address.is_loopback());
-  ASIO_CHECK(!v4_compat_address.is_loopback());
-  ASIO_CHECK(!mcast_global_address.is_loopback());
-  ASIO_CHECK(!mcast_link_local_address.is_loopback());
-  ASIO_CHECK(!mcast_node_local_address.is_loopback());
-  ASIO_CHECK(!mcast_org_local_address.is_loopback());
-  ASIO_CHECK(!mcast_site_local_address.is_loopback());
-
-  ASIO_CHECK(unspecified_address.is_unspecified());
-  ASIO_CHECK(!loopback_address.is_unspecified());
-  ASIO_CHECK(!link_local_address.is_unspecified());
-  ASIO_CHECK(!site_local_address.is_unspecified());
-  ASIO_CHECK(!v4_mapped_address.is_unspecified());
-  ASIO_CHECK(!v4_compat_address.is_unspecified());
-  ASIO_CHECK(!mcast_global_address.is_unspecified());
-  ASIO_CHECK(!mcast_link_local_address.is_unspecified());
-  ASIO_CHECK(!mcast_node_local_address.is_unspecified());
-  ASIO_CHECK(!mcast_org_local_address.is_unspecified());
-  ASIO_CHECK(!mcast_site_local_address.is_unspecified());
-
-  ASIO_CHECK(!unspecified_address.is_link_local());
-  ASIO_CHECK(!loopback_address.is_link_local());
-  ASIO_CHECK(link_local_address.is_link_local());
-  ASIO_CHECK(!site_local_address.is_link_local());
-  ASIO_CHECK(!v4_mapped_address.is_link_local());
-  ASIO_CHECK(!v4_compat_address.is_link_local());
-  ASIO_CHECK(!mcast_global_address.is_link_local());
-  ASIO_CHECK(!mcast_link_local_address.is_link_local());
-  ASIO_CHECK(!mcast_node_local_address.is_link_local());
-  ASIO_CHECK(!mcast_org_local_address.is_link_local());
-  ASIO_CHECK(!mcast_site_local_address.is_link_local());
-
-  ASIO_CHECK(!unspecified_address.is_site_local());
-  ASIO_CHECK(!loopback_address.is_site_local());
-  ASIO_CHECK(!link_local_address.is_site_local());
-  ASIO_CHECK(site_local_address.is_site_local());
-  ASIO_CHECK(!v4_mapped_address.is_site_local());
-  ASIO_CHECK(!v4_compat_address.is_site_local());
-  ASIO_CHECK(!mcast_global_address.is_site_local());
-  ASIO_CHECK(!mcast_link_local_address.is_site_local());
-  ASIO_CHECK(!mcast_node_local_address.is_site_local());
-  ASIO_CHECK(!mcast_org_local_address.is_site_local());
-  ASIO_CHECK(!mcast_site_local_address.is_site_local());
-
-  ASIO_CHECK(!unspecified_address.is_v4_mapped());
-  ASIO_CHECK(!loopback_address.is_v4_mapped());
-  ASIO_CHECK(!link_local_address.is_v4_mapped());
-  ASIO_CHECK(!site_local_address.is_v4_mapped());
-  ASIO_CHECK(v4_mapped_address.is_v4_mapped());
-  ASIO_CHECK(!v4_compat_address.is_v4_mapped());
-  ASIO_CHECK(!mcast_global_address.is_v4_mapped());
-  ASIO_CHECK(!mcast_link_local_address.is_v4_mapped());
-  ASIO_CHECK(!mcast_node_local_address.is_v4_mapped());
-  ASIO_CHECK(!mcast_org_local_address.is_v4_mapped());
-  ASIO_CHECK(!mcast_site_local_address.is_v4_mapped());
-
-#if !defined(ASIO_NO_DEPRECATED)
-  ASIO_CHECK(!unspecified_address.is_v4_compatible());
-  ASIO_CHECK(!loopback_address.is_v4_compatible());
-  ASIO_CHECK(!link_local_address.is_v4_compatible());
-  ASIO_CHECK(!site_local_address.is_v4_compatible());
-  ASIO_CHECK(!v4_mapped_address.is_v4_compatible());
-  ASIO_CHECK(v4_compat_address.is_v4_compatible());
-  ASIO_CHECK(!mcast_global_address.is_v4_compatible());
-  ASIO_CHECK(!mcast_link_local_address.is_v4_compatible());
-  ASIO_CHECK(!mcast_node_local_address.is_v4_compatible());
-  ASIO_CHECK(!mcast_org_local_address.is_v4_compatible());
-  ASIO_CHECK(!mcast_site_local_address.is_v4_compatible());
-#endif // !defined(ASIO_NO_DEPRECATED)
-
-  ASIO_CHECK(!unspecified_address.is_multicast());
-  ASIO_CHECK(!loopback_address.is_multicast());
-  ASIO_CHECK(!link_local_address.is_multicast());
-  ASIO_CHECK(!site_local_address.is_multicast());
-  ASIO_CHECK(!v4_mapped_address.is_multicast());
-  ASIO_CHECK(!v4_compat_address.is_multicast());
-  ASIO_CHECK(mcast_global_address.is_multicast());
-  ASIO_CHECK(mcast_link_local_address.is_multicast());
-  ASIO_CHECK(mcast_node_local_address.is_multicast());
-  ASIO_CHECK(mcast_org_local_address.is_multicast());
-  ASIO_CHECK(mcast_site_local_address.is_multicast());
-
-  ASIO_CHECK(!unspecified_address.is_multicast_global());
-  ASIO_CHECK(!loopback_address.is_multicast_global());
-  ASIO_CHECK(!link_local_address.is_multicast_global());
-  ASIO_CHECK(!site_local_address.is_multicast_global());
-  ASIO_CHECK(!v4_mapped_address.is_multicast_global());
-  ASIO_CHECK(!v4_compat_address.is_multicast_global());
-  ASIO_CHECK(mcast_global_address.is_multicast_global());
-  ASIO_CHECK(!mcast_link_local_address.is_multicast_global());
-  ASIO_CHECK(!mcast_node_local_address.is_multicast_global());
-  ASIO_CHECK(!mcast_org_local_address.is_multicast_global());
-  ASIO_CHECK(!mcast_site_local_address.is_multicast_global());
-
-  ASIO_CHECK(!unspecified_address.is_multicast_link_local());
-  ASIO_CHECK(!loopback_address.is_multicast_link_local());
-  ASIO_CHECK(!link_local_address.is_multicast_link_local());
-  ASIO_CHECK(!site_local_address.is_multicast_link_local());
-  ASIO_CHECK(!v4_mapped_address.is_multicast_link_local());
-  ASIO_CHECK(!v4_compat_address.is_multicast_link_local());
-  ASIO_CHECK(!mcast_global_address.is_multicast_link_local());
-  ASIO_CHECK(mcast_link_local_address.is_multicast_link_local());
-  ASIO_CHECK(!mcast_node_local_address.is_multicast_link_local());
-  ASIO_CHECK(!mcast_org_local_address.is_multicast_link_local());
-  ASIO_CHECK(!mcast_site_local_address.is_multicast_link_local());
-
-  ASIO_CHECK(!unspecified_address.is_multicast_node_local());
-  ASIO_CHECK(!loopback_address.is_multicast_node_local());
-  ASIO_CHECK(!link_local_address.is_multicast_node_local());
-  ASIO_CHECK(!site_local_address.is_multicast_node_local());
-  ASIO_CHECK(!v4_mapped_address.is_multicast_node_local());
-  ASIO_CHECK(!v4_compat_address.is_multicast_node_local());
-  ASIO_CHECK(!mcast_global_address.is_multicast_node_local());
-  ASIO_CHECK(!mcast_link_local_address.is_multicast_node_local());
-  ASIO_CHECK(mcast_node_local_address.is_multicast_node_local());
-  ASIO_CHECK(!mcast_org_local_address.is_multicast_node_local());
-  ASIO_CHECK(!mcast_site_local_address.is_multicast_node_local());
-
-  ASIO_CHECK(!unspecified_address.is_multicast_org_local());
-  ASIO_CHECK(!loopback_address.is_multicast_org_local());
-  ASIO_CHECK(!link_local_address.is_multicast_org_local());
-  ASIO_CHECK(!site_local_address.is_multicast_org_local());
-  ASIO_CHECK(!v4_mapped_address.is_multicast_org_local());
-  ASIO_CHECK(!v4_compat_address.is_multicast_org_local());
-  ASIO_CHECK(!mcast_global_address.is_multicast_org_local());
-  ASIO_CHECK(!mcast_link_local_address.is_multicast_org_local());
-  ASIO_CHECK(!mcast_node_local_address.is_multicast_org_local());
-  ASIO_CHECK(mcast_org_local_address.is_multicast_org_local());
-  ASIO_CHECK(!mcast_site_local_address.is_multicast_org_local());
-
-  ASIO_CHECK(!unspecified_address.is_multicast_site_local());
-  ASIO_CHECK(!loopback_address.is_multicast_site_local());
-  ASIO_CHECK(!link_local_address.is_multicast_site_local());
-  ASIO_CHECK(!site_local_address.is_multicast_site_local());
-  ASIO_CHECK(!v4_mapped_address.is_multicast_site_local());
-  ASIO_CHECK(!v4_compat_address.is_multicast_site_local());
-  ASIO_CHECK(!mcast_global_address.is_multicast_site_local());
-  ASIO_CHECK(!mcast_link_local_address.is_multicast_site_local());
-  ASIO_CHECK(!mcast_node_local_address.is_multicast_site_local());
-  ASIO_CHECK(!mcast_org_local_address.is_multicast_site_local());
-  ASIO_CHECK(mcast_site_local_address.is_multicast_site_local());
-
-  ASIO_CHECK(address_v6::loopback().is_loopback());
-}
-
-} // namespace ip_address_v6_runtime
-
-//------------------------------------------------------------------------------
-
-ASIO_TEST_SUITE
-(
-  "ip/address_v6",
-  ASIO_TEST_CASE(ip_address_v6_compile::test)
-  ASIO_TEST_CASE(ip_address_v6_runtime::test)
-)

OpenVPN Adapter/Vendors/asio/asio/src/tests/unit/ip/address_v6_iterator.cpp

@@ -1,27 +0,0 @@
-//
-// address_v6_iterator.cpp
-// ~~~~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-// Disable autolinking for unit tests.
-#if !defined(BOOST_ALL_NO_LIB)
-#define BOOST_ALL_NO_LIB 1
-#endif // !defined(BOOST_ALL_NO_LIB)
-
-// Test that header file is self-contained.
-#include "asio/ip/address_v6_iterator.hpp"
-
-#include "../unit_test.hpp"
-
-//------------------------------------------------------------------------------
-
-ASIO_TEST_SUITE
-(
-  "ip/address_v6_iterator",
-  ASIO_TEST_CASE(null_test)
-)

OpenVPN Adapter/Vendors/asio/asio/src/tests/unit/ip/address_v6_range.cpp

@@ -1,27 +0,0 @@
-//
-// address_v6_range.cpp
-// ~~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-// Disable autolinking for unit tests.
-#if !defined(BOOST_ALL_NO_LIB)
-#define BOOST_ALL_NO_LIB 1
-#endif // !defined(BOOST_ALL_NO_LIB)
-
-// Test that header file is self-contained.
-#include "asio/ip/address_v6_range.hpp"
-
-#include "../unit_test.hpp"
-
-//------------------------------------------------------------------------------
-
-ASIO_TEST_SUITE
-(
-  "ip/address_v6_range",
-  ASIO_TEST_CASE(null_test)
-)