libnm-core: add NMSettingVxlan

Add a new NMSettingVxlan which describes properties of VXLAN
connections.

10 files changed, 997 insertions, 0 deletions

diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core
index 8a81f00f10..df219295c4 100644
--- a/libnm-core/Makefile.libnm-core
+++ b/libnm-core/Makefile.libnm-core
@@ -38,6 +38,7 @@ libnm_core_headers =				\
 	$(core)/nm-setting-tun.h		\
 	$(core)/nm-setting-vlan.h		\
 	$(core)/nm-setting-vpn.h		\
+	$(core)/nm-setting-vxlan.h		\
 	$(core)/nm-setting-wimax.h		\
 	$(core)/nm-setting-wired.h		\
 	$(core)/nm-setting-wireless-security.h	\
@@ -97,6 +98,7 @@ libnm_core_sources =				\
 	$(core)/nm-setting-tun.c		\
 	$(core)/nm-setting-vlan.c		\
 	$(core)/nm-setting-vpn.c		\
+	$(core)/nm-setting-vxlan.c		\
 	$(core)/nm-setting-wimax.c		\
 	$(core)/nm-setting-wired.c		\
 	$(core)/nm-setting-wireless-security.c	\
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 73ff9e5558..3af8dfe9e0 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -2023,6 +2023,24 @@ nm_connection_get_setting_vpn (NMConnection *connection)
 }
 
 /**
+ * nm_connection_get_setting_vxlan:
+ * @connection: the #NMConnection
+ *
+ * A shortcut to return any #NMSettingVxlan the connection might contain.
+ *
+ * Returns: (transfer none): an #NMSettingVxlan if the connection contains one, otherwise %NULL
+ *
+ * Since: 1.2
+ **/
+NMSettingVxlan *
+nm_connection_get_setting_vxlan (NMConnection *connection)
+{
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+
+	return (NMSettingVxlan *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VXLAN);
+}
+
+/**
  * nm_connection_get_setting_wimax:
  * @connection: the #NMConnection
  *
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h
index 855fbc4c5b..21e30422c8 100644
--- a/libnm-core/nm-connection.h
+++ b/libnm-core/nm-connection.h
@@ -220,6 +220,8 @@ NMSettingWired *           nm_connection_get_setting_wired             (NMConnec
 NMSettingWireless *        nm_connection_get_setting_wireless          (NMConnection *connection);
 NMSettingWirelessSecurity *nm_connection_get_setting_wireless_security (NMConnection *connection);
 NMSettingVlan *            nm_connection_get_setting_vlan              (NMConnection *connection);
+NM_AVAILABLE_IN_1_2
+NMSettingVxlan *           nm_connection_get_setting_vxlan             (NMConnection *connection);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index f2c6c6c07e..3e1236b975 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -62,6 +62,7 @@
 #include "nm-setting-tun.h"
 #include "nm-setting-vlan.h"
 #include "nm-setting-vpn.h"
+#include "nm-setting-vxlan.h"
 #include "nm-setting-wimax.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless-security.h"
diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h
index 68a1ebc6e6..cd19923b7e 100644
--- a/libnm-core/nm-core-types.h
+++ b/libnm-core/nm-core-types.h
@@ -55,6 +55,7 @@ typedef struct _NMSettingTeamPort         NMSettingTeamPort;
 typedef struct _NMSettingTun              NMSettingTun;
 typedef struct _NMSettingVlan             NMSettingVlan;
 typedef struct _NMSettingVpn              NMSettingVpn;
+typedef struct _NMSettingVxlan            NMSettingVxlan;
 typedef struct _NMSettingWimax            NMSettingWimax;
 typedef struct _NMSettingWired            NMSettingWired;
 typedef struct _NMSettingWireless         NMSettingWireless;
diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c
new file mode 100644
index 0000000000..814623b735
--- /dev/null
+++ b/libnm-core/nm-setting-vxlan.c
@@ -0,0 +1,843 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2015 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "nm-setting-vxlan.h"
+#include "nm-utils.h"
+#include "nm-setting-private.h"
+
+/**
+ * SECTION:nm-setting-vxlan
+ * @short_description: Describes connection properties for VXLAN interfaces
+ *
+ * The #NMSettingVxlan object is a #NMSetting subclass that describes properties
+ * necessary for connection to VXLAN interfaces.
+ **/
+
+G_DEFINE_TYPE_WITH_CODE (NMSettingVxlan, nm_setting_vxlan, NM_TYPE_SETTING,
+                         _nm_register_setting (VXLAN, 1))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_VXLAN)
+
+#define NM_SETTING_VXLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VXLAN, NMSettingVxlanPrivate))
+
+typedef struct {
+	char *parent;
+	guint id;
+	char *local;
+	char *remote;
+	guint source_port_min;
+	guint source_port_max;
+	guint destination_port;
+	guint tos;
+	guint ttl;
+	guint ageing;
+	guint limit;
+	gboolean learning;
+	gboolean proxy;
+	gboolean rsc;
+	gboolean l2_miss;
+	gboolean l3_miss;
+} NMSettingVxlanPrivate;
+
+enum {
+	PROP_0,
+	PROP_PARENT,
+	PROP_ID,
+	PROP_LOCAL,
+	PROP_REMOTE,
+	PROP_SOURCE_PORT_MIN,
+	PROP_SOURCE_PORT_MAX,
+	PROP_DESTINATION_PORT,
+	PROP_TOS,
+	PROP_TTL,
+	PROP_AGEING,
+	PROP_LIMIT,
+	PROP_LEARNING,
+	PROP_PROXY,
+	PROP_RSC,
+	PROP_L2_MISS,
+	PROP_L3_MISS,
+
+	LAST_PROP
+};
+
+#define DST_PORT_DEFAULT   8472
+
+/**
+ * nm_setting_vxlan_new:
+ *
+ * Creates a new #NMSettingVxlan object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingVxlan object
+ *
+ * Since: 1.2
+ **/
+NMSetting *
+nm_setting_vxlan_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_VXLAN, NULL);
+}
+
+/**
+ * nm_setting_vxlan_get_parent:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:parent property of the setting
+ *
+ * Since: 1.2
+ **/
+const char *
+nm_setting_vxlan_get_parent (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), NULL);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->parent;
+}
+
+/**
+ * nm_setting_vxlan_get_id:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:id property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_id (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), 0);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->id;
+}
+
+/**
+ * nm_setting_vxlan_get_local:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:local property of the setting
+ *
+ * Since: 1.2
+ **/
+const char *
+nm_setting_vxlan_get_local (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), NULL);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->local;
+}
+
+/**
+ * nm_setting_vxlan_get_remote:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:remote property of the setting
+ *
+ * Since: 1.2
+ **/
+const char *
+nm_setting_vxlan_get_remote (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), NULL);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->remote;
+}
+
+/**
+ * nm_setting_vxlan_get_source_port_min:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:source-port-min property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_source_port_min (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), 0);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->source_port_min;
+}
+
+/**
+ * nm_setting_vxlan_get_source_port_max:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:source-port-max property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_source_port_max (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), 0);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->source_port_max;
+}
+
+/**
+ * nm_setting_vxlan_get_destination_port:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:destination-port property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_destination_port (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), DST_PORT_DEFAULT);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->destination_port;
+}
+
+/**
+ * nm_setting_vxlan_get_proxy:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:proxy property of the setting
+ *
+ * Since: 1.2
+ **/
+gboolean
+nm_setting_vxlan_get_proxy (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), FALSE);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->proxy;
+}
+
+/**
+ * nm_setting_vxlan_get_ageing:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:ageing property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_ageing (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), 0);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->ageing;
+}
+
+/**
+ * nm_setting_vxlan_get_limit:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:limit property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_limit (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), 0);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->limit;
+}
+
+/**
+ * nm_setting_vxlan_get_tos:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:tos property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_tos (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), 0);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->tos;
+}
+
+/**
+ * nm_setting_vxlan_get_ttl:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:ttl property of the setting
+ *
+ * Since: 1.2
+ **/
+guint
+nm_setting_vxlan_get_ttl (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), 0);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->ttl;
+}
+
+/**
+ * nm_setting_vxlan_get_learning:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:learning property of the setting
+ *
+ * Since: 1.2
+ **/
+gboolean
+nm_setting_vxlan_get_learning (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), FALSE);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->learning;
+}
+
+/**
+ * nm_setting_vxlan_get_rsc:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:rsc property of the setting
+ *
+ * Since: 1.2
+ **/
+gboolean
+nm_setting_vxlan_get_rsc (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), FALSE);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->rsc;
+}
+
+/**
+ * nm_setting_vxlan_get_l2_miss:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:l2_miss property of the setting
+ *
+ * Since: 1.2
+ **/
+gboolean
+nm_setting_vxlan_get_l2_miss (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), FALSE);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->l2_miss;
+}
+
+/**
+ * nm_setting_vxlan_get_l3_miss:
+ * @setting: the #NMSettingVxlan
+ *
+ * Returns: the #NMSettingVxlan:l3_miss property of the setting
+ *
+ * Since: 1.2
+ **/
+gboolean
+nm_setting_vxlan_get_l3_miss (NMSettingVxlan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VXLAN (setting), FALSE);
+	return NM_SETTING_VXLAN_GET_PRIVATE (setting)->l3_miss;
+}
+
+/*********************************************************************/
+
+static void
+nm_setting_vxlan_init (NMSettingVxlan *setting)
+{
+}
+
+static gboolean
+verify (NMSetting *setting, NMConnection *connection, GError **error)
+{
+	NMSettingVxlanPrivate *priv = NM_SETTING_VXLAN_GET_PRIVATE (setting);
+	int family = AF_UNSPEC;
+
+	if (!priv->remote) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_MISSING_PROPERTY,
+		                     _("property is missing"));
+		g_prefix_error (error, "%s.%s: ",
+		                NM_SETTING_VXLAN_SETTING_NAME,
+		                NM_SETTING_VXLAN_REMOTE);
+		return FALSE;
+	}
+
+	if (nm_utils_ipaddr_valid (AF_INET, priv->remote))
+		family = AF_INET;
+	else if (nm_utils_ipaddr_valid (AF_INET6, priv->remote))
+		family = AF_INET6;
+	else {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("'%s' is not a valid IP address"),
+		             priv->remote);
+		g_prefix_error (error, "%s.%s: ",
+		                NM_SETTING_VXLAN_SETTING_NAME,
+		                NM_SETTING_VXLAN_REMOTE);
+		return FALSE;
+	}
+
+	if (priv->local) {
+		if (!nm_utils_ipaddr_valid (family, priv->local)) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("'%s' is not a valid IP%c address"),
+			             priv->local, family == AF_INET ? '4' : '6');
+			g_prefix_error (error, "%s.%s: ",
+			                NM_SETTING_VXLAN_SETTING_NAME,
+			                NM_SETTING_VXLAN_LOCAL);
+			return FALSE;
+		}
+	}
+
+	if (   priv->parent
+	    && !nm_utils_iface_valid_name (priv->parent)
+	    && !nm_utils_is_uuid (priv->parent)) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("'%s' is neither an UUID nor an interface name"),
+		             priv->parent);
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_VXLAN_SETTING_NAME,
+		                NM_SETTING_VXLAN_PARENT);
+		return FALSE;
+	}
+
+	if (   (priv->source_port_min || priv->source_port_max)
+	    && (priv->source_port_min > priv->source_port_max)) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("%d is greater than local port max %d"),
+		             priv->source_port_min,
+		             priv->source_port_max);
+		g_prefix_error (error, "%s.%s: ",
+		                NM_SETTING_VXLAN_SETTING_NAME,
+		                NM_SETTING_VXLAN_SOURCE_PORT_MIN);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingVxlan *setting = NM_SETTING_VXLAN (object);
+	NMSettingVxlanPrivate *priv = NM_SETTING_VXLAN_GET_PRIVATE (setting);
+
+	switch (prop_id) {
+	case PROP_PARENT:
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
+		break;
+	case PROP_ID:
+		priv->id = g_value_get_uint (value);
+		break;
+	case PROP_LOCAL:
+		g_free (priv->local);
+		priv->local = g_value_dup_string (value);
+		break;
+	case PROP_REMOTE:
+		g_free (priv->remote);
+		priv->remote = g_value_dup_string (value);
+		break;
+	case PROP_SOURCE_PORT_MIN:
+		priv->source_port_min = g_value_get_uint (value);
+		break;
+	case PROP_SOURCE_PORT_MAX:
+		priv->source_port_max = g_value_get_uint (value);
+		break;
+	case PROP_DESTINATION_PORT:
+		priv->destination_port = g_value_get_uint (value);
+		break;
+	case PROP_TOS:
+		priv->tos = g_value_get_uint (value);
+		break;
+	case PROP_AGEING:
+		priv->ageing = g_value_get_uint (value);
+		break;
+	case PROP_LIMIT:
+		priv->limit = g_value_get_uint (value);
+		break;
+	case PROP_PROXY:
+		priv->proxy = g_value_get_boolean (value);
+		break;
+	case PROP_TTL:
+		priv->ttl = g_value_get_uint (value);
+		break;
+	case PROP_LEARNING:
+		priv->learning = g_value_get_boolean (value);
+		break;
+	case PROP_RSC:
+		priv->rsc = g_value_get_boolean (value);
+		break;
+	case PROP_L2_MISS:
+		priv->l2_miss = g_value_get_boolean (value);
+		break;
+	case PROP_L3_MISS:
+		priv->l3_miss = g_value_get_boolean (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingVxlan *setting = NM_SETTING_VXLAN (object);
+	NMSettingVxlanPrivate *priv = NM_SETTING_VXLAN_GET_PRIVATE (setting);
+
+	switch (prop_id) {
+	case PROP_PARENT:
+		g_value_set_string (value, priv->parent);
+		break;
+	case PROP_ID:
+		g_value_set_uint (value, priv->id);
+		break;
+	case PROP_LOCAL:
+		g_value_set_string (value, priv->local);
+		break;
+	case PROP_REMOTE:
+		g_value_set_string (value, priv->remote);
+		break;
+	case PROP_SOURCE_PORT_MIN:
+		g_value_set_uint (value, priv->source_port_min);
+		break;
+	case PROP_SOURCE_PORT_MAX:
+		g_value_set_uint (value, priv->source_port_max);
+		break;
+	case PROP_DESTINATION_PORT:
+		g_value_set_uint (value, priv->destination_port);
+		break;
+	case PROP_TOS:
+		g_value_set_uint (value, priv->tos);
+		break;
+	case PROP_AGEING:
+		g_value_set_uint (value, priv->ageing);
+		break;
+	case PROP_LIMIT:
+		g_value_set_uint (value, priv->limit);
+		break;
+	case PROP_PROXY:
+		g_value_set_boolean (value, priv->proxy);
+		break;
+	case PROP_TTL:
+		g_value_set_uint (value, priv->ttl);
+		break;
+	case PROP_LEARNING:
+		g_value_set_boolean (value, priv->learning);
+		break;
+	case PROP_RSC:
+		g_value_set_boolean (value, priv->rsc);
+		break;
+	case PROP_L2_MISS:
+		g_value_set_boolean (value, priv->l2_miss);
+		break;
+	case PROP_L3_MISS:
+		g_value_set_boolean (value, priv->l3_miss);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingVxlan *setting = NM_SETTING_VXLAN (object);
+	NMSettingVxlanPrivate *priv = NM_SETTING_VXLAN_GET_PRIVATE (setting);
+
+	g_free (priv->parent);
+	g_free (priv->local);
+	g_free (priv->remote);
+
+	G_OBJECT_CLASS (nm_setting_vxlan_parent_class)->finalize (object);
+}
+
+static void
+nm_setting_vxlan_class_init (NMSettingVxlanClass *setting_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
+	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
+
+	g_type_class_add_private (setting_class, sizeof (NMSettingVxlanPrivate));
+
+	/* virtual methods */
+	object_class->set_property = set_property;
+	object_class->get_property = get_property;
+	object_class->finalize     = finalize;
+	parent_class->verify       = verify;
+
+	/* Properties */
+
+	/**
+	 * NMSettingVxlan:parent:
+	 *
+	 * If given, specifies the parent interface name or parent connection UUID.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_PARENT,
+		 g_param_spec_string (NM_SETTING_VXLAN_PARENT, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      G_PARAM_CONSTRUCT |
+		                      NM_SETTING_PARAM_INFERRABLE |
+		                      G_PARAM_STATIC_STRINGS));
+	/**
+	 * NMSettingVxlan:id:
+	 *
+	 * Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to
+	 * use.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_ID,
+		 g_param_spec_uint (NM_SETTING_VXLAN_ID, "", "",
+		                    0, (1 << 24) - 1, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:local:
+	 *
+	 * If given, specifies the source IP address to use in outgoing packets.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_LOCAL,
+		 g_param_spec_string (NM_SETTING_VXLAN_LOCAL, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      G_PARAM_CONSTRUCT |
+		                      NM_SETTING_PARAM_INFERRABLE |
+		                      G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:remote:
+	 *
+	 * Specifies the unicast destination IP address to use in outgoing packets
+	 * when the destination link layer address is not known in the VXLAN device
+	 * forwarding database, or the multicast IP address to join.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_REMOTE,
+		 g_param_spec_string (NM_SETTING_VXLAN_REMOTE, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      G_PARAM_CONSTRUCT |
+		                      NM_SETTING_PARAM_INFERRABLE |
+		                      G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:source-port-min:
+	 *
+	 * Specifies the minimum UDP source port to communicate to the remote VXLAN
+	 * tunnel endpoint.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_SOURCE_PORT_MIN,
+		 g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MIN, "", "",
+		                    0, G_MAXUINT16, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:source-port-max:
+	 *
+	 * Specifies the maximum UDP source port to communicate to the remote VXLAN
+	 * tunnel endpoint.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_SOURCE_PORT_MAX,
+		 g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MAX, "", "",
+		                    0, G_MAXUINT16, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:destination-port:
+	 *
+	 * Specifies the UDP destination port to communicate to the remote VXLAN
+	 * tunnel endpoint.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_DESTINATION_PORT,
+		 g_param_spec_uint (NM_SETTING_VXLAN_DESTINATION_PORT, "", "",
+		                    0, G_MAXUINT16, DST_PORT_DEFAULT,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:ageing:
+	 *
+	 * Specifies the lifetime in seconds of FDB entries learnt by the kernel.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_AGEING,
+		 g_param_spec_uint (NM_SETTING_VXLAN_AGEING, "", "",
+		                    0, G_MAXINT32, 300,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:limit:
+	 *
+	 * Specifies the maximum number of FDB entries. A value of zero means that
+	 * the kernel will store unlimited entries.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_AGEING,
+		 g_param_spec_uint (NM_SETTING_VXLAN_LIMIT, "", "",
+		                    0, G_MAXINT32, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:tos:
+	 *
+	 * Specifies the TOS value to use in outgoing packets.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_TOS,
+		 g_param_spec_uint (NM_SETTING_VXLAN_TOS, "", "",
+		                    0, 255, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:ttl:
+	 *
+	 * Specifies the time-to-live value to use in outgoing packets.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_TTL,
+		 g_param_spec_uint (NM_SETTING_VXLAN_TTL, "", "",
+		                    0, 255, 0,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_INFERRABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:proxy:
+	 *
+	 * Specifies whether ARP proxy is turned on.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_PROXY,
+		 g_param_spec_boolean (NM_SETTING_VXLAN_PROXY, "", "",
+		                       FALSE,
+		                       G_PARAM_READWRITE |
+		                       G_PARAM_CONSTRUCT |
+		                       NM_SETTING_PARAM_INFERRABLE |
+		                       G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:learning:
+	 *
+	 * Specifies whether unknown source link layer addresses and IP addresses
+	 * are entered into the VXLAN device forwarding database.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_LEARNING,
+		 g_param_spec_boolean (NM_SETTING_VXLAN_LEARNING, "", "",
+		                       TRUE,
+		                       G_PARAM_READWRITE |
+		                       G_PARAM_CONSTRUCT |
+		                       NM_SETTING_PARAM_INFERRABLE |
+		                       G_PARAM_STATIC_STRINGS));
+	/**
+	 * NMSettingVxlan:rsc:
+	 *
+	 * Specifies whether route short circuit is turned on.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_RSC,
+		 g_param_spec_boolean (NM_SETTING_VXLAN_RSC, "", "",
+		                       FALSE,
+		                       G_PARAM_READWRITE |
+		                       G_PARAM_CONSTRUCT |
+		                       NM_SETTING_PARAM_INFERRABLE |
+		                       G_PARAM_STATIC_STRINGS));
+	/**
+	 * NMSettingVxlan:l2-miss:
+	 *
+	 * Specifies whether netlink LL ADDR miss notifications are generated.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_L2_MISS,
+		 g_param_spec_boolean (NM_SETTING_VXLAN_L2_MISS, "", "",
+		                       FALSE,
+		                       G_PARAM_READWRITE |
+		                       G_PARAM_CONSTRUCT |
+		                       NM_SETTING_PARAM_INFERRABLE |
+		                       G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMSettingVxlan:l3-miss:
+	 *
+	 * Specifies whether netlink IP ADDR miss notifications are generated.
+	 *
+	 * Since: 1.2
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_L3_MISS,
+		 g_param_spec_boolean (NM_SETTING_VXLAN_L3_MISS, "", "",
+		                       FALSE,
+		                       G_PARAM_READWRITE |
+		                       G_PARAM_CONSTRUCT |
+		                       NM_SETTING_PARAM_INFERRABLE |
+		                       G_PARAM_STATIC_STRINGS));
+}
diff --git a/libnm-core/nm-setting-vxlan.h b/libnm-core/nm-setting-vxlan.h
new file mode 100644
index 0000000000..c410338eeb
--- /dev/null
+++ b/libnm-core/nm-setting-vxlan.h
@@ -0,0 +1,109 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2015 Red Hat, Inc.
+ */
+
+#ifndef __NM_SETTING_VXLAN_H__
+#define __NM_SETTING_VXLAN_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only <NetworkManager.h> can be included directly."
+#endif
+
+#include "nm-setting.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SETTING_VXLAN            (nm_setting_vxlan_get_type ())
+#define NM_SETTING_VXLAN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VXLAN, NMSettingVxlan))
+#define NM_SETTING_VXLAN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VXLANCONFIG, NMSettingVxlanClass))
+#define NM_IS_SETTING_VXLAN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_VXLAN))
+#define NM_IS_SETTING_VXLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_VXLAN))
+#define NM_SETTING_VXLAN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VXLAN, NMSettingVxlanClass))
+
+#define NM_SETTING_VXLAN_SETTING_NAME       "vxlan"
+
+#define NM_SETTING_VXLAN_PARENT             "parent"
+#define NM_SETTING_VXLAN_ID                 "id"
+#define NM_SETTING_VXLAN_LOCAL              "local"
+#define NM_SETTING_VXLAN_REMOTE             "remote"
+#define NM_SETTING_VXLAN_SOURCE_PORT_MIN    "source-port-min"
+#define NM_SETTING_VXLAN_SOURCE_PORT_MAX    "source-port-max"
+#define NM_SETTING_VXLAN_DESTINATION_PORT   "destination-port"
+#define NM_SETTING_VXLAN_TOS                "tos"
+#define NM_SETTING_VXLAN_TTL                "ttl"
+#define NM_SETTING_VXLAN_AGEING             "ageing"
+#define NM_SETTING_VXLAN_LIMIT              "limit"
+#define NM_SETTING_VXLAN_PROXY              "proxy"
+#define NM_SETTING_VXLAN_LEARNING           "learning"
+#define NM_SETTING_VXLAN_RSC                "rsc"
+#define NM_SETTING_VXLAN_L2_MISS            "l2-miss"
+#define NM_SETTING_VXLAN_L3_MISS            "l3-miss"
+
+struct _NMSettingVxlan {
+	NMSetting parent;
+};
+
+typedef struct {
+	NMSettingClass parent;
+
+	/*< private >*/
+	gpointer padding[4];
+} NMSettingVxlanClass;
+
+NM_AVAILABLE_IN_1_2
+GType       nm_setting_vxlan_get_type             (void);
+NM_AVAILABLE_IN_1_2
+NMSetting  *nm_setting_vxlan_new                  (void);
+NM_AVAILABLE_IN_1_2
+const char *nm_setting_vxlan_get_parent           (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_id               (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+const char *nm_setting_vxlan_get_local            (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+const char *nm_setting_vxlan_get_remote           (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_source_port_min  (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_source_port_max  (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_destination_port (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_tos              (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_ttl              (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_ageing           (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+guint       nm_setting_vxlan_get_limit            (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+gboolean    nm_setting_vxlan_get_proxy            (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+gboolean    nm_setting_vxlan_get_learning         (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+gboolean    nm_setting_vxlan_get_rsc              (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+gboolean    nm_setting_vxlan_get_l2_miss          (NMSettingVxlan *setting);
+NM_AVAILABLE_IN_1_2
+gboolean    nm_setting_vxlan_get_l3_miss          (NMSettingVxlan *setting);
+
+G_END_DECLS
+
+#endif /* __NM_SETTING_VXLAN_H__ */
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 51a703ed0e..35cd07aeca 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -74,6 +74,7 @@
 #include <nm-setting-tun.h>
 #include <nm-setting-vlan.h>
 #include <nm-setting-vpn.h>
+#include <nm-setting-vxlan.h>
 #include <nm-setting-wimax.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless-security.h>
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 140c5004df..70ae0d2b7b 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -860,6 +860,7 @@ global:
 	nm_access_point_get_last_seen;
 	nm_connection_get_setting_ip_tunnel;
 	nm_connection_get_setting_macvlan;
+	nm_connection_get_setting_vxlan;
 	nm_connection_verify_secrets;
 	nm_device_ethernet_get_s390_subchannels;
 	nm_client_get_all_devices;
@@ -958,6 +959,24 @@ global:
 	nm_setting_macvlan_get_type;
 	nm_setting_macvlan_mode_get_type;
 	nm_setting_macvlan_new;
+	nm_setting_vxlan_get_ageing;
+	nm_setting_vxlan_get_destination_port;
+	nm_setting_vxlan_get_id;
+	nm_setting_vxlan_get_l2_miss;
+	nm_setting_vxlan_get_l3_miss;
+	nm_setting_vxlan_get_learning;
+	nm_setting_vxlan_get_limit;
+	nm_setting_vxlan_get_local;
+	nm_setting_vxlan_get_parent;
+	nm_setting_vxlan_get_proxy;
+	nm_setting_vxlan_get_remote;
+	nm_setting_vxlan_get_rsc;
+	nm_setting_vxlan_get_source_port_max;
+	nm_setting_vxlan_get_source_port_min;
+	nm_setting_vxlan_get_tos;
+	nm_setting_vxlan_get_ttl;
+	nm_setting_vxlan_get_type;
+	nm_setting_vxlan_new;
 	nm_setting_wired_get_wake_on_lan;
 	nm_setting_wired_get_wake_on_lan_password;
 	nm_setting_wired_wake_on_lan_get_type;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2d1afcc3c6..f3d20c0c71 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -75,6 +75,7 @@ libnm-core/nm-setting-team-port.c
 libnm-core/nm-setting-tun.c
 libnm-core/nm-setting-vlan.c
 libnm-core/nm-setting-vpn.c
+libnm-core/nm-setting-vxlan.c
 libnm-core/nm-setting-wimax.c
 libnm-core/nm-setting-wired.c
 libnm-core/nm-setting-wireless-security.c