File compress.patch of Package NetworkManager-openvpn

Overview Repositories Revisions Requests Users Attributes Meta

File compress.patch of Package NetworkManager-openvpn (Revision a96771724dccb952002c47b95428a59f)

Currently displaying revision a96771724dccb952002c47b95428a59f , Show latest

diff --git a/Makefile.am b/Makefile.am
index 27bbec95a912af1a4492807509e421fe1934fcb4..5d6f7617f9eed4f2339baca2ca023be788483437 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,6 +285,7 @@ properties_tests_test_import_export_glib_LDADD = \
 
 
 EXTRA_DIST += \
+	properties/tests/conf/compress.ovpn \
 	properties/tests/conf/iso885915.ovpn \
 	properties/tests/conf/mtu-disc.ovpn \
 	properties/tests/conf/password.conf \
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 41b6384b220ed6b0bd0e687a3a73247e42d44660..9fc365f2335cd3960d9797e739d8b56e851d81f2 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * Dan Williams <dcbw@redhat.com>
  * Tim Niemueller <tim@niemueller.de>
@@ -18,8 +18,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2004 - 2008 Red Hat, Inc.
- *               2005 Tim Niemueller [www.niemueller.de]
+ * Copyright (C) 2005 Tim Niemueller [www.niemueller.de]
+ * Copyright (C) 2004 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/po/sk.po b/po/sk.po
index 5f8cdd22f588b146f2acb835acbc2d8af66c794e..c4124ac7462e025d7080c93a5e6e7fc4bd09a913 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,8 +3,6 @@
 # This file is distributed under the same license as the NetworkManager package.
 # Marcel Telka <marcel@telka.sk>, 2004, 2005, 2006.
 #
-# $Id: sk.po,v 1.1 2006/06/17 20:55:49 marcel Exp $
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-openvpn\n"
diff --git a/properties/import-export.c b/properties/import-export.c
index b956fb7aceb94d0fc583bfe0bdbcae77b146f115..0861896c3738bde5d078363583989be8c0bf7fd4 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/***************************************************************************
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,9 +15,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2008 - 2013 Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
- *
- **************************************************************************/
+ * Copyright (C) 2008 - 2013 Dan Williams <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2018 Red Hat, Inc.
+ */
 
 #include "nm-default.h"
 
@@ -1018,6 +1018,19 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
 			continue;
 		}
 
+		if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_COMPRESS)) {
+			if (!args_params_check_nargs_minmax (params, 0, 1, &line_error))
+				goto handle_line_error;
+			if (params[1]) {
+				if (!args_params_check_arg_utf8 (params, 1, NULL, &line_error))
+					goto handle_line_error;
+				setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, params[1]);
+			} else {
+				setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, "yes");
+			}
+			continue;
+		}
+
 		if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_FLOAT)) {
 			if (!args_params_check_nargs_n (params, 0, &line_error))
 				goto handle_line_error;
@@ -1945,6 +1958,12 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
 		args_write_line (f, NMV_OVPN_TAG_COMP_LZO, value);
 	}
 
+	value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_COMPRESS);
+	if (nm_streq0 (value, "yes"))
+		args_write_line (f, NMV_OVPN_TAG_COMPRESS);
+	else if (value)
+		args_write_line_setting_value (f, NMV_OVPN_TAG_COMPRESS, s_vpn, NM_OPENVPN_KEY_COMPRESS);
+
 	if (nm_streq0 (nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_FLOAT), "yes"))
 		args_write_line (f, NMV_OVPN_TAG_FLOAT);
 
diff --git a/properties/import-export.h b/properties/import-export.h
index 06b92a836655fb191eb5924413972c2ca041de62..71bacbb68412a6a3cc0f425f37a209584bcc27b1 100644
--- a/properties/import-export.h
+++ b/properties/import-export.h
@@ -1,7 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/***************************************************************************
- *
- * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +15,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- **************************************************************************/
+ * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2018 Red Hat, Inc.
+ */
 
 #ifndef _IMPORT_EXPORT_H_
 #define _IMPORT_EXPORT_H_
diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui
index e89e53f534612eef395f6597180c62d5615ab4fd..8870ab7e734965a9a929d33c0282f0021d6ae66b 100644
--- a/properties/nm-openvpn-dialog.ui
+++ b/properties/nm-openvpn-dialog.ui
@@ -59,6 +59,33 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="compression">
+    <columns>
+      
+      <column type="gchararray"/>
+      
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">yes</col>
+        <col id="1" translatable="yes">Automatic</col>
+      </row>
+      <row>
+        <col id="0">lz4</col>
+        <col id="1" translatable="yes">LZ4</col>
+      </row>
+      <row>
+        <col id="0">lzo</col>
+        <col id="1" translatable="yes">LZO</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkEntryCompletion" id="compress_completion">
+    <property name="model">compression</property>
+    <property name="minimum_key_length">0</property>
+    <property name="text_column">0</property>
+  </object>
   <object class="GtkListStore" id="liststore1"/>
   <object class="GtkListStore" id="liststore2"/>
   <object class="GtkListStore" id="model1">
