libnm: add NMDeviceMacvlan
authorBeniamino Galvani <bgalvani@redhat.com>
Wed, 9 Dec 2015 10:51:43 +0000 (11:51 +0100)
committerBeniamino Galvani <bgalvani@redhat.com>
Wed, 9 Dec 2015 13:30:08 +0000 (14:30 +0100)
libnm/Makefile.am
libnm/libnm.ver
libnm/nm-device-macvlan.c [new file with mode: 0644]
libnm/nm-device-macvlan.h [new file with mode: 0644]
libnm/nm-device.c
libnm/nm-types.h
po/POTFILES.in

index 4ce9655..d1e8d12 100644 (file)
@@ -39,6 +39,7 @@ libnminclude_hfiles =                 \
        nm-device-generic.h             \
        nm-device-infiniband.h          \
        nm-device-ip-tunnel.h           \
+       nm-device-macvlan.h             \
        nm-device-modem.h               \
        nm-device-olpc-mesh.h           \
        nm-device-team.h                \
@@ -92,6 +93,7 @@ libnm_la_csources =                   \
        nm-device-generic.c             \
        nm-device-infiniband.c          \
        nm-device-ip-tunnel.c           \
+       nm-device-macvlan.c             \
        nm-device-modem.c               \
        nm-device-olpc-mesh.c           \
        nm-device-team.c                \
index 66747d1..140c500 100644 (file)
@@ -877,6 +877,12 @@ global:
        nm_device_ip_tunnel_get_tos;
        nm_device_ip_tunnel_get_ttl;
        nm_device_ip_tunnel_get_type;
