2012-02-22 23:59:50 -06:00
|
|
|
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
|
/* NetworkManager -- Network link manager
|
|
|
|
|
*
|
|
|
|
|
* 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
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
|
*
|
|
|
|
|
* Copyright 2011 - 2012 Red Hat, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
#include <glib/gi18n.h>
|
|
|
|
|
|
2012-03-02 08:56:46 +01:00
|
|
|
#include <sys/socket.h>
|
2012-02-22 23:59:50 -06:00
|
|
|
|
|
|
|
|
#include "nm-device-vlan.h"
|
2013-07-20 21:48:06 +02:00
|
|
|
#include "nm-manager.h"
|
2012-02-22 23:59:50 -06:00
|
|
|
#include "nm-logging.h"
|
|
|
|
|
#include "nm-utils.h"
|
|
|
|
|
#include "NetworkManagerUtils.h"
|
|
|
|
|
#include "nm-device-private.h"
|
|
|
|
|
#include "nm-enum-types.h"
|
2013-05-07 12:18:41 -04:00
|
|
|
#include "nm-dbus-manager.h"
|
2014-07-17 17:06:44 -04:00
|
|
|
#include "nm-connection-provider.h"
|
|
|
|
|
#include "nm-activation-request.h"
|
|
|
|
|
#include "nm-ip4-config.h"
|
2013-01-21 15:12:24 +01:00
|
|
|
#include "nm-platform.h"
|
2013-07-20 21:48:06 +02:00
|
|
|
#include "nm-utils.h"
|
2012-02-22 23:59:50 -06:00
|
|
|
|
|
|
|
|
#include "nm-device-vlan-glue.h"
|
|
|
|
|
|
2014-08-02 15:14:26 +02:00
|
|
|
#include "nm-device-logging.h"
|
|
|
|
|
_LOG_DECLARE_SELF(NMDeviceVlan);
|
2012-02-22 23:59:50 -06:00
|
|
|
|
|
|
|
|
G_DEFINE_TYPE (NMDeviceVlan, nm_device_vlan, NM_TYPE_DEVICE)
|
|
|
|
|
|
|
|
|
|
#define NM_DEVICE_VLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_VLAN, NMDeviceVlanPrivate))
|
|
|
|
|
|
|
|
|
|
#define NM_VLAN_ERROR (nm_vlan_error_quark ())
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
2013-09-08 13:39:03 -04:00
|
|
|
guint8 initial_hw_addr[ETH_ALEN];
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
gboolean disposed;
|
2013-09-03 14:23:16 -04:00
|
|
|
gboolean invalid;
|
2012-02-22 23:59:50 -06:00
|
|
|
|
|
|
|
|
NMDevice *parent;
|
|
|
|
|
guint parent_state_id;
|
|
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
int vlan_id;
|
2012-02-22 23:59:50 -06:00
|
|
|
} NMDeviceVlanPrivate;
|
|
|
|
|
|
|
|
|
|
enum {
|
|
|
|
|
PROP_0,
|
2013-09-03 14:23:16 -04:00
|
|
|
PROP_PARENT,
|
2012-02-22 23:59:50 -06:00
|
|
|
PROP_VLAN_ID,
|
|
|
|
|
|
|
|
|
|
LAST_PROP
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/******************************************************************/
|
|
|
|
|
|
|
|
|
|
static GQuark
|
|
|
|
|
nm_vlan_error_quark (void)
|
|
|
|
|
{
|
|
|
|
|
static GQuark quark = 0;
|
|
|
|
|
if (!quark)
|
|
|
|
|
quark = g_quark_from_static_string ("nm-vlan-error");
|
|
|
|
|
return quark;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************/
|
|
|
|
|
|
2013-09-08 13:39:03 -04:00
|
|
|
static void
|
|
|
|
|
update_initial_hw_address (NMDevice *dev)
|
|
|
|
|
{
|
|
|
|
|
NMDeviceVlan *self = NM_DEVICE_VLAN (dev);
|
|
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
|
2014-06-21 12:44:56 -04:00
|
|
|
const char *mac_str;
|
2013-09-08 13:39:03 -04:00
|
|
|
|
2014-06-21 12:44:56 -04:00
|
|
|
mac_str = nm_device_get_hw_address (dev);
|
|
|
|
|
nm_utils_hwaddr_aton (mac_str, priv->initial_hw_addr, ETH_ALEN);
|
2013-09-08 13:39:03 -04:00
|
|
|
|
2014-06-21 12:44:56 -04:00
|
|
|
_LOGD (LOGD_DEVICE | LOGD_VLAN, "read initial MAC address %s", mac_str);
|
2013-09-08 13:39:03 -04:00
|
|
|
}
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
static guint32
|
2012-09-27 12:12:15 -04:00
|
|
|
get_generic_capabilities (NMDevice *dev)
|
2012-02-22 23:59:50 -06:00
|
|
|
{
|
|
|
|
|
/* We assume VLAN interfaces always support carrier detect */
|
2013-05-17 10:58:38 -05:00
|
|
|
return NM_DEVICE_CAP_CARRIER_DETECT;
|
2012-02-22 23:59:50 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gboolean
|
2013-06-13 15:13:58 -05:00
|
|
|
bring_up (NMDevice *dev, gboolean *no_firmware)
|
2012-02-22 23:59:50 -06:00
|
|
|
{
|
2013-01-21 15:12:24 +01:00
|
|
|
gboolean success = FALSE;
|
2012-03-06 12:53:11 -06:00
|
|
|
guint i = 20;
|
|
|
|
|
|
|
|
|
|
while (i-- > 0 && !success) {
|
2013-06-13 15:13:58 -05:00
|
|
|
success = NM_DEVICE_CLASS (nm_device_vlan_parent_class)->bring_up (dev, no_firmware);
|
2012-03-06 12:53:11 -06:00
|
|
|
g_usleep (50);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return success;
|
2012-02-22 23:59:50 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************/
|
|
|
|
|
|
|
|
|
|
static gboolean
|
2014-05-30 13:44:53 -05:00
|
|
|
match_parent (NMDeviceVlan *self, const char *parent)
|
2012-02-22 23:59:50 -06:00
|
|
|
{
|
|
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (parent != NULL, FALSE);
|
|
|
|
|
|
|
|
|
|
if (nm_utils_is_uuid (parent)) {
|
|
|
|
|
NMActRequest *parent_req;
|
|
|
|
|
NMConnection *parent_connection;
|
|
|
|
|
|
|
|
|
|
/* If the parent is a UUID, the connection matches if our parent
|
|
|
|
|
* device has that connection activated.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
parent_req = nm_device_get_act_request (priv->parent);
|
2014-05-30 13:44:53 -05:00
|
|
|
if (!parent_req)
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
parent_connection = nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (parent_req));
|
2014-05-30 13:44:53 -05:00
|
|
|
if (!parent_connection)
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
2014-05-30 13:44:53 -05:00
|
|
|
|
|
|
|
|
if (g_strcmp0 (parent, nm_connection_get_uuid (parent_connection)) != 0)
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
} else {
|
|
|
|
|
/* interface name */
|
2014-05-30 13:44:53 -05:00
|
|
|
if (g_strcmp0 (parent, nm_device_get_ip_iface (priv->parent)) != 0)
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
all: standardize on NMSettingWired:mac-address for all VLANs
Currently, ethernet-based VLANs can specify the hardware address of
the parent device (and, in theory, the cloned hardware address and MTU
of the VLAN device) by using an NMSettingWired in addition to the
NMSettingVlan.
The theory was that non-ethernet-based VLANs, when we eventually
supported them, would likewise use the setting type corresponding to
their parent device. However, this turns out to be both complicated
(the settings plugins and connection editor would have a
hard-to-impossible time figuring out which setting type to use in some
cases) and incorrect (for most L2 settings [eg, BSSID, bond mode,
etc], the VLAN can't have its own values separate from the parent
device).
What we should have done was just have :mac-address,
:cloned-mac-address, and :mtu properties on NMSettingVlan. However, at
this point, for backward-compatibility, we will just stick with using
a combination of NMSettingVlan and NMSettingWired, but we will use
NMSettingWired regardless of the underlying hardware type.
2013-09-09 09:40:40 -04:00
|
|
|
static gboolean
|
|
|
|
|
match_hwaddr (NMDevice *device, NMConnection *connection, gboolean fail_if_no_hwaddr)
|
|
|
|
|
{
|
|
|
|
|
NMSettingWired *s_wired;
|
|
|
|
|
const GByteArray *mac;
|
2014-06-21 12:44:56 -04:00
|
|
|
const char *device_mac;
|
all: standardize on NMSettingWired:mac-address for all VLANs
Currently, ethernet-based VLANs can specify the hardware address of
the parent device (and, in theory, the cloned hardware address and MTU
of the VLAN device) by using an NMSettingWired in addition to the
NMSettingVlan.
The theory was that non-ethernet-based VLANs, when we eventually
supported them, would likewise use the setting type corresponding to
their parent device. However, this turns out to be both complicated
(the settings plugins and connection editor would have a
hard-to-impossible time figuring out which setting type to use in some
cases) and incorrect (for most L2 settings [eg, BSSID, bond mode,
etc], the VLAN can't have its own values separate from the parent
device).
What we should have done was just have :mac-address,
:cloned-mac-address, and :mtu properties on NMSettingVlan. However, at
this point, for backward-compatibility, we will just stick with using
a combination of NMSettingVlan and NMSettingWired, but we will use
NMSettingWired regardless of the underlying hardware type.
2013-09-09 09:40:40 -04:00
|
|
|
|
|
|
|
|
s_wired = nm_connection_get_setting_wired (connection);
|
|
|
|
|
if (!s_wired)
|
|
|
|
|
return !fail_if_no_hwaddr;
|
|
|
|
|
|
|
|
|
|
mac = nm_setting_wired_get_mac_address (s_wired);
|
|
|
|
|
if (!mac)
|
|
|
|
|
return !fail_if_no_hwaddr;
|
|
|
|
|
|
2014-06-21 12:44:56 -04:00
|
|
|
device_mac = nm_device_get_hw_address (device);
|
all: standardize on NMSettingWired:mac-address for all VLANs
Currently, ethernet-based VLANs can specify the hardware address of
the parent device (and, in theory, the cloned hardware address and MTU
of the VLAN device) by using an NMSettingWired in addition to the
NMSettingVlan.
The theory was that non-ethernet-based VLANs, when we eventually
supported them, would likewise use the setting type corresponding to
their parent device. However, this turns out to be both complicated
(the settings plugins and connection editor would have a
hard-to-impossible time figuring out which setting type to use in some
cases) and incorrect (for most L2 settings [eg, BSSID, bond mode,
etc], the VLAN can't have its own values separate from the parent
device).
What we should have done was just have :mac-address,
:cloned-mac-address, and :mtu properties on NMSettingVlan. However, at
this point, for backward-compatibility, we will just stick with using
a combination of NMSettingVlan and NMSettingWired, but we will use
NMSettingWired regardless of the underlying hardware type.
2013-09-09 09:40:40 -04:00
|
|
|
|
2014-06-21 12:44:56 -04:00
|
|
|
return nm_utils_hwaddr_matches (mac->data, mac->len, device_mac, -1);
|
all: standardize on NMSettingWired:mac-address for all VLANs
Currently, ethernet-based VLANs can specify the hardware address of
the parent device (and, in theory, the cloned hardware address and MTU
of the VLAN device) by using an NMSettingWired in addition to the
NMSettingVlan.
The theory was that non-ethernet-based VLANs, when we eventually
supported them, would likewise use the setting type corresponding to
their parent device. However, this turns out to be both complicated
(the settings plugins and connection editor would have a
hard-to-impossible time figuring out which setting type to use in some
cases) and incorrect (for most L2 settings [eg, BSSID, bond mode,
etc], the VLAN can't have its own values separate from the parent
device).
What we should have done was just have :mac-address,
:cloned-mac-address, and :mtu properties on NMSettingVlan. However, at
this point, for backward-compatibility, we will just stick with using
a combination of NMSettingVlan and NMSettingWired, but we will use
NMSettingWired regardless of the underlying hardware type.
2013-09-09 09:40:40 -04:00
|
|
|
}
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
static gboolean
|
2014-05-30 13:44:53 -05:00
|
|
|
check_connection_compatible (NMDevice *device, NMConnection *connection)
|
2012-02-22 23:59:50 -06:00
|
|
|
{
|
2013-03-06 16:16:54 -05:00
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (device);
|
2012-02-22 23:59:50 -06:00
|
|
|
NMSettingVlan *s_vlan;
|
|
|
|
|
const char *parent, *iface = NULL;
|
|
|
|
|
|
2014-05-30 13:44:53 -05:00
|
|
|
if (!NM_DEVICE_CLASS (nm_device_vlan_parent_class)->check_connection_compatible (device, connection))
|
2013-03-07 07:44:36 -05:00
|
|
|
return FALSE;
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
s_vlan = nm_connection_get_setting_vlan (connection);
|
2014-05-30 13:44:53 -05:00
|
|
|
if (!s_vlan)
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
|
2014-05-30 13:44:53 -05:00
|
|
|
if (nm_setting_vlan_get_id (s_vlan) != priv->vlan_id)
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Check parent interface; could be an interface name or a UUID */
|
|
|
|
|
parent = nm_setting_vlan_get_parent (s_vlan);
|
|
|
|
|
if (parent) {
|
2014-05-30 13:44:53 -05:00
|
|
|
if (!match_parent (NM_DEVICE_VLAN (device), parent))
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
} else {
|
all: standardize on NMSettingWired:mac-address for all VLANs
Currently, ethernet-based VLANs can specify the hardware address of
the parent device (and, in theory, the cloned hardware address and MTU
of the VLAN device) by using an NMSettingWired in addition to the
NMSettingVlan.
The theory was that non-ethernet-based VLANs, when we eventually
supported them, would likewise use the setting type corresponding to
their parent device. However, this turns out to be both complicated
(the settings plugins and connection editor would have a
hard-to-impossible time figuring out which setting type to use in some
cases) and incorrect (for most L2 settings [eg, BSSID, bond mode,
etc], the VLAN can't have its own values separate from the parent
device).
What we should have done was just have :mac-address,
:cloned-mac-address, and :mtu properties on NMSettingVlan. However, at
this point, for backward-compatibility, we will just stick with using
a combination of NMSettingVlan and NMSettingWired, but we will use
NMSettingWired regardless of the underlying hardware type.
2013-09-09 09:40:40 -04:00
|
|
|
/* Parent could be a MAC address in an NMSettingWired */
|
2014-05-30 13:44:53 -05:00
|
|
|
if (!match_hwaddr (device, connection, TRUE))
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Ensure the interface name matches. If not specified we assume a match
|
|
|
|
|
* since both the parent interface and the VLAN ID matched by the time we
|
|
|
|
|
* get here.
|
|
|
|
|
*/
|
|
|
|
|
iface = nm_connection_get_virtual_iface_name (connection);
|
|
|
|
|
if (iface) {
|
2014-05-30 13:44:53 -05:00
|
|
|
if (g_strcmp0 (nm_device_get_ip_iface (device), iface) != 0)
|
2012-02-22 23:59:50 -06:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gboolean
|
2012-09-27 12:12:15 -04:00
|
|
|
complete_connection (NMDevice *device,
|
|
|
|
|
NMConnection *connection,
|
|
|
|
|
const char *specific_object,
|
|
|
|
|
const GSList *existing_connections,
|
|
|
|
|
GError **error)
|
2012-02-22 23:59:50 -06:00
|
|
|
{
|
|
|
|
|
NMSettingVlan *s_vlan;
|
|
|
|
|
|
|
|
|
|
nm_utils_complete_generic (connection,
|
|
|
|
|
NM_SETTING_VLAN_SETTING_NAME,
|
|
|
|
|
existing_connections,
|
|
|
|
|
NULL,
|
2014-08-25 16:21:59 +02:00
|
|
|
_("VLAN connection"),
|
2012-02-22 23:59:50 -06:00
|
|
|
TRUE);
|
|
|
|
|
|
|
|
|
|
s_vlan = nm_connection_get_setting_vlan (connection);
|
|
|
|
|
if (!s_vlan) {
|
|
|
|
|
g_set_error_literal (error, NM_VLAN_ERROR, NM_VLAN_ERROR_CONNECTION_INVALID,
|
|
|
|
|
"A 'vlan' setting is required.");
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If there's no VLAN interface, no parent, and no hardware address in the
|
|
|
|
|
* settings, then there's not enough information to complete the setting.
|
|
|
|
|
*/
|
all: standardize on NMSettingWired:mac-address for all VLANs
Currently, ethernet-based VLANs can specify the hardware address of
the parent device (and, in theory, the cloned hardware address and MTU
of the VLAN device) by using an NMSettingWired in addition to the
NMSettingVlan.
The theory was that non-ethernet-based VLANs, when we eventually
supported them, would likewise use the setting type corresponding to
their parent device. However, this turns out to be both complicated
(the settings plugins and connection editor would have a
hard-to-impossible time figuring out which setting type to use in some
cases) and incorrect (for most L2 settings [eg, BSSID, bond mode,
etc], the VLAN can't have its own values separate from the parent
device).
What we should have done was just have :mac-address,
:cloned-mac-address, and :mtu properties on NMSettingVlan. However, at
this point, for backward-compatibility, we will just stick with using
a combination of NMSettingVlan and NMSettingWired, but we will use
NMSettingWired regardless of the underlying hardware type.
2013-09-09 09:40:40 -04:00
|
|
|
if ( !nm_setting_vlan_get_parent (s_vlan)
|
|
|
|
|
&& !match_hwaddr (device, connection, TRUE)) {
|
|
|
|
|
g_set_error_literal (error, NM_VLAN_ERROR, NM_VLAN_ERROR_CONNECTION_INVALID,
|
|
|
|
|
"The 'vlan' setting had no interface name, parent, or hardware address.");
|
|
|
|
|
return FALSE;
|
2012-02-22 23:59:50 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
static void parent_state_changed (NMDevice *parent, NMDeviceState new_state,
|
|
|
|
|
NMDeviceState old_state,
|
|
|
|
|
NMDeviceStateReason reason,
|
|
|
|
|
gpointer user_data);
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_device_vlan_set_parent (NMDeviceVlan *device, NMDevice *parent)
|
2012-02-22 23:59:50 -06:00
|
|
|
{
|
2013-07-20 21:48:06 +02:00
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (device);
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
if (priv->parent_state_id) {
|
|
|
|
|
g_signal_handler_disconnect (priv->parent, priv->parent_state_id);
|
|
|
|
|
priv->parent_state_id = 0;
|
|
|
|
|
}
|
|
|
|
|
g_clear_object (&priv->parent);
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
if (parent) {
|
|
|
|
|
priv->parent = g_object_ref (parent);
|
|
|
|
|
priv->parent_state_id = g_signal_connect (priv->parent,
|
|
|
|
|
"state-changed",
|
|
|
|
|
G_CALLBACK (parent_state_changed),
|
|
|
|
|
device);
|
2012-02-22 23:59:50 -06:00
|
|
|
}
|
2013-07-20 21:48:06 +02:00
|
|
|
g_object_notify (G_OBJECT (device), NM_DEVICE_VLAN_PARENT);
|
|
|
|
|
}
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
static void
|
|
|
|
|
update_connection (NMDevice *device, NMConnection *connection)
|
|
|
|
|
{
|
2014-08-02 15:14:26 +02:00
|
|
|
NMDeviceVlan *self = NM_DEVICE_VLAN (device);
|
2013-07-20 21:48:06 +02:00
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (device);
|
|
|
|
|
NMSettingVlan *s_vlan = nm_connection_get_setting_vlan (connection);
|
|
|
|
|
int ifindex = nm_device_get_ifindex (device);
|
|
|
|
|
int parent_ifindex = -1, vlan_id = -1;
|
|
|
|
|
NMDevice *parent;
|
|
|
|
|
const char *setting_parent, *new_parent;
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
if (!s_vlan) {
|
|
|
|
|
s_vlan = (NMSettingVlan *) nm_setting_vlan_new ();
|
|
|
|
|
nm_connection_add_setting (connection, (NMSetting *) s_vlan);
|
|
|
|
|
g_object_set (s_vlan, NM_SETTING_VLAN_INTERFACE_NAME, nm_device_get_iface (device), NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-13 18:24:42 +01:00
|
|
|
if (!nm_platform_vlan_get_info (ifindex, &parent_ifindex, &vlan_id)) {
|
2014-08-02 15:14:26 +02:00
|
|
|
_LOGW (LOGD_VLAN, "failed to get VLAN interface info while updating connection.");
|
2013-11-13 18:24:42 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
if (priv->vlan_id != vlan_id) {
|
|
|
|
|
priv->vlan_id = vlan_id;
|
|
|
|
|
g_object_notify (G_OBJECT (device), NM_DEVICE_VLAN_ID);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (vlan_id != nm_setting_vlan_get_id (s_vlan))
|
|
|
|
|
g_object_set (s_vlan, NM_SETTING_VLAN_ID, priv->vlan_id, NULL);
|
|
|
|
|
|
|
|
|
|
parent = nm_manager_get_device_by_ifindex (nm_manager_get (), parent_ifindex);
|
|
|
|
|
g_assert (parent);
|
|
|
|
|
if (priv->parent != parent)
|
|
|
|
|
nm_device_vlan_set_parent (NM_DEVICE_VLAN (device), parent);
|
|
|
|
|
|
|
|
|
|
/* Update parent in the connection; default to parent's interface name */
|
|
|
|
|
new_parent = nm_device_get_iface (parent);
|
|
|
|
|
setting_parent = nm_setting_vlan_get_parent (s_vlan);
|
|
|
|
|
if (setting_parent && nm_utils_is_uuid (setting_parent)) {
|
|
|
|
|
NMConnection *parent_connection;
|
|
|
|
|
|
|
|
|
|
/* Don't change a parent specified by UUID if it's still valid */
|
2014-02-10 06:59:05 -06:00
|
|
|
parent_connection = nm_connection_provider_get_connection_by_uuid (nm_connection_provider_get (), setting_parent);
|
2014-05-30 13:44:53 -05:00
|
|
|
if (parent_connection && nm_device_check_connection_compatible (parent, parent_connection))
|
2013-07-20 21:48:06 +02:00
|
|
|
new_parent = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (new_parent)
|
|
|
|
|
g_object_set (s_vlan, NM_SETTING_VLAN_PARENT, new_parent, NULL);
|
2012-02-22 23:59:50 -06:00
|
|
|
}
|
|
|
|
|
|
2013-09-03 14:03:52 -04:00
|
|
|
static NMActStageReturn
|
|
|
|
|
act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
|
|
|
|
|
{
|
|
|
|
|
NMActRequest *req;
|
|
|
|
|
NMConnection *connection;
|
|
|
|
|
NMSettingVlan *s_vlan;
|
2013-09-08 13:39:03 -04:00
|
|
|
NMSettingWired *s_wired;
|
|
|
|
|
const GByteArray *cloned_mac;
|
2013-09-03 14:03:52 -04:00
|
|
|
NMActStageReturn ret;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
|
|
|
|
|
|
|
|
|
|
ret = NM_DEVICE_CLASS (nm_device_vlan_parent_class)->act_stage1_prepare (dev, reason);
|
|
|
|
|
if (ret != NM_ACT_STAGE_RETURN_SUCCESS)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
req = nm_device_get_act_request (dev);
|
|
|
|
|
g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE);
|
|
|
|
|
|
|
|
|
|
connection = nm_act_request_get_connection (req);
|
|
|
|
|
g_return_val_if_fail (connection != NULL, NM_ACT_STAGE_RETURN_FAILURE);
|
|
|
|
|
|
2013-09-08 13:39:03 -04:00
|
|
|
s_wired = nm_connection_get_setting_wired (connection);
|
|
|
|
|
if (s_wired) {
|
|
|
|
|
/* Set device MAC address if the connection wants to change it */
|
|
|
|
|
cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired);
|
|
|
|
|
if (cloned_mac && (cloned_mac->len == ETH_ALEN))
|
|
|
|
|
nm_device_set_hw_addr (dev, (const guint8 *) cloned_mac->data, "set", LOGD_VLAN);
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-03 14:03:52 -04:00
|
|
|
s_vlan = nm_connection_get_setting_vlan (connection);
|
|
|
|
|
if (s_vlan) {
|
|
|
|
|
int ifindex = nm_device_get_ifindex (dev);
|
|
|
|
|
int num, i;
|
|
|
|
|
guint32 from, to;
|
|
|
|
|
|
|
|
|
|
num = nm_setting_vlan_get_num_priorities (s_vlan, NM_VLAN_INGRESS_MAP);
|
|
|
|
|
for (i = 0; i < num; i++) {
|
|
|
|
|
if (nm_setting_vlan_get_priority (s_vlan, NM_VLAN_INGRESS_MAP, i, &from, &to))
|
|
|
|
|
nm_platform_vlan_set_ingress_map (ifindex, from, to);
|
|
|
|
|
}
|
|
|
|
|
num = nm_setting_vlan_get_num_priorities (s_vlan, NM_VLAN_EGRESS_MAP);
|
|
|
|
|
for (i = 0; i < num; i++) {
|
|
|
|
|
if (nm_setting_vlan_get_priority (s_vlan, NM_VLAN_EGRESS_MAP, i, &from, &to))
|
|
|
|
|
nm_platform_vlan_set_egress_map (ifindex, from, to);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-08 13:39:03 -04:00
|
|
|
static void
|
|
|
|
|
ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
|
|
|
|
|
{
|
|
|
|
|
NMConnection *connection;
|
|
|
|
|
NMSettingWired *s_wired;
|
|
|
|
|
guint32 mtu;
|
|
|
|
|
|
|
|
|
|
connection = nm_device_get_connection (device);
|
|
|
|
|
g_assert (connection);
|
|
|
|
|
|
|
|
|
|
s_wired = nm_connection_get_setting_wired (connection);
|
|
|
|
|
if (s_wired) {
|
|
|
|
|
mtu = nm_setting_wired_get_mtu (s_wired);
|
|
|
|
|
if (mtu)
|
|
|
|
|
nm_ip4_config_set_mtu (config, mtu);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
deactivate (NMDevice *device)
|
|
|
|
|
{
|
|
|
|
|
NMDeviceVlan *self = NM_DEVICE_VLAN (device);
|
|
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
/* Reset MAC address back to initial address */
|
|
|
|
|
nm_device_set_hw_addr (device, priv->initial_hw_addr, "reset", LOGD_VLAN);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
/******************************************************************/
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
parent_state_changed (NMDevice *parent,
|
|
|
|
|
NMDeviceState new_state,
|
|
|
|
|
NMDeviceState old_state,
|
|
|
|
|
NMDeviceStateReason reason,
|
|
|
|
|
gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
NMDeviceVlan *self = NM_DEVICE_VLAN (user_data);
|
|
|
|
|
|
2013-05-07 10:23:44 -04:00
|
|
|
/* We'll react to our own carrier state notifications. Ignore the parent's. */
|
|
|
|
|
if (reason == NM_DEVICE_STATE_REASON_CARRIER)
|
|
|
|
|
return;
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
if (new_state < NM_DEVICE_STATE_DISCONNECTED) {
|
|
|
|
|
/* If the parent becomes unavailable or unmanaged so does the VLAN */
|
|
|
|
|
nm_device_state_changed (NM_DEVICE (self), new_state, reason);
|
|
|
|
|
} else if ( new_state == NM_DEVICE_STATE_DISCONNECTED
|
|
|
|
|
&& old_state < NM_DEVICE_STATE_DISCONNECTED) {
|
|
|
|
|
/* Mark VLAN interface as available/disconnected when the parent
|
2013-05-07 10:23:44 -04:00
|
|
|
* becomes available as a result of becoming initialized.
|
2012-02-22 23:59:50 -06:00
|
|
|
*/
|
|
|
|
|
nm_device_state_changed (NM_DEVICE (self), new_state, reason);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/******************************************************************/
|
|
|
|
|
|
|
|
|
|
NMDevice *
|
2013-09-03 14:23:16 -04:00
|
|
|
nm_device_vlan_new (NMPlatformLink *platform_device, NMDevice *parent)
|
2012-02-22 23:59:50 -06:00
|
|
|
{
|
|
|
|
|
NMDevice *device;
|
|
|
|
|
|
2013-09-03 14:23:16 -04:00
|
|
|
g_return_val_if_fail (platform_device != NULL, NULL);
|
|
|
|
|
g_return_val_if_fail (NM_IS_DEVICE (parent), NULL);
|
2012-02-22 23:59:50 -06:00
|
|
|
|
|
|
|
|
device = (NMDevice *) g_object_new (NM_TYPE_DEVICE_VLAN,
|
2013-09-03 14:23:16 -04:00
|
|
|
NM_DEVICE_PLATFORM_DEVICE, platform_device,
|
|
|
|
|
NM_DEVICE_VLAN_PARENT, parent,
|
2012-02-22 23:59:50 -06:00
|
|
|
NM_DEVICE_DRIVER, "8021q",
|
|
|
|
|
NM_DEVICE_TYPE_DESC, "VLAN",
|
|
|
|
|
NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_VLAN,
|
|
|
|
|
NULL);
|
2013-09-03 14:23:16 -04:00
|
|
|
if (NM_DEVICE_VLAN_GET_PRIVATE (device)->invalid) {
|
|
|
|
|
g_object_unref (device);
|
|
|
|
|
device = NULL;
|
|
|
|
|
}
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-09-03 14:23:16 -04:00
|
|
|
return device;
|
|
|
|
|
}
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-09-03 14:23:16 -04:00
|
|
|
NMDevice *
|
|
|
|
|
nm_device_vlan_new_for_connection (NMConnection *connection, NMDevice *parent)
|
|
|
|
|
{
|
|
|
|
|
NMDevice *device;
|
|
|
|
|
NMSettingVlan *s_vlan;
|
|
|
|
|
char *iface;
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-09-03 14:23:16 -04:00
|
|
|
g_return_val_if_fail (connection != NULL, NULL);
|
|
|
|
|
g_return_val_if_fail (NM_IS_DEVICE (parent), NULL);
|
|
|
|
|
|
|
|
|
|
s_vlan = nm_connection_get_setting_vlan (connection);
|
|
|
|
|
g_return_val_if_fail (s_vlan != NULL, NULL);
|
|
|
|
|
|
|
|
|
|
iface = g_strdup (nm_connection_get_virtual_iface_name (connection));
|
|
|
|
|
if (!iface) {
|
|
|
|
|
iface = nm_utils_new_vlan_name (nm_device_get_ip_iface (parent),
|
|
|
|
|
nm_setting_vlan_get_id (s_vlan));
|
|
|
|
|
}
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-09-03 14:23:16 -04:00
|
|
|
if ( !nm_platform_vlan_add (iface,
|
|
|
|
|
nm_device_get_ifindex (parent),
|
|
|
|
|
nm_setting_vlan_get_id (s_vlan),
|
|
|
|
|
nm_setting_vlan_get_flags (s_vlan))
|
|
|
|
|
&& nm_platform_get_error () != NM_PLATFORM_ERROR_EXISTS) {
|
2014-08-02 15:14:26 +02:00
|
|
|
nm_log_warn (LOGD_DEVICE | LOGD_VLAN, "(%s) failed to add VLAN interface for '%s'",
|
2013-09-03 14:23:16 -04:00
|
|
|
iface, nm_connection_get_id (connection));
|
|
|
|
|
g_free (iface);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
device = (NMDevice *) g_object_new (NM_TYPE_DEVICE_VLAN,
|
|
|
|
|
NM_DEVICE_IFACE, iface,
|
|
|
|
|
NM_DEVICE_VLAN_PARENT, parent,
|
|
|
|
|
NM_DEVICE_DRIVER, "8021q",
|
|
|
|
|
NM_DEVICE_TYPE_DESC, "VLAN",
|
|
|
|
|
NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_VLAN,
|
|
|
|
|
NULL);
|
|
|
|
|
g_free (iface);
|
|
|
|
|
if (NM_DEVICE_VLAN_GET_PRIVATE (device)->invalid) {
|
|
|
|
|
g_object_unref (device);
|
|
|
|
|
device = NULL;
|
2012-02-22 23:59:50 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return device;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_device_vlan_init (NMDeviceVlan * self)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-03 14:23:16 -04:00
|
|
|
static void
|
|
|
|
|
constructed (GObject *object)
|
|
|
|
|
{
|
2014-08-02 15:14:26 +02:00
|
|
|
NMDeviceVlan *self = NM_DEVICE_VLAN (object);
|
|
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
|
|
|
|
|
int ifindex = nm_device_get_ifindex (NM_DEVICE (self));
|
2013-09-03 14:23:16 -04:00
|
|
|
int parent_ifindex = -1, itype;
|
|
|
|
|
int vlan_id;
|
|
|
|
|
|
|
|
|
|
if (G_OBJECT_CLASS (nm_device_vlan_parent_class)->constructed)
|
|
|
|
|
G_OBJECT_CLASS (nm_device_vlan_parent_class)->constructed (object);
|
|
|
|
|
|
|
|
|
|
if (!priv->parent) {
|
2014-08-02 15:14:26 +02:00
|
|
|
_LOGE (LOGD_VLAN, "no parent specified.");
|
2013-09-03 14:23:16 -04:00
|
|
|
priv->invalid = TRUE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
itype = nm_platform_link_get_type (ifindex);
|
|
|
|
|
if (itype != NM_LINK_TYPE_VLAN) {
|
2014-08-02 15:14:26 +02:00
|
|
|
_LOGE (LOGD_VLAN, "failed to get VLAN interface type.");
|
2013-09-03 14:23:16 -04:00
|
|
|
priv->invalid = TRUE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!nm_platform_vlan_get_info (ifindex, &parent_ifindex, &vlan_id)) {
|
2014-08-02 15:14:26 +02:00
|
|
|
_LOGW (LOGD_VLAN, "failed to get VLAN interface info.");
|
2013-09-03 14:23:16 -04:00
|
|
|
priv->invalid = TRUE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( parent_ifindex < 0
|
|
|
|
|
|| parent_ifindex != nm_device_get_ip_ifindex (priv->parent)
|
|
|
|
|
|| vlan_id < 0) {
|
2014-08-02 15:14:26 +02:00
|
|
|
_LOGW (LOGD_VLAN, "VLAN parent ifindex (%d) or VLAN ID (%d) invalid.",
|
|
|
|
|
parent_ifindex, priv->vlan_id);
|
2013-09-03 14:23:16 -04:00
|
|
|
priv->invalid = TRUE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
priv->vlan_id = vlan_id;
|
2014-08-02 15:14:26 +02:00
|
|
|
_LOGI (LOGD_HW | LOGD_VLAN, "VLAN ID %d with parent %s",
|
|
|
|
|
priv->vlan_id, nm_device_get_iface (priv->parent));
|
2013-09-03 14:23:16 -04:00
|
|
|
}
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
static void
|
|
|
|
|
get_property (GObject *object, guint prop_id,
|
|
|
|
|
GValue *value, GParamSpec *pspec)
|
|
|
|
|
{
|
|
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (object);
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_VLAN_ID:
|
|
|
|
|
g_value_set_uint (value, priv->vlan_id);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_property (GObject *object, guint prop_id,
|
|
|
|
|
const GValue *value, GParamSpec *pspec)
|
|
|
|
|
{
|
|
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (object);
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
2013-09-03 14:23:16 -04:00
|
|
|
case PROP_PARENT:
|
2013-07-20 21:48:06 +02:00
|
|
|
nm_device_vlan_set_parent (NM_DEVICE_VLAN (object), g_value_get_object (value));
|
2013-09-03 14:23:16 -04:00
|
|
|
break;
|
2012-02-22 23:59:50 -06:00
|
|
|
case PROP_VLAN_ID:
|
|
|
|
|
priv->vlan_id = g_value_get_uint (value);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dispose (GObject *object)
|
|
|
|
|
{
|
|
|
|
|
NMDeviceVlan *self = NM_DEVICE_VLAN (object);
|
|
|
|
|
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
if (priv->disposed) {
|
|
|
|
|
G_OBJECT_CLASS (nm_device_vlan_parent_class)->dispose (object);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
priv->disposed = TRUE;
|
|
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
nm_device_vlan_set_parent (self, NULL);
|
2012-08-24 11:23:18 -05:00
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (nm_device_vlan_parent_class)->dispose (object);
|
2012-02-22 23:59:50 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_device_vlan_class_init (NMDeviceVlanClass *klass)
|
|
|
|
|
{
|
|
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
|
NMDeviceClass *parent_class = NM_DEVICE_CLASS (klass);
|
|
|
|
|
|
2013-07-20 21:48:06 +02:00
|
|
|
parent_class->connection_type = NM_SETTING_VLAN_SETTING_NAME;
|
|
|
|
|
|
2012-02-22 23:59:50 -06:00
|
|
|
g_type_class_add_private (object_class, sizeof (NMDeviceVlanPrivate));
|
|
|
|
|
|
|
|
|
|
/* virtual methods */
|
2013-09-03 14:23:16 -04:00
|
|
|
object_class->constructed = constructed;
|
2012-02-22 23:59:50 -06:00
|
|
|
object_class->get_property = get_property;
|
|
|
|
|
object_class->set_property = set_property;
|
|
|
|
|
object_class->dispose = dispose;
|
|
|
|
|
|
2013-09-08 13:39:03 -04:00
|
|
|
parent_class->update_initial_hw_address = update_initial_hw_address;
|
2012-09-27 12:12:15 -04:00
|
|
|
parent_class->get_generic_capabilities = get_generic_capabilities;
|
2013-06-13 15:13:58 -05:00
|
|
|
parent_class->bring_up = bring_up;
|
2013-09-03 14:03:52 -04:00
|
|
|
parent_class->act_stage1_prepare = act_stage1_prepare;
|
2013-09-08 13:39:03 -04:00
|
|
|
parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
|
|
|
|
|
parent_class->deactivate = deactivate;
|
2012-09-27 12:12:15 -04:00
|
|
|
|
|
|
|
|
parent_class->check_connection_compatible = check_connection_compatible;
|
|
|
|
|
parent_class->complete_connection = complete_connection;
|
2013-07-20 21:48:06 +02:00
|
|
|
parent_class->update_connection = update_connection;
|
2012-02-22 23:59:50 -06:00
|
|
|
|
|
|
|
|
/* properties */
|
2013-09-03 14:23:16 -04:00
|
|
|
g_object_class_install_property
|
|
|
|
|
(object_class, PROP_PARENT,
|
2014-06-09 16:17:37 -04:00
|
|
|
g_param_spec_object (NM_DEVICE_VLAN_PARENT, "", "",
|
2013-09-03 14:23:16 -04:00
|
|
|
NM_TYPE_DEVICE,
|
2014-06-09 16:17:37 -04:00
|
|
|
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
|
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
2012-02-22 23:59:50 -06:00
|
|
|
g_object_class_install_property
|
|
|
|
|
(object_class, PROP_VLAN_ID,
|
2014-06-09 16:17:37 -04:00
|
|
|
g_param_spec_uint (NM_DEVICE_VLAN_ID, "", "",
|
2012-02-22 23:59:50 -06:00
|
|
|
0, 4095, 0,
|
2014-06-09 16:17:37 -04:00
|
|
|
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
|
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
2012-02-22 23:59:50 -06:00
|
|
|
|
2013-05-07 12:18:41 -04:00
|
|
|
nm_dbus_manager_register_exported_type (nm_dbus_manager_get (),
|
|
|
|
|
G_TYPE_FROM_CLASS (klass),
|
|
|
|
|
&dbus_glib_nm_device_vlan_object_info);
|
2012-02-22 23:59:50 -06:00
|
|
|
|
|
|
|
|
dbus_g_error_domain_register (NM_VLAN_ERROR, NULL, NM_TYPE_VLAN_ERROR);
|
|
|
|
|
}
|