@@ -905,6 +932,7 @@ config: static &lt;file&gt; [direction]</property>
                 <property name="border_width">12</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
+                <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
@@ -1005,8 +1033,8 @@ config: reneg-sec</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
-                      <object class="GtkCheckButton" id="lzo_checkbutton">
-                        <property name="label" translatable="yes">Use L_ZO data compression</property>
+                      <object class="GtkCheckButton" id="compress_checkbutton">
+                        <property name="label" translatable="yes">Data _compression:</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1024,23 +1052,23 @@ config: comp-lzo</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="lzo_combo">
+                      <object class="GtkComboBox" id="compress_combo">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the LZO data compression mode.
-config: comp-lzo</property>
-                        <property name="model">model4</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer13"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
+                        <property name="can_focus">False</property>
+                        <property name="model">compression</property>
+                        <property name="has_entry">True</property>
+                        <property name="entry_text_column">1</property>
+                        <property name="id_column">0</property>
+                        <child internal-child="entry">
+                          <object class="GtkEntry" id="compress_entry">
+                            <property name="can_focus">True</property>
+                          </object>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
diff --git a/properties/nm-openvpn-editor-plugin.c b/properties/nm-openvpn-editor-plugin.c
index 223c602020ed1a05389702b949a1ac597066dd56..f419cac7ac2cebcfaf30ef93d508e8d579dfd361 100644
--- a/properties/nm-openvpn-editor-plugin.c
+++ b/properties/nm-openvpn-editor-plugin.c
@@ -1,11 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/***************************************************************************
- * nm-openvpn-editor-plugin.c : GNOME UI dialogs for configuring openvpn VPN connections
- *
- * Copyright (C) 2005 Tim Niemueller <tim@niemueller.de>
- * Copyright (C) 2008 - 2010 Dan Williams, <dcbw@redhat.com>
- * Copyright (C) 2008 - 2011 Red Hat, Inc.
- * Based on work by David Zeuthen, <davidz@redhat.com>
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +15,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- **************************************************************************/
+ * Based on work by David Zeuthen, <davidz@redhat.com>
+ * Copyright (C) 2005 Tim Niemueller <tim@niemueller.de>
+ * Copyright (C) 2008 - 2010 Dan Williams, <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2018 Red Hat, Inc.
+ */
 
 #include "nm-default.h"
 
diff --git a/properties/nm-openvpn-editor-plugin.h b/properties/nm-openvpn-editor-plugin.h
index df7808f9cba578db72f6da80ab51bf6e7dcc6511..d9cf126df5471b1a53aaace3d62e86820386e35b 100644
--- a/properties/nm-openvpn-editor-plugin.h
+++ b/properties/nm-openvpn-editor-plugin.h
@@ -1,8 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/***************************************************************************
- * nm-openvpn-editor.h : GNOME UI dialogs for configuring openvpn VPN connections
- *
- * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +15,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- **************************************************************************/
+ * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2018 Red Hat, Inc.
+ */
 
 #ifndef __NM_OPENVPN_EDITOR_PLUGIN_H__
 #define __NM_OPENVPN_EDITOR_PLUGIN_H__
diff --git a/properties/nm-openvpn-editor.c b/properties/nm-openvpn-editor.c
index 1207ef74ef9acee2b8b7721003cbeffb6446e900..4bb5187da1756c3b40e95a941bcef6c258811d9d 100644
--- a/properties/nm-openvpn-editor.c
+++ b/properties/nm-openvpn-editor.c
@@ -1,14 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/***************************************************************************
- * CVSID: $Id: nm-openvpn.c 4232 2008-10-29 09:13:40Z tambeti $
- *
- * nm-openvpn.c : GNOME UI dialogs for configuring openvpn VPN connections
- *
- * Copyright (C) 2005 Tim Niemueller <tim@niemueller.de>
- * Copyright (C) 2008 Tambet Ingo, <tambet@gmail.com>
- * Copyright (C) 2008 - 2010 Dan Williams, <dcbw@redhat.com>
- * Copyright (C) 2008 - 2017 Red Hat, Inc.
- * Based on work by David Zeuthen, <davidz@redhat.com>
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +15,12 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- **************************************************************************/
+ * Based on work by David Zeuthen, <davidz@redhat.com>
+ * Copyright (C) 2005 Tim Niemueller <tim@niemueller.de>
+ * Copyright (C) 2008 Tambet Ingo, <tambet@gmail.com>
+ * Copyright (C) 2008 - 2010 Dan Williams, <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2017 Red Hat, Inc.
+ */
 
 #include "nm-default.h"
 
