mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-15 22:29:58 +00:00
abdf9a3673
Branch f9b1bc16e9
added bluetooth NAP
support. A NAP connection is of connection.type "bluetooth", but it
also has a "bridge" setting. Also, it is primarily handled by NMDeviceBridge
and NMBridgeDeviceFactory (with help from NMBluezManager).
However, don't let nm_connection_get_connection_type() and
nm_connnection_is_type() lie about what the connection.type is.
The type is "bluetooth" for most purposes -- at least, as far as
the client is concerned (and the public API of libnm). This restores
previous API behavior, where nm_connection_get_connection_type()
and nm_connection_is_type() would be simple accessors to the
"connection.type" property.
Only a few places care about the bridge aspect, and those places need special
treatment. For example NMDeviceBridge needs to be fully aware that it can
handle bluetooth NAP connection. That is nothing new: if you handle a
connection of any type, you must know which fields matter and what they
mean. It's not enough that nm_connection_get_connection_type() for bluetooth
NAP connectins is claiming to be a bridge.
Counter examples, where the original behavior is right:
src/nm-manager.c- g_set_error (error,
src/nm-manager.c- NM_MANAGER_ERROR,
src/nm-manager.c- NM_MANAGER_ERROR_FAILED,
src/nm-manager.c- "NetworkManager plugin for '%s' unavailable",
src/nm-manager.c: nm_connection_get_connection_type (connection));
the correct message is: "no bluetooth plugin available", not "bridge".
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: if ( ( nm_connection_is_type (connection, NM_SETTING_WIRED_SETTING_NAME)
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: && !nm_connection_get_setting_pppoe (connection))
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: || nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME)
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: || nm_connection_is_type (connection, NM_SETTING_WIRELESS_SETTING_NAME)
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: || nm_connection_is_type (connection, NM_SETTING_INFINIBAND_SETTING_NAME)
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: || nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME)
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: || nm_connection_is_type (connection, NM_SETTING_TEAM_SETTING_NAME)
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c: || nm_connection_is_type (connection, NM_SETTING_BRIDGE_SETTING_NAME))
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c- return TRUE;
the correct behavior is for ifcfg-rh plugin to reject bluetooth NAP
connections, not proceed and store it.
305 lines
8.4 KiB
C
305 lines
8.4 KiB
C
/* -*- 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 2007 - 2008 Novell, Inc.
|
|
* Copyright 2007 - 2012 Red Hat, Inc.
|
|
*/
|
|
|
|
#include "nm-default.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include "nm-setting-connection.h"
|
|
#include "nm-setting-bluetooth.h"
|
|
#include "nm-utils.h"
|
|
|
|
#include "nm-device-bt.h"
|
|
#include "nm-object-private.h"
|
|
#include "nm-enum-types.h"
|
|
|
|
G_DEFINE_TYPE (NMDeviceBt, nm_device_bt, NM_TYPE_DEVICE)
|
|
|
|
#define NM_DEVICE_BT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_BT, NMDeviceBtPrivate))
|
|
|
|
typedef struct {
|
|
char *hw_address;
|
|
char *name;
|
|
guint32 bt_capabilities;
|
|
} NMDeviceBtPrivate;
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_HW_ADDRESS,
|
|
PROP_NAME,
|
|
PROP_BT_CAPABILITIES,
|
|
|
|
LAST_PROP
|
|
};
|
|
|
|
/**
|
|
* nm_device_bt_get_hw_address:
|
|
* @device: a #NMDeviceBt
|
|
*
|
|
* Gets the hardware (MAC) address of the #NMDeviceBt
|
|
*
|
|
* Returns: the hardware address. This is the internal string used by the
|
|
* device, and must not be modified.
|
|
**/
|
|
const char *
|
|
nm_device_bt_get_hw_address (NMDeviceBt *device)
|
|
{
|
|
g_return_val_if_fail (NM_IS_DEVICE_BT (device), NULL);
|
|
|
|
return nm_str_not_empty (NM_DEVICE_BT_GET_PRIVATE (device)->hw_address);
|
|
}
|
|
|
|
/**
|
|
* nm_device_bt_get_name:
|
|
* @device: a #NMDeviceBt
|
|
*
|
|
* Gets the name of the #NMDeviceBt.
|
|
*
|
|
* Returns: the name of the device
|
|
**/
|
|
const char *
|
|
nm_device_bt_get_name (NMDeviceBt *device)
|
|
{
|
|
g_return_val_if_fail (NM_IS_DEVICE_BT (device), NULL);
|
|
|
|
return NM_DEVICE_BT_GET_PRIVATE (device)->name;
|
|
}
|
|
|
|
/**
|
|
* nm_device_bt_get_capabilities:
|
|
* @device: a #NMDeviceBt
|
|
*
|
|
* Returns the Bluetooth device's usable capabilities.
|
|
*
|
|
* Returns: a combination of #NMBluetoothCapabilities
|
|
**/
|
|
NMBluetoothCapabilities
|
|
nm_device_bt_get_capabilities (NMDeviceBt *device)
|
|
{
|
|
g_return_val_if_fail (NM_IS_DEVICE_BT (device), NM_BT_CAPABILITY_NONE);
|
|
|
|
return NM_DEVICE_BT_GET_PRIVATE (device)->bt_capabilities;
|
|
}
|
|
|
|
static NMBluetoothCapabilities
|
|
get_connection_bt_type (NMConnection *connection)
|
|
{
|
|
NMSettingBluetooth *s_bt;
|
|
const char *bt_type;
|
|
|
|
s_bt = nm_connection_get_setting_bluetooth (connection);
|
|
if (!s_bt)
|
|
return NM_BT_CAPABILITY_NONE;
|
|
|
|
bt_type = nm_setting_bluetooth_get_connection_type (s_bt);
|
|
g_assert (bt_type);
|
|
|
|
if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_DUN))
|
|
return NM_BT_CAPABILITY_DUN;
|
|
else if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_PANU))
|
|
return NM_BT_CAPABILITY_NAP;
|
|
|
|
return NM_BT_CAPABILITY_NONE;
|
|
}
|
|
|
|
static gboolean
|
|
connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
|
|
{
|
|
NMSettingBluetooth *s_bt;
|
|
const char *hw_addr, *setting_addr;
|
|
NMBluetoothCapabilities dev_caps;
|
|
NMBluetoothCapabilities bt_type;
|
|
|
|
if (!NM_DEVICE_CLASS (nm_device_bt_parent_class)->connection_compatible (device, connection, error))
|
|
return FALSE;
|
|
|
|
if ( !nm_connection_is_type (connection, NM_SETTING_BLUETOOTH_SETTING_NAME)
|
|
|| !(s_bt = nm_connection_get_setting_bluetooth (connection))) {
|
|
g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
|
|
_("The connection was not a Bluetooth connection."));
|
|
return FALSE;
|
|
}
|
|
|
|
if (nm_streq0 (nm_setting_bluetooth_get_connection_type (s_bt), NM_SETTING_BLUETOOTH_TYPE_NAP)) {
|
|
g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
|
|
_("The connection is of Bluetooth NAP type."));
|
|
return FALSE;
|
|
}
|
|
|
|
/* Check BT address */
|
|
hw_addr = nm_device_bt_get_hw_address (NM_DEVICE_BT (device));
|
|
if (hw_addr) {
|
|
if (!nm_utils_hwaddr_valid (hw_addr, ETH_ALEN)) {
|
|
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
|
|
_("Invalid device Bluetooth address."));
|
|
return FALSE;
|
|
}
|
|
setting_addr = nm_setting_bluetooth_get_bdaddr (s_bt);
|
|
if (setting_addr && !nm_utils_hwaddr_matches (setting_addr, -1, hw_addr, -1)) {
|
|
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
|
|
_("The Bluetooth addresses of the device and the connection didn't match."));
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
dev_caps = nm_device_bt_get_capabilities (NM_DEVICE_BT (device));
|
|
bt_type = get_connection_bt_type (connection);
|
|
if (!(bt_type & dev_caps)) {
|
|
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
|
|
_("The device is lacking Bluetooth capabilities required by the connection."));
|
|
return FALSE;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static GType
|
|
get_setting_type (NMDevice *device)
|
|
{
|
|
return NM_TYPE_SETTING_BLUETOOTH;
|
|
}
|
|
|
|
static const char *
|
|
get_hw_address (NMDevice *device)
|
|
{
|
|
return nm_device_bt_get_hw_address (NM_DEVICE_BT (device));
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
static void
|
|
nm_device_bt_init (NMDeviceBt *device)
|
|
{
|
|
}
|
|
|
|
static void
|
|
init_dbus (NMObject *object)
|
|
{
|
|
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
|
|
const NMPropertiesInfo property_info[] = {
|
|
{ NM_DEVICE_BT_HW_ADDRESS, &priv->hw_address },
|
|
{ NM_DEVICE_BT_NAME, &priv->name },
|
|
{ NM_DEVICE_BT_CAPABILITIES, &priv->bt_capabilities },
|
|
{ NULL },
|
|
};
|
|
|
|
NM_OBJECT_CLASS (nm_device_bt_parent_class)->init_dbus (object);
|
|
|
|
_nm_object_register_properties (object,
|
|
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH,
|
|
property_info);
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
|
|
|
|
g_free (priv->hw_address);
|
|
g_free (priv->name);
|
|
|
|
G_OBJECT_CLASS (nm_device_bt_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object,
|
|
guint prop_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
NMDeviceBt *device = NM_DEVICE_BT (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_HW_ADDRESS:
|
|
g_value_set_string (value, nm_device_bt_get_hw_address (device));
|
|
break;
|
|
case PROP_NAME:
|
|
g_value_set_string (value, nm_device_bt_get_name (device));
|
|
break;
|
|
case PROP_BT_CAPABILITIES:
|
|
g_value_set_flags (value, nm_device_bt_get_capabilities (device));
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
nm_device_bt_class_init (NMDeviceBtClass *bt_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (bt_class);
|
|
NMObjectClass *nm_object_class = NM_OBJECT_CLASS (bt_class);
|
|
NMDeviceClass *device_class = NM_DEVICE_CLASS (bt_class);
|
|
|
|
g_type_class_add_private (bt_class, sizeof (NMDeviceBtPrivate));
|
|
|
|
/* 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 */
|
|
|
|
/**
|
|
* NMDeviceBt: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_BT_HW_ADDRESS, "", "",
|
|
NULL,
|
|
G_PARAM_READABLE |
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
/**
|
|
* NMDeviceBt:name:
|
|
*
|
|
* The name of the bluetooth device.
|
|
**/
|
|
g_object_class_install_property
|
|
(object_class, PROP_NAME,
|
|
g_param_spec_string (NM_DEVICE_BT_NAME, "", "",
|
|
NULL,
|
|
G_PARAM_READABLE |
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
/**
|
|
* NMDeviceBt:bt-capabilities:
|
|
*
|
|
* The device's bluetooth capabilities, a combination of #NMBluetoothCapabilities.
|
|
**/
|
|
g_object_class_install_property
|
|
(object_class, PROP_BT_CAPABILITIES,
|
|
g_param_spec_flags (NM_DEVICE_BT_CAPABILITIES, "", "",
|
|
NM_TYPE_BLUETOOTH_CAPABILITIES,
|
|
NM_BT_CAPABILITY_NONE,
|
|
G_PARAM_READABLE |
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
}
|