From 8decbe13aad9ac90e757580667f67068c425f483 Mon Sep 17 00:00:00 2001
From: Sergey Abramchuk <ss.abramchuk@gmail.com>
Date: Sun, 23 Apr 2017 13:54:54 +0300
Subject: [PATCH] Wrap connection timeout property and update documentation for
 IPv6 preference options

---
 OpenVPN Adapter/OpenVPNConfiguration.h  | 12 ++++++++----
 OpenVPN Adapter/OpenVPNConfiguration.mm |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/OpenVPN Adapter/OpenVPNConfiguration.h b/OpenVPN Adapter/OpenVPNConfiguration.h
index 6f2fe17..2580fda 100644
--- a/OpenVPN Adapter/OpenVPNConfiguration.h	
+++ b/OpenVPN Adapter/OpenVPNConfiguration.h	
@@ -12,14 +12,13 @@
 
 /**
  IPv6 preference options
-
- - IPv6PreferenceEnabled: request combined IPv4/IPv6 tunnel
- - IPv6PreferenceDisabled: disable IPv6, so tunnel will be IPv4-only
- - IPv6PreferenceDefault: leave decision to server
  */
 typedef NS_ENUM(NSInteger, IPv6Preference) {
+    /// Request combined IPv4/IPv6 tunnel
     IPv6PreferenceEnabled,
+    /// Disable IPv6, so tunnel will be IPv4-only
     IPv6PreferenceDisabled,
+    /// Leave decision to server
     IPv6PreferenceDefault
 };
 
@@ -60,4 +59,9 @@ typedef NS_ENUM(NSInteger, IPv6Preference) {
  */
 @property (nonatomic) IPv6Preference ipv6;
 
+/**
+ Connection timeout in seconds, or 0 to retry indefinitely
+ */
+@property (nonatomic) NSInteger connectionTimeout;
+
 @end
diff --git a/OpenVPN Adapter/OpenVPNConfiguration.mm b/OpenVPN Adapter/OpenVPNConfiguration.mm
index 188b65f..392b9dc 100644
--- a/OpenVPN Adapter/OpenVPNConfiguration.mm	
+++ b/OpenVPN Adapter/OpenVPNConfiguration.mm	
@@ -121,4 +121,12 @@ using namespace openvpn;
     }
 }
 
+- (NSInteger)connectionTimeout {
+    return _config.connTimeout;
+}
+
+- (void)setConnectionTimeout:(NSInteger)connectionTimeout {
+    _config.connTimeout = connectionTimeout;
+}
+
 @end