@@ -56,38 +52,6 @@ static GtkFileFilter *sk_file_chooser_filter_new (void);
 
 /*****************************************************************************/
 
-static const char *comp_lzo_values[] = {
-	"adaptive",
-	"yes",
-	"no-by-default",
-};
-
-static const char *
-comp_lzo_values_conf_coerce (const char *value_conf)
-{
-	if (!value_conf || nm_streq (value_conf, "no"))
-		return NULL;
-	if (nm_streq (value_conf, "yes"))
-		return "yes";
-	if (nm_streq (value_conf, "no-by-default"))
-		return "no-by-default";
-	return "adaptive";
-}
-
-static const char *
-comp_lzo_values_conf_to_display (const char *value_conf)
-{
-	if (nm_streq (value_conf, "yes"))
-		return "yes";
-	if (nm_streq (value_conf, "no-by-default"))
-		return "no";
-	if (nm_streq (value_conf, "adaptive"))
-		return "adaptive";
-	g_return_val_if_reached ("adaptive");
-}
-
-/*****************************************************************************/
-
 /* From gnome-control-center/panels/network/connection-editor/ui-helpers.c */
 
 static void
@@ -684,7 +648,7 @@ sk_file_chooser_filter_new (void)
 static const char *advanced_keys[] = {
 	NM_OPENVPN_KEY_AUTH,
 	NM_OPENVPN_KEY_CIPHER,
-	NM_OPENVPN_KEY_COMP_LZO,
+	NM_OPENVPN_KEY_COMPRESS,
 	NM_OPENVPN_KEY_CONNECT_TIMEOUT,
 	NM_OPENVPN_KEY_CRL_VERIFY_DIR,
 	NM_OPENVPN_KEY_CRL_VERIFY_FILE,
@@ -1464,7 +1428,6 @@ advanced_dialog_new (GHashTable *hash, const char *contype)
 	GtkListStore *store;
 	GtkTreeIter iter;
 	int vint;
-	guint i;
 	guint32 active;
 	NMSettingSecretFlags pw_flags;
 	GError *error = NULL;
@@ -1585,24 +1548,25 @@ advanced_dialog_new (GHashTable *hash, const char *contype)
 	_builder_init_optional_spinbutton (builder, "fragment_checkbutton", "fragment_spinbutton", !!value,
 	                                   _nm_utils_ascii_str_to_int64 (value, 10, 0, 65535, 1300));
 
-
-	value = comp_lzo_values_conf_coerce (g_hash_table_lookup (hash, NM_OPENVPN_KEY_COMP_LZO));
-	widget = GTK_WIDGET (_builder_init_toggle_button (builder, "lzo_checkbutton", value != NULL));
-	combo = GTK_WIDGET (gtk_builder_get_object (builder, "lzo_combo"));
-	store = gtk_list_store_new (1, G_TYPE_STRING);
-	active = 0;
-	for (i = 0; i < G_N_ELEMENTS (comp_lzo_values); i++) {
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
-		                    0, comp_lzo_values_conf_to_display (comp_lzo_values[i]),
-		                    -1);
-		if (nm_streq (comp_lzo_values[i], value ?: "adaptive"))
-			active = i;
-	}
-	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (store));
-	g_object_unref (store);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), active);
+	value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_COMPRESS);
+	if (!value) {
+		/* Migrate from the legacy comp-lzo option */
+		value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_COMP_LZO);
+		if (g_strcmp0 (value, "yes") == 0)
+			value = "lzo";
+		else if (g_strcmp0 (value, "no-by-default") == 0)
+			value = "no";
+		else if (g_strcmp0 (value, "adaptive") == 0)
+			value = "yes";
+	}
+	combo = GTK_WIDGET (gtk_builder_get_object (builder, "compress_combo"));
+	widget = GTK_WIDGET (_builder_init_toggle_button (builder, "compress_checkbutton", value != NULL));
 	g_object_bind_property (widget, "active", combo, "sensitive", G_BINDING_SYNC_CREATE);
+	gtk_combo_box_set_active_id (GTK_COMBO_BOX (combo), "yes");
+	if (!gtk_combo_box_set_active_id (GTK_COMBO_BOX (combo), value)) {
+		entry = GTK_WIDGET (gtk_builder_get_object (builder, "compress_entry"));
+		gtk_entry_set_text (GTK_ENTRY (entry), value);
+	}
 
 	_builder_init_toggle_button (builder, "mssfix_checkbutton", _hash_get_boolean (hash, NM_OPENVPN_KEY_MSSFIX));
 	_builder_init_toggle_button (builder, "float_checkbutton", _hash_get_boolean (hash, NM_OPENVPN_KEY_FLOAT));
@@ -1826,7 +1790,6 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
 	GtkBuilder *builder;
 	const char *contype = NULL;
 	const char *value;