+       nm_device_macvlan_get_hw_address;
+       nm_device_macvlan_get_mode;
+       nm_device_macvlan_get_no_promisc;
+       nm_device_macvlan_get_parent;
+       nm_device_macvlan_get_tap;
+       nm_device_macvlan_get_type;
        nm_device_get_nm_plugin_missing;
        nm_device_is_real;
        nm_device_set_managed;
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c
new file mode 100644 (file)
index 0000000..3b4bfd3
--- /dev/null
@@ -0,0 +1,347 @@
+/* -*- 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;
+       gboolean no_promisc;
+       gboolean tap;
+       char *hw_address;
+} NMDeviceMacvlanPrivate;
+
+enum {
+       PROP_0,
+       PROP_PARENT,
+       PROP_MODE,
+       PROP_NO_PROMISC,
+       PROP_TAP,
+       PROP_HW_ADDRESS,
+
+       LAST_PROP
+};
+
+/**
+ * nm_device_macvlan_get_parent:
+ * @device: a #NMDeviceMacvlan
+ *
+ * Returns: (transfer none): the device's parent device
+ *
+ * Since: 1.2
+ **/
+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 MACVLAN mode of the device.
+ *
+ * Returns: the MACVLAN mode. This is the internal string used by the
+ * device, and must not be modified.
+ *
+ * Since: 1.2
+ **/
+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_no_promisc
+ * @device: a #NMDeviceMacvlan
+ *
+ * Gets the no-promiscuous flag of the device.
+ *
+ * Returns: the no-promiscuous flag of the device.
+ *
+ * Since: 1.2
+ **/
+gboolean
+nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device)
+{
+       g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), FALSE);
+
+       return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->no_promisc;
+}
+
+/**
+ * nm_device_macvlan_get_tap:
+ * @device: a #NMDeviceMacvlan
+ *
+ * Gets the device type (MACVLAN or MACVTAP).
+ *
+ * Returns: %TRUE if the device is a MACVTAP, %FALSE if it is a MACVLAN.
+ *
+ * Since: 1.2
+ **/
+gboolean
+nm_device_macvlan_get_tap (NMDeviceMacvlan *device)
+{
+       g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), FALSE);
+
+       return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->tap;
+}
+
+/**
+ * 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.
+ *
+ * Since: 1.2
+ **/
+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)
+{
+       NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE (device);
+       NMSettingMacvlan *s_macvlan;
+
+       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_macvlan = nm_connection_get_setting_macvlan (connection);
+       if (s_macvlan) {
+               if (nm_setting_macvlan_get_tap (s_macvlan) != priv->tap)
+                       return FALSE;
+       }
+
+       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_NO_PROMISC,  &priv->no_promisc },
+               { NM_DEVICE_MACVLAN_TAP,         &priv->tap },
+               { 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_NO_PROMISC:
+               g_value_set_boolean (value, nm_device_macvlan_get_no_promisc (device));
+               break;
+       case PROP_TAP:
+               g_value_set_boolean (value, nm_device_macvlan_get_tap (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.
+        *
+        * Since: 1.2
+        **/
+       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 MACVLAN mode.
+        *
+        * Since: 1.2
+        **/
+       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:no-promisc:
+        *
+        * Whether the device has the no-promiscuos flag.
+        *
+        * Since: 1.2
+        **/
+       g_object_class_install_property
+               (object_class, PROP_NO_PROMISC,
+                g_param_spec_boolean (NM_DEVICE_MACVLAN_NO_PROMISC, "", "",
+                                      FALSE,
+                                      G_PARAM_READABLE |
+                                      G_PARAM_STATIC_STRINGS));
+
+       /**
+        * NMDeviceMacvlan:tap:
+        *
+        * Whether the device is a MACVTAP.
+        *
+        * Since: 1.2
+        **/
+       g_object_class_install_property
+               (object_class, PROP_TAP,
+                g_param_spec_boolean (NM_DEVICE_MACVLAN_TAP, "", "",
+                                      FALSE,
+                                      G_PARAM_READABLE |
+                                      G_PARAM_STATIC_STRINGS));
+
+       /**
+        * NMDeviceMacvlan:hw-address:
+        *
+        * The hardware (MAC) address of the device.
+        *
+        * Since: 1.2
+        **/
+       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 (file)
index 0000000..7ffb80c
--- /dev/null
@@ -0,0 +1,72 @@
+/* -*- 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_NO_PROMISC  "no-promisc"
+#define NM_DEVICE_MACVLAN_TAP         "tap"
+#define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
+
+struct _NMDeviceMacvlan {
+       NMDevice parent;
+};
+
+typedef struct {
+       NMDeviceClass parent;
+
+       /*< private >*/
+       gpointer padding[4];
+} NMDeviceMacvlanClass;
+
+NM_AVAILABLE_IN_1_2
+GType nm_device_macvlan_get_type (void);
+
+NM_AVAILABLE_IN_1_2
+NMDevice *   nm_device_macvlan_get_parent      (NMDeviceMacvlan *device);
+NM_AVAILABLE_IN_1_2
+const char * nm_device_macvlan_get_mode        (NMDeviceMacvlan *device);
+NM_AVAILABLE_IN_1_2
+gboolean     nm_device_macvlan_get_no_promisc  (NMDeviceMacvlan *device);
+NM_AVAILABLE_IN_1_2
+gboolean     nm_device_macvlan_get_tap         (NMDeviceMacvlan *device);
+NM_AVAILABLE_IN_1_2
+const char * nm_device_macvlan_get_hw_address  (NMDeviceMacvlan *device);
+
+G_END_DECLS
+
+#endif /* __NM_DEVICE_MACVLAN_H__ */
index 9a0cbf5..119e54f 100644 (file)
@@ -42,6 +42,7 @@
 #include "nm-device-vlan.h"
 #include "nm-device-generic.h"
 #include "nm-device-ip-tunnel.h"
+#include "nm-device-macvlan.h"
 #include "nm-device.h"
 #include "nm-device-private.h"
 #include "nm-dhcp4-config.h"
@@ -371,6 +372,8 @@ _nm_device_gtype_from_dtype (NMDeviceType dtype)
                return NM_TYPE_DEVICE_TUN;
        case NM_DEVICE_TYPE_IP_TUNNEL:
                return NM_TYPE_DEVICE_IP_TUNNEL;
+       case NM_DEVICE_TYPE_MACVLAN:
+               return NM_TYPE_DEVICE_MACVLAN;
        default:
                g_warning ("Unknown device type %d", dtype);
                return G_TYPE_INVALID;
index f69deff..82001c0 100644 (file)
@@ -38,6 +38,7 @@ typedef struct _NMDeviceEthernet    NMDeviceEthernet;
 typedef struct _NMDeviceGeneric     NMDeviceGeneric;
 typedef struct _NMDeviceInfiniband  NMDeviceInfiniband;
 typedef struct _NMDeviceIPTunnel    NMDeviceIPTunnel;
+typedef struct _NMDeviceMacvlan     NMDeviceMacvlan;
 typedef struct _NMDeviceModem       NMDeviceModem;
 typedef struct _NMDeviceOlpcMesh    NMDeviceOlpcMesh;
 typedef struct _NMDeviceTeam        NMDeviceTeam;
index 13ea642..2d1afcc 100644 (file)
@@ -123,6 +123,7 @@ libnm/nm-device-generic.c
 libnm/nm-device-tun.c
 libnm/nm-device-infiniband.c
 libnm/nm-device-ip-tunnel.c
+libnm/nm-device-macvlan.c
 libnm/nm-device-modem.c
 libnm/nm-device-olpc-mesh.c
 libnm/nm-device-team.c