From 9eac43366545eb06ee604264465c91e412285cc8 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 10 Apr 2019 11:53:08 +0300 Subject: [PATCH 1/7] Bump version number --- Configuration/Info-Framework.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Info-Framework.plist b/Configuration/Info-Framework.plist index db8ba7b..badd676 100644 --- a/Configuration/Info-Framework.plist +++ b/Configuration/Info-Framework.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.1.0 + 0.2.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass From 7b2320fbe36a6153c33fe139b92364669e3482f1 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 10 Apr 2019 11:59:05 +0300 Subject: [PATCH 2/7] Update podspec --- OpenVPNAdapter.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenVPNAdapter.podspec b/OpenVPNAdapter.podspec index 9df2af5..8cf5f11 100644 --- a/OpenVPNAdapter.podspec +++ b/OpenVPNAdapter.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "OpenVPNAdapter" - s.version = "0.1.0" + s.version = "0.2.0" s.summary = "Objective-C wrapper for OpenVPN library. Compatible with iOS and macOS." s.description = <<-DESC OpenVPNAdapter is an Objective-C framework that allows to easily configure and establish VPN connection using OpenVPN protocol. @@ -143,7 +143,7 @@ Pod::Spec.new do |s| openvpn.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_TARGET_SRCROOT}/#{openvpn_path}/**", - "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" + "OTHER_CPLUSPLUSFLAGS" => "$(OTHER_CFLAGS) -DUSE_ASIO -DUSE_ASIO_THREADLOCAL -DASIO_STANDALONE -DASIO_NO_DEPRECATED -DASIO_HAS_STD_STRING_VIEW -DHAVE_LZ4 -DUSE_MBEDTLS -DOPENVPN_FORCE_TUN_NULL -DUSE_TUN_BUILDER" } end From b38a8050e0b07d5a7f5476dfe478e51751d569d6 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 10 Apr 2019 12:02:42 +0300 Subject: [PATCH 3/7] Update version in Cocoapods section --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3db1fb..60f1d72 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ To install OpenVPNAdapter with Cocoapods, add the following lines to your `Podfi ```ruby target 'Your Target Name' do use_frameworks! - pod 'OpenVPNAdapter', :git => 'https://github.com/ss-abramchuk/OpenVPNAdapter.git', :tag => '0.1.0' + pod 'OpenVPNAdapter', :git => 'https://github.com/ss-abramchuk/OpenVPNAdapter.git', :tag => '0.2.0' end ``` From 208d87f258fa2d4a596e4040c5cda494828cda1e Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 10 Apr 2019 12:02:56 +0300 Subject: [PATCH 4/7] Fix typos --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 60f1d72..3cfc621 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Then we need to create or load a VPN profile. [`NETunnelProviderManager`](https: ```swift NETunnelProviderManager.loadAllFromPreferences { (managers, error) in guard error == nil else { - // Handle an occured error + // Handle an occurred error return } @@ -65,7 +65,7 @@ The next step is to provide VPN settings to the instance of [`NETunnelProviderMa ```swift self.providerManager?.loadFromPreferences(completionHandler: { (error) in guard error == nil else { - // Handle an occured error + // Handle an occurred error return } @@ -107,7 +107,7 @@ self.providerManager?.loadFromPreferences(completionHandler: { (error) in // Save configuration in the Network Extension preferences self.providerManager?.saveToPreferences(completionHandler: { (error) in if let error = error { - // Handle an occured error + // Handle an occurred error } }) } @@ -118,14 +118,14 @@ Start VPN by calling the following code. ```swift self.providerManager?.loadFromPreferences(completionHandler: { (error) in guard error == nil else { - // Handle an occured error + // Handle an occurred error return } do { try self.providerManager?.connection.startVPNTunnel() } catch { - // Handle an occured error + // Handle an occurred error } } ``` From f0844e998f9fc76d1b762cd4ca4c3a5effe07b8f Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 10 Apr 2019 12:14:04 +0300 Subject: [PATCH 5/7] Update Usage section --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cfc621..c228878 100644 --- a/README.md +++ b/README.md @@ -247,7 +247,12 @@ extension PacketTunnelProvider: OpenVPNAdapterDelegate { // `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so // you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and // send `self.packetFlow` to `completionHandler` callback. - func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings, completionHandler: @escaping (OpenVPNAdapterPacketFlow?) -> Void) { + func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?, completionHandler: @escaping (OpenVPNAdapterPacketFlow?) -> Void) { + // In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers + // send empty string to NEDNSSettings.matchDomains + networkSettings?.dnsSettings?.matchDomains = [""] + + // Specify the network settings for the current tunneling session. setTunnelNetworkSettings(settings) { (error) in completionHandler(error == nil ? self.packetFlow : nil) } From f3caddf509c6a6456e125f86836e455ca37d1451 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 10 Apr 2019 12:16:40 +0300 Subject: [PATCH 6/7] Update Acknowledgments section --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c228878..0802fa2 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ extension NEPacketTunnelFlow: OpenVPNAdapterPacketFlow {} Any contributions and suggestions are welcome! But before creating a PR or an issue please read the [Contribution Guide](CONTRIBUTING.md). ## Acknowledgments -Special thanks goes to @JonathanDowning for great help in development of this project and bug fixing. +Special thanks goes to [@JonathanDowning](https://github.com/JonathanDowning) for great help in development of this project and bug fixing. ## License OpenVPNAdapter is available under the AGPLv3 license. See the [LICENSE](LICENSE) file for more info. Also this project has a few dependencies: From 45723d7ee123806505cc1e3582138bf3ec241c7b Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 10 Apr 2019 12:18:05 +0300 Subject: [PATCH 7/7] Delete outdated revisions --- NOTICE | 4 ---- 1 file changed, 4 deletions(-) diff --git a/NOTICE b/NOTICE index f57541a..0612210 100644 --- a/NOTICE +++ b/NOTICE @@ -4,7 +4,6 @@ Third party libraries used by the OpenVPNAdapter project: -------------------------------------------------------------------- Dependency: https://github.com/OpenVPN/openvpn3 -Revision: 3e002c83ce2e9f9f40ddcee750d3cfa664238abe License type: GNU Affero General Public License - Version 3.0 -------------------------------------------------------------------- OpenVPN Library @@ -675,7 +674,6 @@ For more information on this, and how to apply and follow the GNU AGPL, see -------------------------------------------------------------------- Dependency: https://github.com/ARMmbed/mbedtls -Revision: 72ea31b026e1fc61b01662474aa5125817b968bc License type: Apache License - Version 2.0 -------------------------------------------------------------------- mbedTLS Library @@ -886,7 +884,6 @@ limitations under the License. -------------------------------------------------------------------- Dependency: https://github.com/chriskohlhoff/asio -Revision: 72ea31b026e1fc61b01662474aa5125817b968bc License type: Boost Software License - Version 1.0 -------------------------------------------------------------------- ASIO Library @@ -920,7 +917,6 @@ DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------- Dependency: https://github.com/lz4/lz4 -Revision: c10863b98e1503af90616ae99725ecd120265dfb License type: BSD 2-Clause License -------------------------------------------------------------------- LZ4 Library