-	int active;
 	int proxy_type = PROXY_TYPE_NONE;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -1941,12 +1904,16 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
 		}
 	}
 
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "lzo_checkbutton"));
+	widget = GTK_WIDGET (gtk_builder_get_object (builder, "compress_checkbutton"));
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
-		combo = GTK_WIDGET (gtk_builder_get_object (builder, "lzo_combo"));
-		active = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
-		if (active >= 0 && active < G_N_ELEMENTS (comp_lzo_values))
-			g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_COMP_LZO), g_strdup (comp_lzo_values[active]));
+		combo = GTK_WIDGET (gtk_builder_get_object (builder, "compress_combo"));
+		value = gtk_combo_box_get_active_id (GTK_COMBO_BOX (combo));
+		if (!value) {
+			entry = GTK_WIDGET (gtk_builder_get_object (builder, "compress_entry"));
+			value = gtk_entry_get_text (GTK_ENTRY (entry));
+		}
+		if (value && *value)
+			g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_COMPRESS), g_strdup (value));
 	}
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "mssfix_checkbutton"));
diff --git a/properties/nm-openvpn-editor.h b/properties/nm-openvpn-editor.h
index 694006836f39de3f823e5a1769dc9064441c4659..663e1a6799b2c96f33b0c4b45f7bd09fe986b2e1 100644
--- a/properties/nm-openvpn-editor.h
+++ b/properties/nm-openvpn-editor.h
@@ -1,8 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/***************************************************************************
- * nm-openvpn-editor.h : GNOME UI dialogs for configuring openvpn VPN connections
- *
- * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +15,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- **************************************************************************/
+ * Copyright (C) 2008 Dan Williams, <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2018 Red Hat, Inc.
+ */
 
 #ifndef __NM_OPENVPN_EDITOR_H__
 #define __NM_OPENVPN_EDITOR_H__
diff --git a/properties/tests/conf/compress.ovpn b/properties/tests/conf/compress.ovpn
new file mode 100644
index 0000000000000000000000000000000000000000..4c2a4ab1a39e9334450cba3c9bc10ccbf9861635
--- /dev/null
+++ b/properties/tests/conf/compress.ovpn
@@ -0,0 +1,6 @@
+remote 173.8.149.245 666
+dev tun
+client
+
+comp-lzo
+compress lzo
diff --git a/properties/tests/conf/connect-timeout.ovpn b/properties/tests/conf/connect-timeout.ovpn
index 67efe83d29b611bb4e44bab3e1e08889d3e021a0..23714836b533729decae638db2989df91647cbd1 100644
--- a/properties/tests/conf/connect-timeout.ovpn
+++ b/properties/tests/conf/connect-timeout.ovpn
@@ -20,6 +20,6 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 4
 
diff --git a/properties/tests/conf/crl-dir.ovpn b/properties/tests/conf/crl-dir.ovpn
index d27220a8617cfa053fabee91a86d13419ded3331..e18883ce313a911e0c26fe8fedab3c688ca07c8b 100644
--- a/properties/tests/conf/crl-dir.ovpn
+++ b/properties/tests/conf/crl-dir.ovpn
@@ -16,7 +16,7 @@ ca keys/mg8.ca
 cert keys/clee.crt
 key keys/clee.key
 
-comp-lzo
+compress
 verb 3
 
 crl-verify /home/user/.cert/crls/ dir
\ No newline at end of file
diff --git a/properties/tests/conf/crl-file.ovpn b/properties/tests/conf/crl-file.ovpn
index 2054b217b32f0e15fdcc9263f211f888191487a8..e9175633f270be9546b1a24924264659c7439c0e 100644
--- a/properties/tests/conf/crl-file.ovpn
+++ b/properties/tests/conf/crl-file.ovpn
@@ -16,7 +16,7 @@ ca keys/mg8.ca
 cert keys/clee.crt
 key keys/clee.key
 
-comp-lzo
+compress
 verb 3
 
 crl-verify /home/user/.cert/crl.pem
\ No newline at end of file
diff --git a/properties/tests/conf/device-notype.ovpn b/properties/tests/conf/device-notype.ovpn
index 1236323a593e418310c93241fe9fe4d4285c6373..29b5180ff22d69729197c327eb099fecd45bae00 100644
--- a/properties/tests/conf/device-notype.ovpn
+++ b/properties/tests/conf/device-notype.ovpn
@@ -9,7 +9,7 @@ persist-key
 persist-tun
 user openvpn
 group openvpn
-comp-lzo
+compress
 tun-mtu 1500
 mssfix 1450
 auth-user-pass
diff --git a/properties/tests/conf/device.ovpn b/properties/tests/conf/device.ovpn
index ffc58981feb1f2ec4af81366961832ac9f0b48e6..5b556611776adfb8d061d2f153d8940a9f1a8d5d 100644
--- a/properties/tests/conf/device.ovpn
+++ b/properties/tests/conf/device.ovpn
@@ -10,7 +10,7 @@ persist-key
 persist-tun
 user openvpn
 group openvpn
