From 1ff936895f430aaf34b838eed44ddb3cc4331ef1 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Thu, 11 Jun 2020 16:16:55 +0200 Subject: [PATCH] Improve logging of ConnectionStrategy --- CHANGELOG.md | 4 ++++ .../Protocols/OpenVPN/AppExtension/ConnectionStrategy.swift | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0583070..c1461ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2.2.7 (2020-06-11) + +- Code cleanup. + ## 2.2.6 (2020-05-12) - Address concerns from Guido Vranken fuzzers. [#141](https://github.com/passepartoutvpn/tunnelkit/pull/141) diff --git a/TunnelKit/Sources/Protocols/OpenVPN/AppExtension/ConnectionStrategy.swift b/TunnelKit/Sources/Protocols/OpenVPN/AppExtension/ConnectionStrategy.swift index 7ec91a6..2d44b6f 100644 --- a/TunnelKit/Sources/Protocols/OpenVPN/AppExtension/ConnectionStrategy.swift +++ b/TunnelKit/Sources/Protocols/OpenVPN/AppExtension/ConnectionStrategy.swift @@ -84,17 +84,20 @@ class ConnectionStrategy { currentEndpointIndex = 0 if let resolvedAddresses = configuration.resolvedAddresses { if configuration.prefersResolvedAddresses { + log.debug("Will use pre-resolved addresses only") endpoints = ConnectionStrategy.unrolledEndpoints( records: resolvedAddresses.map { DNSRecord(address: $0, isIPv6: false) }, protos: endpointProtocols ) } else { + log.debug("Will use DNS resolution with fallback to pre-resolved addresses") endpoints = [] } self.resolvedAddresses = resolvedAddresses } else { + log.debug("Will use DNS resolution") guard hostname != nil else { - fatalError("Either configuration.hostname or resolvedRecords required") + fatalError("Either configuration.sessionConfiguration.hostname or configuration.resolvedAddresses required") } endpoints = [] resolvedAddresses = []