From 582ef4875d9e7f4d545388acfb5c16e5f3ac1165 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Fri, 7 Sep 2018 22:16:04 +0200
Subject: [PATCH] Move default pingInterval to constructor

Use CoreConfiguration only within Core.
---
 .../Sources/AppExtension/TunnelKitProvider+Configuration.swift  | 2 +-
 TunnelKit/Sources/AppExtension/TunnelKitProvider.swift          | 1 -
 TunnelKit/Sources/Core/SessionProxy+Configuration.swift         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift b/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift
index 0a51d1c..9bb5e23 100644
--- a/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift
+++ b/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift
@@ -529,7 +529,7 @@ extension TunnelKitProvider {
             if let keepAliveSeconds = keepAliveSeconds {
                 log.info("Keep-alive: \(keepAliveSeconds) seconds")
             } else {
-                log.info("Keep-alive: disabled")
+                log.info("Keep-alive: default")
             }
             if let renegotiatesAfterSeconds = renegotiatesAfterSeconds {
                 log.info("Renegotiation: \(renegotiatesAfterSeconds) seconds")
diff --git a/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift b/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift
index efc7cd7..ebfbb0d 100644
--- a/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift
+++ b/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift
@@ -227,7 +227,6 @@ open class TunnelKitProvider: NEPacketTunnelProvider {
         if let renegotiatesAfterSeconds = cfg.renegotiatesAfterSeconds {
             sessionConfiguration.renegotiatesAfter = TimeInterval(renegotiatesAfterSeconds)
         }
-        sessionConfiguration.keepAliveInterval = CoreConfiguration.pingInterval
 
         let proxy: SessionProxy
         do {
diff --git a/TunnelKit/Sources/Core/SessionProxy+Configuration.swift b/TunnelKit/Sources/Core/SessionProxy+Configuration.swift
index 963bad6..24d1d5c 100644
--- a/TunnelKit/Sources/Core/SessionProxy+Configuration.swift
+++ b/TunnelKit/Sources/Core/SessionProxy+Configuration.swift
@@ -152,7 +152,7 @@ extension SessionProxy {
             clientCertificatePath = nil
             clientKeyPath = nil
             compressionFraming = .disabled
-            keepAliveInterval = nil
+            keepAliveInterval = CoreConfiguration.pingInterval
             renegotiatesAfter = nil
         }