-comp-lzo
+compress
 tun-mtu 1500
 mssfix 1450
 auth-user-pass
diff --git a/properties/tests/conf/keepalive.ovpn b/properties/tests/conf/keepalive.ovpn
index 5bd1ed28e53f53fa00bda66d99e278ef3300284d..d9b1f3296d51a502a8c0851359662dc943a74e6b 100644
--- a/properties/tests/conf/keepalive.ovpn
+++ b/properties/tests/conf/keepalive.ovpn
@@ -19,7 +19,7 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 3
 
 keepalive 10 30
diff --git a/properties/tests/conf/keysize.ovpn b/properties/tests/conf/keysize.ovpn
index 8d83d8955df0373876a99988c5c3f59ffa308104..152f0ef00264337e74f59ea225ae6de8ed1e3513 100644
--- a/properties/tests/conf/keysize.ovpn
+++ b/properties/tests/conf/keysize.ovpn
@@ -6,7 +6,7 @@ resolv-retry infinite
 nobind
 persist-key
 persist-tun
-comp-lzo
+compress
 tun-mtu 1500
 mssfix 1450
 auth-user-pass
diff --git a/properties/tests/conf/mtu-disc.ovpn b/properties/tests/conf/mtu-disc.ovpn
index 0370b11930e40677a749e11be0ab6e9702a01eb3..240df8722efe7d004bdb456e4aa09cb35b743842 100644
--- a/properties/tests/conf/mtu-disc.ovpn
+++ b/properties/tests/conf/mtu-disc.ovpn
@@ -10,7 +10,7 @@ persist-key
 persist-tun
 user openvpn
 group openvpn
-comp-lzo
+compress
 tun-mtu 1500
 mssfix 1450
 auth-user-pass
diff --git a/properties/tests/conf/ping-with-exit.ovpn b/properties/tests/conf/ping-with-exit.ovpn
index b34e02d01175dafc1eec1da473e9581bc8df7587..24bf9d467b829fe6ae856e139419193f8065be6c 100644
--- a/properties/tests/conf/ping-with-exit.ovpn
+++ b/properties/tests/conf/ping-with-exit.ovpn
@@ -19,7 +19,7 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 3
 
 ping 10
diff --git a/properties/tests/conf/ping-with-restart.ovpn b/properties/tests/conf/ping-with-restart.ovpn
index 7194cc1793c5b4162527b7aefcb47fe7df703830..aa96d1428e817cd9d573372b59b60831d4bab12a 100644
--- a/properties/tests/conf/ping-with-restart.ovpn
+++ b/properties/tests/conf/ping-with-restart.ovpn
@@ -19,7 +19,7 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 3
 
 ping 10
diff --git a/properties/tests/conf/pkcs12.ovpn b/properties/tests/conf/pkcs12.ovpn
index 12281b08fae4a7b5bcf439451b1c6b5b04e157b2..85421749601755af435ff12b73c2f81097ad0fa7 100644
--- a/properties/tests/conf/pkcs12.ovpn
+++ b/properties/tests/conf/pkcs12.ovpn
@@ -12,6 +12,6 @@ tls-client
 
 pkcs12 keys/mine.p12
 
-comp-lzo
+compress
 verb 3
 
diff --git a/properties/tests/conf/port.ovpn b/properties/tests/conf/port.ovpn
index 3fbbf5cc7a2a626af80103a30883092501f5a6ad..27eaf600d0aa856e32ff39085f4f4e22db1772a6 100644
--- a/properties/tests/conf/port.ovpn
+++ b/properties/tests/conf/port.ovpn
@@ -19,6 +19,6 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 3
 
diff --git a/properties/tests/conf/route.ovpn b/properties/tests/conf/route.ovpn
index 4c09c3d5c7b09fa623d8ff18c41ce356479c49b1..357941260e1bbed46a7c48ff027e703e6aa98f98 100644
--- a/properties/tests/conf/route.ovpn
+++ b/properties/tests/conf/route.ovpn
@@ -21,6 +21,6 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 3
 
diff --git a/properties/tests/conf/rport.ovpn b/properties/tests/conf/rport.ovpn
index 4d09b5ab9cd489ef615af0e2076411371a333bd7..e9f1f3e03be4560a52d846402d9ca79e84af0cbe 100644
--- a/properties/tests/conf/rport.ovpn
+++ b/properties/tests/conf/rport.ovpn
@@ -19,6 +19,6 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 3
 
diff --git a/properties/tests/conf/server-poll-timeout.ovpn b/properties/tests/conf/server-poll-timeout.ovpn
index fa705c8feb901c1b854f54cad147bffe1dc8109d..3a10c349ea8746a55baf21b319dced9a82272d77 100644
--- a/properties/tests/conf/server-poll-timeout.ovpn
+++ b/properties/tests/conf/server-poll-timeout.ovpn
@@ -20,6 +20,6 @@ key keys/clee.key
 tls-auth keys/46.key 1
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 4
 
