libnm: add NMDeviceMacvlanbg/create-sw-devices-bgo749369-macvlan

7 files changed, 337 insertions, 0 deletions

diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index a08bd80088..2e25dbe564 100644
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -38,6 +38,7 @@ libnminclude_hfiles =			\
 	nm-device-ethernet.h		\
 	nm-device-generic.h		\
 	nm-device-infiniband.h		\
+	nm-device-macvlan.h		\
 	nm-device-modem.h		\
 	nm-device-olpc-mesh.h		\
 	nm-device-team.h		\
@@ -89,6 +90,7 @@ libnm_la_csources =			\
 	nm-device-ethernet.c		\
 	nm-device-generic.c		\
 	nm-device-infiniband.c		\
+	nm-device-macvlan.c		\
 	nm-device-modem.c		\
 	nm-device-olpc-mesh.c		\
 	nm-device-team.c		\
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index ab2c1ed45e..6d84749981 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -862,6 +862,10 @@ global:
 	nm_device_get_metered;
 	nm_device_get_nm_plugin_missing;
 	nm_device_set_managed;
+	nm_device_macvlan_get_hw_address;
+	nm_device_macvlan_get_mode;
+	nm_device_macvlan_get_parent;
+	nm_device_macvlan_get_type;
 	nm_device_wifi_request_scan_options;
 	nm_device_wifi_request_scan_options_async;
 	nm_metered_get_type;
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c
new file mode 100644
index 0000000000..b7a64eecef
--- /dev/null
+++ b/libnm/nm-device-macvlan.c
@@ -0,0 +1,264 @@
+/* -*- 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 <string.h>
+
+#include <nm-setting-connection.h>
+#include <nm-setting-macvlan.h>
+#include <nm-setting-wired.h>
+#include <nm-utils.h>
+
+#include "nm-default.h"
+#include "nm-device-macvlan.h"
+#include "nm-device-private.h"
+#include "nm-object-private.h"
+
+G_DEFINE_TYPE (NMDeviceMacvlan, nm_device_macvlan, NM_TYPE_DEVICE)
+
+#define NM_DEVICE_MACVLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanPrivate))
+
+typedef struct {
+	NMDevice *parent;
+	char *mode;
+	char *hw_address;
+} NMDeviceMacvlanPrivate;
+
+enum {
+	PROP_0,
+	PROP_PARENT,
+	PROP_MODE,
+	PROP_HW_ADDRESS,
+
+	LAST_PROP
+};
+
+/**
+ * nm_device_macvlan_get_parent:
+ * @device: a #NMDeviceMacvlan
+ *
+ * Returns: (transfer none): the device's parent device
+ **/
+NMDevice *
+nm_device_macvlan_get_parent (NMDeviceMacvlan *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), FALSE);
+
+	return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->parent;
+}
+
+/**
+ * nm_device_macvlan_get_mode:
+ * @device: a #NMDeviceMacvlan
+ *
+ * Gets the MAC-VLAN mode of the device.
+ *
+ * Returns: the MAC-VLAN mode.
+ **/
+const char *
+nm_device_macvlan_get_mode (NMDeviceMacvlan *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), NULL);
+
+	return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->mode;
+}
+
+/**
+ * nm_device_macvlan_get_hw_address:
+ * @device: a #NMDeviceMacvlan
+ *
+ * Gets the hardware (MAC) address of the #NMDeviceMacvlan
+ *
+ * Returns: the hardware address. This is the internal string used by the
+ * device, and must not be modified.
+ **/
+const char *
+nm_device_macvlan_get_hw_address (NMDeviceMacvlan *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), NULL);
+
+	return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->hw_address;
+}
+
+static gboolean
+connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+{
+	NMSettingWired *s_wired;
+	const char *setting_hwaddr;
+
+	if (!NM_DEVICE_CLASS (nm_device_macvlan_parent_class)->connection_compatible (device, connection, error))
+		return FALSE;
+
+	if (!nm_connection_is_type (connection, NM_SETTING_MACVLAN_SETTING_NAME)) {
+		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+		                     _("The connection was not a MAC-VLAN connection."));
+		return FALSE;
+	}
+
+	s_wired = nm_connection_get_setting_wired (connection);
+	if (s_wired)
+		setting_hwaddr = nm_setting_wired_get_mac_address (s_wired);
+	else
+		setting_hwaddr = NULL;
+	if (setting_hwaddr) {
+		if (!nm_utils_hwaddr_matches (setting_hwaddr, -1,
+		                              NM_DEVICE_MACVLAN_GET_PRIVATE (device)->hw_address, -1)) {
+			g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+			                     _("The hardware address of the device and the connection didn't match."));
+		}
+	}
+
+	return TRUE;
+}
+
+static const char *
+get_hw_address (NMDevice *device)
+{
+	return nm_device_macvlan_get_hw_address (NM_DEVICE_MACVLAN (device));
+}
+
+static GType
+get_setting_type (NMDevice *device)
+{
+	return NM_TYPE_SETTING_MACVLAN;
+}
+
+/***********************************************************/
+
+static void
+nm_device_macvlan_init (NMDeviceMacvlan *device)
+{
+	_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_MACVLAN);
+}
+
+static void
+init_dbus (NMObject *object)
+{
+	NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE (object);
+	const NMPropertiesInfo property_info[] = {
+		{ NM_DEVICE_MACVLAN_PARENT,      &priv->parent, NULL, NM_TYPE_DEVICE },
+		{ NM_DEVICE_MACVLAN_MODE,        &priv->mode },
+		{ NM_DEVICE_MACVLAN_HW_ADDRESS,  &priv->hw_address },
+		{ NULL },
+	};
+
+	NM_OBJECT_CLASS (nm_device_macvlan_parent_class)->init_dbus (object);
+
+	_nm_object_register_properties (object,
+	                                NM_DBUS_INTERFACE_DEVICE_MACVLAN,
+	                                property_info);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE (object);
+
+	g_free (priv->mode);
+	g_free (priv->hw_address);
+	g_clear_object (&priv->parent);
+
+	G_OBJECT_CLASS (nm_device_macvlan_parent_class)->finalize (object);
+}
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+              GValue *value,
+              GParamSpec *pspec)
+{
+	NMDeviceMacvlan *device = NM_DEVICE_MACVLAN (object);
+
+	switch (prop_id) {
+	case PROP_PARENT:
+		g_value_set_object (value, nm_device_macvlan_get_parent (device));
+		break;
+	case PROP_MODE:
+		g_value_set_string (value, nm_device_macvlan_get_mode (device));
+		break;
+	case PROP_HW_ADDRESS:
+		g_value_set_string (value, nm_device_macvlan_get_hw_address (device));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+nm_device_macvlan_class_init (NMDeviceMacvlanClass *gre_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (gre_class);
+	NMObjectClass *nm_object_class = NM_OBJECT_CLASS (gre_class);
+	NMDeviceClass *device_class = NM_DEVICE_CLASS (gre_class);
+
+	g_type_class_add_private (gre_class, sizeof (NMDeviceMacvlanPrivate));
+
+	_nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_DEVICE_MACVLAN);
+
+	/* virtual methods */
+	object_class->finalize = finalize;
+	object_class->get_property = get_property;
+
+	nm_object_class->init_dbus = init_dbus;
+
+	device_class->connection_compatible = connection_compatible;
+	device_class->get_setting_type = get_setting_type;
+	device_class->get_hw_address = get_hw_address;
+
+	/* properties */
+
+	/**
+	 * NMDeviceMacvlan:parent:
+	 *
+	 * The devices's parent device.
+	 **/
+	g_object_class_install_property
+	    (object_class, PROP_PARENT,
+	     g_param_spec_object (NM_DEVICE_MACVLAN_PARENT, "", "",
+	                          NM_TYPE_DEVICE,
+	                          G_PARAM_READABLE |
+	                          G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMDeviceMacvlan:mode:
+	 *
+	 * The MAC-VLAN mode.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_MODE,
+		 g_param_spec_string (NM_DEVICE_MACVLAN_MODE, "", "",
+		                      NULL,
+		                      G_PARAM_READABLE |
+		                      G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMDeviceMacvlan:hw-address:
+	 *
+	 * The hardware (MAC) address of the device.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_HW_ADDRESS,
+		 g_param_spec_string (NM_DEVICE_MACVLAN_HW_ADDRESS, "", "",
+		                      NULL,
+		                      G_PARAM_READABLE |
+		                      G_PARAM_STATIC_STRINGS));
+}
diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h
new file mode 100644
index 0000000000..d7168bc9e1
--- /dev/null
+++ b/libnm/nm-device-macvlan.h
@@ -0,0 +1,62 @@
+/* -*- 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_DEVICE_MACVLAN_H__
+#define __NM_DEVICE_MACVLAN_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+#error "Only <NetworkManager.h> can be included directly."
+#endif
+
+#include <nm-device.h>
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DEVICE_MACVLAN            (nm_device_macvlan_get_type ())
+#define NM_DEVICE_MACVLAN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlan))
+#define NM_DEVICE_MACVLAN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanClass))
+#define NM_IS_DEVICE_MACVLAN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_MACVLAN))
+#define NM_IS_DEVICE_MACVLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_MACVLAN))
+#define NM_DEVICE_MACVLAN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_MACVLAN, NMDeviceMacvlanClass))
+
+#define NM_DEVICE_MACVLAN_PARENT      "parent"
+#define NM_DEVICE_MACVLAN_MODE        "mode"
+#define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
+
+struct _NMDeviceMacvlan {
+	NMDevice parent;
+};
+
+typedef struct {
+	NMDeviceClass parent;
+
+	/*< private >*/
+	gpointer padding[4];
+} NMDeviceMacvlanClass;
+
+GType nm_device_macvlan_get_type (void);
+
+NMDevice *   nm_device_macvlan_get_parent      (NMDeviceMacvlan *device);
+const char * nm_device_macvlan_get_mode        (NMDeviceMacvlan *device);
+const char * nm_device_macvlan_get_hw_address  (NMDeviceMacvlan *device);
+
+G_END_DECLS
+
+#endif /* __NM_DEVICE_MACVLAN_H__ */
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 725762de61..a8c7a631fa 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -41,6 +41,7 @@
 #include "nm-device-bridge.h"
 #include "nm-device-vlan.h"
 #include "nm-device-generic.h"
+#include "nm-device-macvlan.h"
 #include "nm-device.h"
 #include "nm-device-private.h"
 #include "nm-dhcp4-config.h"
@@ -318,6 +319,8 @@ _nm_device_gtype_from_dtype (NMDeviceType dtype)
 		return NM_TYPE_DEVICE_VLAN;
 	case NM_DEVICE_TYPE_GENERIC:
 		return NM_TYPE_DEVICE_GENERIC;
+	case NM_DEVICE_TYPE_MACVLAN:
+		return NM_TYPE_DEVICE_MACVLAN;
 	default:
 		g_warning ("Unknown device type %d", dtype);
 		return G_TYPE_INVALID;
diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index ee1ed643eb..ce64c9f9a0 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -37,6 +37,7 @@ typedef struct _NMDeviceBt          NMDeviceBt;
 typedef struct _NMDeviceEthernet    NMDeviceEthernet;
 typedef struct _NMDeviceGeneric     NMDeviceGeneric;
 typedef struct _NMDeviceInfiniband  NMDeviceInfiniband;
+typedef struct _NMDeviceMacvlan     NMDeviceMacvlan;
 typedef struct _NMDeviceModem       NMDeviceModem;
 typedef struct _NMDeviceOlpcMesh    NMDeviceOlpcMesh;
 typedef struct _NMDeviceTeam        NMDeviceTeam;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7cbd3e49e0..000db4f80c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -117,6 +117,7 @@ libnm/nm-device-bridge.c
 libnm/nm-device-bt.c
 libnm/nm-device-ethernet.c
 libnm/nm-device-generic.c
+libnm/nm-device-macvlan.c
 libnm/nm-device-infiniband.c
 libnm/nm-device-modem.c
 libnm/nm-device-olpc-mesh.c