Description: Add some vital OpenVPN options
 Add support for "--ping" and "--ping-restart".
 .
 network-manager-openvpn (0.9.8.2-1ubuntu4asahi1) trusty; urgency=medium
 .
   * Add support for "--ping" and "--ping-restart".
Author: Stephane Lapie <stephane.lapie@asahinet.com>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: other
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=635179
Bug-Ubuntu: https://launchpad.net/bugs/364101
Forwarded: no
Last-Update: 2015-07-28

--- network-manager-openvpn-0.9.8.2.orig/src/nm-openvpn-service.c
+++ network-manager-openvpn-0.9.8.2/src/nm-openvpn-service.c
@@ -115,6 +115,8 @@ static ValidProperty valid_properties[]
 	{ NM_OPENVPN_KEY_REMOTE_RANDOM,        G_TYPE_BOOLEAN, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_REMOTE_IP,            G_TYPE_STRING, 0, 0, TRUE },
 	{ NM_OPENVPN_KEY_RENEG_SECONDS,        G_TYPE_INT, 0, G_MAXINT, FALSE },
+	{ NM_OPENVPN_PING,                     G_TYPE_INT, 0, G_MAXINT, FALSE },
+	{ NM_OPENVPN_PING_RESTART,             G_TYPE_INT, 0, G_MAXINT, FALSE },
 	{ NM_OPENVPN_KEY_STATIC_KEY,           G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_STATIC_KEY_DIRECTION, G_TYPE_INT, 0, 1, FALSE },
 	{ NM_OPENVPN_KEY_TA,                   G_TYPE_STRING, 0, 0, FALSE },
@@ -912,6 +914,34 @@ nm_openvpn_start_openvpn_binary (NMOpenv
 			free_openvpn_args (args);
 			return FALSE;
 		}
+	}
+
+	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_PING_RESTART);
+	if (tmp && strlen (tmp)) {
+		add_openvpn_arg (args, "--ping-restart");
+		if (!add_openvpn_arg_int (args, tmp)) {
+			g_set_error(error,
+				    NM_VPN_PLUGIN_ERROR,
+				    NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
+				    _("Invalid ping delay before restart '%s'."),
+				    tmp);
+			free_openvpn_args (args);
+			return FALSE;
+		}
+	}
+
+	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_PING);
+	if (tmp && strlen (tmp)) {
+		add_openvpn_arg (args, "--ping");
+		if (!add_openvpn_arg_int (args, tmp)) {
+			g_set_error(error,
+				    NM_VPN_PLUGIN_ERROR,
+				    NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
+				    _("Invalid ping frequency '%s'."),
+				    tmp);
+			free_openvpn_args (args);
+			return FALSE;
+		}
 	}
 
 	if (debug) {
--- network-manager-openvpn-0.9.8.2.orig/src/nm-openvpn-service.h
+++ network-manager-openvpn-0.9.8.2/src/nm-openvpn-service.h
@@ -78,6 +78,9 @@
 
 #define NM_OPENVPN_KEY_RENEG_SECONDS "reneg-seconds"
 
+#define NM_OPENVPN_PING "ping"
+#define NM_OPENVPN_PING_RESTART "ping-restart"
+
 #define NM_OPENVPN_AUTH_NONE "none"
 #define NM_OPENVPN_AUTH_RSA_MD4 "RSA-MD4"
 #define NM_OPENVPN_AUTH_MD5  "MD5"