diff --git a/properties/tests/conf/tls-inline.ovpn b/properties/tests/conf/tls-inline.ovpn
index 96cd4538f1ccf2c56f9bd548dd2b66068178c838..09b27612b93804f4f6551b37dc13f7ab5132db39 100644
--- a/properties/tests/conf/tls-inline.ovpn
+++ b/properties/tests/conf/tls-inline.ovpn
@@ -141,6 +141,6 @@ d4cebc0da588fed8ec73b9b9be86962d
 remote-cert-tls server
 tls-remote "/CN=myvpn.company.com"
 
-comp-lzo
+compress
 verb 3
 
diff --git a/properties/tests/conf/tls.ovpn b/properties/tests/conf/tls.ovpn
index 0e51a2227a75761999235f787a08514bd47fb30a..62bbe1fe9371b92e220b688c799f7074b8aade93 100644
--- a/properties/tests/conf/tls.ovpn
+++ b/properties/tests/conf/tls.ovpn
@@ -23,6 +23,6 @@ verify-x509-name "C=US, L=Cambridge, CN=GNOME, emailAddress=networkmanager-list@
 
 key-direction 1
 
-comp-lzo
+compress
 verb 3
 
diff --git a/properties/tests/conf/tls2.ovpn b/properties/tests/conf/tls2.ovpn
index af2145773ccf47a9c330dba8d3125caf2de9d83d..d1db6f0409b9aaf97026bdb11728570c25eaaaa9 100644
--- a/properties/tests/conf/tls2.ovpn
+++ b/properties/tests/conf/tls2.ovpn
@@ -21,6 +21,6 @@ remote-cert-tls server
 tls-remote "/CN=myvpn.company.com"
 verify-x509-name "C=US, L=Cambridge, CN=GNOME, emailAddress=networkmanager-list@gnome.org" subject
 
-comp-lzo
+compress
 verb 3
 
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 1938fba27e151cdd160550e8ed53a16dd6e12b71..6b72e8dabbb82e521319a2b463346b5312a5c8bd 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
- * Copyright (C) 2009 Dan Williams, <dcbw@redhat.com>
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +15,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
+ * Copyright (C) 2009 Dan Williams, <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -189,6 +190,7 @@ test_password_import (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, "0");
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "test.server.com:443");
@@ -303,7 +305,8 @@ test_tls_import (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE, NM_OPENVPN_CONTYPE_TLS);
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, NULL);
-	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, "adaptive");
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "173.8.149.245:1194");
@@ -369,7 +372,8 @@ test_tls_import_2 (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE, NM_OPENVPN_CONTYPE_TLS);
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, NULL);
-	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, "adaptive");
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "173.8.149.245:1194");
@@ -463,7 +467,8 @@ test_tls_inline_import (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE, NM_OPENVPN_CONTYPE_TLS);
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, NULL);
-	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, "adaptive");
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "173.8.149.245:1194");
@@ -521,7 +526,8 @@ test_pkcs12_import (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE, NM_OPENVPN_CONTYPE_TLS);
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, NULL);
-	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, "adaptive");
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "173.8.149.245:1194");
@@ -616,6 +622,7 @@ test_static_key_import (gconstpointer test_data)
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "10.11.12.13");
@@ -768,6 +775,7 @@ test_proxy_http_import (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, "0");
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "[aa:bb::1]:1194:udp");
@@ -847,6 +855,7 @@ test_proxy_http_with_auth_import (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, "0");
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "test.server.com:443");
@@ -890,6 +899,7 @@ test_proxy_socks_import (void)
 	_check_item (s_vpn, NM_OPENVPN_KEY_DEV, "tun");
 	_check_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, "yes");
 	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, NULL);
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_FLOAT, NULL);
 	_check_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, "0");
 	_check_item (s_vpn, NM_OPENVPN_KEY_REMOTE, "test.server.com:443");
@@ -1112,6 +1122,27 @@ test_route_import (void)
 	g_object_unref (connection);
 }
 
+static void
+test_compress_import (void)
+{
+	_CREATE_PLUGIN (plugin);
+	NMConnection *connection;
+	NMSettingVpn *s_vpn;
+
+	connection = get_basic_connection (plugin, SRCDIR, "compress.ovpn");
+	g_assert (connection);
+
+	/* VPN setting */
+	s_vpn = nm_connection_get_setting_vpn (connection);
+	g_assert (s_vpn);
+
+	/* Data items */
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, "adaptive");
+	_check_item (s_vpn, NM_OPENVPN_KEY_COMPRESS, "lzo");
+
+	g_object_unref (connection);
+}
+
 /*****************************************************************************/
 
 static void
@@ -1291,6 +1322,9 @@ int main (int argc, char **argv)
 	_add_test_func_simple (test_route_import);
 	_add_test_func ("route-export", test_export_compare, "route.ovpn", "route.ovpntest");
 
+	_add_test_func_simple (test_compress_import);
+	_add_test_func ("compress-export", test_export_compare, "compress.ovpn", "compress.ovpntest");
+
 	_add_test_func_simple (test_args_parse_line);
 
 	result = g_test_run ();
diff --git a/shared/nm-service-defines.h b/shared/nm-service-defines.h
index 9fb50a06fef72ab4e0377553ba4027b1f179dba2..80ce1e1e522aeb8c14b770c5d0982923a0a0c6ee 100644
--- a/shared/nm-service-defines.h
+++ b/shared/nm-service-defines.h
@@ -1,7 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
- * Copyright (C) 2005 - 2008 Tim Niemueller <tim@niemueller.de>
- * Copyright (C) 2005 - 2008 Dan Williams <dcbw@redhat.com>
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +15,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
+ * Copyright (C) 2005 - 2008 Tim Niemueller <tim@niemueller.de>
+ * Copyright (C) 2005 - 2008 Dan Williams <dcbw@redhat.com>
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #ifndef __NM_SERVICE_DEFINES_H__
@@ -33,6 +34,7 @@
 #define NM_OPENVPN_KEY_CERT "cert"
 #define NM_OPENVPN_KEY_CIPHER "cipher"
 #define NM_OPENVPN_KEY_COMP_LZO "comp-lzo"
+#define NM_OPENVPN_KEY_COMPRESS "compress"
 #define NM_OPENVPN_KEY_CONNECTION_TYPE "connection-type"
 #define NM_OPENVPN_KEY_CONNECT_TIMEOUT "connect-timeout"
 #define NM_OPENVPN_KEY_CRL_VERIFY_FILE "crl-verify-file"
diff --git a/shared/utils.c b/shared/utils.c
index 58d9089476806cac138077a80813c851d3632f2e..5d792024920bc7c7da7ef3e2899f69c144f67cf7 100644
--- a/shared/utils.c
+++ b/shared/utils.c
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
+ *
  * Dan Williams <dcbw@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 Red Hat, Inc.
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/shared/utils.h b/shared/utils.h
index b45916018f78b9d92414edf49e19276b71993a26..7fb8668087f2b85160f4ff542cf8675ce9413640 100644
--- a/shared/utils.h
+++ b/shared/utils.h
@@ -1,5 +1,6 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
+ *
  * Dan Williams <dcbw@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 Red Hat, Inc.
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #ifndef UTILS_H
@@ -30,6 +31,7 @@
 #define NMV_OVPN_TAG_CIPHER             "cipher"
 #define NMV_OVPN_TAG_CLIENT             "client"
 #define NMV_OVPN_TAG_COMP_LZO           "comp-lzo"
+#define NMV_OVPN_TAG_COMPRESS           "compress"
 #define NMV_OVPN_TAG_CONNECT_TIMEOUT    "connect-timeout"
 #define NMV_OVPN_TAG_CRL_VERIFY         "crl-verify"
 #define NMV_OVPN_TAG_DEV                "dev"
diff --git a/src/nm-openvpn-service-openvpn-helper.c b/src/nm-openvpn-service-openvpn-helper.c
index a3312575da9d1cec4f76fc74adf23a0072cee235..1e02cf78a7f40bc5c256f7a5243faee3c1adce45 100644
--- a/src/nm-openvpn-service-openvpn-helper.c
+++ b/src/nm-openvpn-service-openvpn-helper.c
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* nm-openvpn-service-openvpn-helper - helper called after OpenVPN established
- * a connection, uses DBUS to send information back to nm-openvpn-service
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * Tim Niemueller [www.niemueller.de]
  * Based on work by Dan Williams <dcbw@redhat.com>
@@ -19,10 +18,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2005 Red Hat, Inc.
- * (C) Copyright 2005 Tim Niemueller
- *
- * $Id: nm-openvpn-service-openvpn-helper.c 4170 2008-10-11 14:44:45Z dcbw $
+ * Copyright (C) 2005 Tim Niemueller
+ * Copyright (C) 2005 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 7a042586b00ae0e0fd8cbb9cf7bc9c31479cc0d3..9f0d73b0f3d17a57104fde7fa6320d9207172456 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -1,8 +1,5 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* nm-openvpn-service - openvpn integration with NetworkManager
- *
- * Copyright (C) 2005 - 2008 Tim Niemueller <tim@niemueller.de>
- * Copyright (C) 2005 - 2010 Dan Williams <dcbw@redhat.com>
+/*
+ * network-manager-openvpn - OpenVPN integration with NetworkManager
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +15,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * $Id: nm-openvpn-service.c 4232 2008-10-29 09:13:40Z tambeti $
- *
+ * Copyright (C) 2005 - 2008 Tim Niemueller <tim@niemueller.de>
+ * Copyright (C) 2005 - 2010 Dan Williams <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -146,6 +144,7 @@ static const ValidProperty valid_properties[] = {
 	{ NM_OPENVPN_KEY_CIPHER,               G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_KEYSIZE,              G_TYPE_INT, 1, 65535, FALSE },
 	{ NM_OPENVPN_KEY_COMP_LZO,             G_TYPE_STRING, 0, 0, FALSE },
+	{ NM_OPENVPN_KEY_COMPRESS,             G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_CONNECT_TIMEOUT,      G_TYPE_INT, 0, G_MAXINT, FALSE },
 	{ NM_OPENVPN_KEY_CONNECTION_TYPE,      G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_CRL_VERIFY_FILE,      G_TYPE_STRING, 0, 0, FALSE },
@@ -1331,6 +1330,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
 	GPid pid;
 	gboolean dev_type_is_tap;
 	const char *defport, *proto_tcp;
+	const char *compress;
 	const char *tls_remote = NULL;
 	const char *nm_openvpn_user, *nm_openvpn_group, *nm_openvpn_chroot;
 	gs_free char *bus_name = NULL;
@@ -1497,33 +1497,53 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
 		}
 	}
 
+	/* New (2.4+) compress option ("lz4", "lzo", ...) */
+	compress = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_COMPRESS);
+	/* Legacy option ("yes", "adaptive", "no", ...) */
 	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO);
-
-	/* openvpn understands 4 different modes for --comp-lzo, which have
-	 * different meaning:
-	 *  1) no --comp-lzo option
-	 *  2) --comp-lzo yes
-	 *  3) --comp-lzo [adaptive]
-	 *  4) --comp-lzo no
-	 *
-	 * In the past, nm-openvpn only supported 1) and 2) by having no
-	 * comp-lzo connection setting or "comp-lzo=yes", respectively.
-	 *
-	 * However, old plasma-nm would set "comp-lzo=no" in the connection
-	 * to mean 1). Thus, "comp-lzo=no" is spoiled to mean 4) in order
-	 * to preserve backward compatibily.
-	 * We use instead a special value "no-by-default" to express "no".
-	 *
-	 * See bgo#769177
-	 */
-	if (NM_IN_STRSET (tmp, "no")) {
-		/* means no --comp-lzo option. */
+	if (g_strcmp0 (tmp, "no") == 0) {
+		/*
+		 * Treat "no" as if the option was not present: old plasma-nm would
+		 * set "comp-lzo=no" in the connection if the option was not to be
+		 at all before we would treat it as an explicit disable.
+		 * To preserve backward compatibily, we instead used a special value
+		 * of "no-by-default" to express "no". See bgo#769177 (or not)
+		 */
 		tmp = NULL;
-	} else if (NM_IN_STRSET (tmp, "no-by-default"))
-		tmp = "no";
-
-	if (NM_IN_STRSET (tmp, "yes", "no", "adaptive"))
-		args_add_strv (args, "--comp-lzo", tmp);
+	}
+	if (compress && tmp) {
+		_LOGW ("ignoring the comp-lzo option as compress option is present");
+		tmp = NULL;
+	}
+	if (tmp) {
+		/* We only have the legacy option. Set the compression algorithm from it. */
+		if (strcmp (tmp, "yes") == 0) {
+			compress = "lzo";
+		} else if (strcmp (tmp, "no-by-default") == 0) {
+			compress = "no";
+		} else if (strcmp (tmp, "adaptive") == 0) {
+			compress = "yes";
+		}
+	}
+	if (openvpn_binary_detect_version_cached (openvpn_binary, &openvpn_binary_version) == OPENVPN_BINARY_VERSION_2_4_OR_NEWER) {
+		if (g_strcmp0 (compress, "yes") == 0)
+			g_ptr_array_add (args, "--compress");
+		else if (g_strcmp0 (compress, "no") != 0)
+			args_add_strv (args, "--compress", compress);
+	} else {
+		if (g_strcmp0 (compress, "yes") == 0)
+			args_add_strv (args, "--comp-lzo", "adaptive");
+		else if (g_strcmp0 (compress, "lzo") != 0)
+			args_add_strv (args, "--comp-lzo", "yes");
+		else if (g_strcmp0 (compress, "no") != 0)
+			args_add_strv (args, "--comp-lzo", "no");
+		else {
+			/* An option that has no --comp-lzo equivalent. Set the new one
+			 * and hope for the best. Perhaps the user is using some development
+			 * snapshot or something. */
+			args_add_strv (args, "--compress", compress);
+		}
+	}
 
 	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_FLOAT);
 	if (nm_streq0 (tmp, "yes"))

Places

File compress.patch of Package NetworkManager-openvpn (Revision a96771724dccb952002c47b95428a59f)

Places