bluetooth: drop BlueZ 4 support (1)

BlueZ 5.0 was released in December 2012 and broke API with
BlueZ 4. NetworkManager supports Bluez 5 for years already.

Of course, version 4 is long gone by now, so remove it.
This commit is contained in:
Thomas Haller 2019-08-10 10:39:46 +02:00
parent abfc14f79b
commit 907ea97088
7 changed files with 3 additions and 944 deletions

View file

@ -3335,17 +3335,14 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
src/devices/bluetooth/nm-bluez-common.h \
src/devices/bluetooth/nm-bluez-device.c \
src/devices/bluetooth/nm-bluez-device.h \
src/devices/bluetooth/nm-bluez4-adapter.c \
src/devices/bluetooth/nm-bluez4-adapter.h \
src/devices/bluetooth/nm-bluez4-manager.c \
src/devices/bluetooth/nm-bluez4-manager.h \
src/devices/bluetooth/nm-bluez5-manager.c \
src/devices/bluetooth/nm-bluez5-manager.h \
src/devices/bluetooth/nm-bt-error.h \
src/devices/bluetooth/nm-bt-error.c \
\
src/devices/bluetooth/nm-device-bt.c \
src/devices/bluetooth/nm-device-bt.h
src/devices/bluetooth/nm-device-bt.h \
$(NULL)
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin)

View file

@ -1,8 +1,6 @@
sources = files(
'nm-bluez-device.c',
'nm-bluez-manager.c',
'nm-bluez4-adapter.c',
'nm-bluez4-manager.c',
'nm-bluez5-manager.c',
'nm-bt-error.c',
'nm-device-bt.c',

View file

@ -27,7 +27,6 @@
#include "devices/nm-device-bridge.h"
#include "nm-setting-bluetooth.h"
#include "settings/nm-settings.h"
#include "nm-bluez4-manager.h"
#include "nm-bluez5-manager.h"
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
@ -49,7 +48,6 @@ typedef struct {
int bluez_version;
NMSettings *settings;
NMBluez4Manager *manager4;
NMBluez5Manager *manager5;
guint watch_name_id;
@ -198,32 +196,13 @@ setup_version_number (NMBluezManager *self, int bluez_version)
cleanup_checking (self, TRUE);
}
static void
setup_bluez4 (NMBluezManager *self)
{
NMBluez4Manager *manager;
NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self);
g_return_if_fail (!priv->manager4 && !priv->manager5 && !priv->bluez_version);
setup_version_number (self, 4);
priv->manager4 = manager = nm_bluez4_manager_new (priv->settings);
g_signal_connect (manager,
NM_BLUEZ_MANAGER_BDADDR_ADDED,
G_CALLBACK (manager_bdaddr_added_cb),
self);
nm_bluez4_manager_query_devices (manager);
}
static void
setup_bluez5 (NMBluezManager *self)
{
NMBluez5Manager *manager;
NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self);
g_return_if_fail (!priv->manager4 && !priv->manager5 && !priv->bluez_version);
g_return_if_fail (!priv->manager5 && !priv->bluez_version);
setup_version_number (self, 5);
priv->manager5 = manager = nm_bluez5_manager_new (priv->settings);
@ -257,9 +236,6 @@ check_bluez_and_try_setup_final_step (NMBluezManager *self, int bluez_version, c
g_return_if_fail (!priv->bluez_version);
switch (bluez_version) {
case 4:
setup_bluez4 (self);
break;
case 5:
setup_bluez5 (self);
break;
@ -442,10 +418,6 @@ dispose (GObject *object)
NMBluezManager *self = NM_BLUEZ_MANAGER (object);
NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self);
if (priv->manager4) {
g_signal_handlers_disconnect_by_func (priv->manager4, manager_bdaddr_added_cb, self);
g_clear_object (&priv->manager4);
}
if (priv->manager5) {
g_signal_handlers_disconnect_by_data (priv->manager5, self);
g_clear_object (&priv->manager5);

View file

@ -1,456 +0,0 @@
/* 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 (C) 2009 - 2012 Red Hat, Inc.
*/
#include "nm-default.h"
#include "nm-bluez4-adapter.h"
#include "nm-dbus-interface.h"
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-core-internal.h"
#include "settings/nm-settings.h"
/*****************************************************************************/
NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_PATH,
PROP_ADDRESS,
);
enum {
INITIALIZED,
DEVICE_ADDED,
DEVICE_REMOVED,
LAST_SIGNAL,
};
static guint signals[LAST_SIGNAL] = { 0 };
typedef struct {
char *path;
GDBusProxy *proxy;
GCancellable *proxy_cancellable;
gboolean initialized;
char *address;
GHashTable *devices;
/* Cached for devices */
NMSettings *settings;
} NMBluez4AdapterPrivate;
struct _NMBluez4Adapter {
GObject parent;
NMBluez4AdapterPrivate _priv;
};
struct _NMBluez4AdapterClass {
GObjectClass parent;
};
G_DEFINE_TYPE (NMBluez4Adapter, nm_bluez4_adapter, G_TYPE_OBJECT)
#define NM_BLUEZ4_ADAPTER_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMBluez4Adapter, NM_IS_BLUEZ4_ADAPTER)
/*****************************************************************************/
#define _NMLOG_DOMAIN LOGD_BT
#define _NMLOG(level, ...) __NMLOG_DEFAULT (level, _NMLOG_DOMAIN, "bluez4-adapter", __VA_ARGS__)
/*****************************************************************************/
static void device_do_remove (NMBluez4Adapter *self, NMBluezDevice *device);
/*****************************************************************************/
const char *
nm_bluez4_adapter_get_path (NMBluez4Adapter *self)
{
g_return_val_if_fail (NM_IS_BLUEZ4_ADAPTER (self), NULL);
return NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->path;
}
const char *
nm_bluez4_adapter_get_address (NMBluez4Adapter *self)
{
g_return_val_if_fail (NM_IS_BLUEZ4_ADAPTER (self), NULL);
return NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->address;
}
gboolean
nm_bluez4_adapter_get_initialized (NMBluez4Adapter *self)
{
g_return_val_if_fail (NM_IS_BLUEZ4_ADAPTER (self), FALSE);
return NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->initialized;
}
GSList *
nm_bluez4_adapter_get_devices (NMBluez4Adapter *self)
{
GSList *devices = NULL;
GHashTableIter iter;
NMBluezDevice *device;
g_hash_table_iter_init (&iter, NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->devices);
while (g_hash_table_iter_next (&iter, NULL, (gpointer) &device)) {
if (nm_bluez_device_get_usable (device))
devices = g_slist_append (devices, device);
}
return devices;
}
static void
emit_device_removed (NMBluez4Adapter *self, NMBluezDevice *device)
{
_LOGD ("(%s): bluez device now unusable",
nm_bluez_device_get_path (device));
g_signal_emit (self, signals[DEVICE_REMOVED], 0, device);
}
static void
device_usable (NMBluezDevice *device, GParamSpec *pspec, gpointer user_data)
{
NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data);
if (nm_bluez_device_get_usable (device)) {
_LOGD ("(%s): bluez device now usable (device address is %s)",
nm_bluez_device_get_path (device),
nm_bluez_device_get_address (device));
g_signal_emit (self, signals[DEVICE_ADDED], 0, device);
} else
emit_device_removed (self, device);
}
static void
device_initialized (NMBluezDevice *device, gboolean success, gpointer user_data)
{
NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data);
_LOGD ("(%s): bluez device %s",
nm_bluez_device_get_path (device),
success ? "initialized" : "failed to initialize");
if (!success)
device_do_remove (self, device);
}
static void
device_do_remove (NMBluez4Adapter *self, NMBluezDevice *device)
{
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
if (g_hash_table_remove (priv->devices, nm_bluez_device_get_path (device))) {
g_signal_handlers_disconnect_by_func (device, G_CALLBACK (device_initialized), self);
g_signal_handlers_disconnect_by_func (device, G_CALLBACK (device_usable), self);
if (nm_bluez_device_get_usable (device))
emit_device_removed (self, device);
g_object_unref (device);
}
}
static void
device_created (GDBusProxy *proxy, const char *path, gpointer user_data)
{
NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data);
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
NMBluezDevice *device;
device = nm_bluez_device_new (path, priv->address, priv->settings, 4);
g_signal_connect (device, NM_BLUEZ_DEVICE_INITIALIZED, G_CALLBACK (device_initialized), self);
g_signal_connect (device, "notify::" NM_BLUEZ_DEVICE_USABLE, G_CALLBACK (device_usable), self);
g_hash_table_insert (priv->devices, (gpointer) nm_bluez_device_get_path (device), device);
_LOGD ("(%s): new bluez device found", path);
}
static void
device_removed (GDBusProxy *proxy, const char *path, gpointer user_data)
{
NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data);
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
NMBluezDevice *device;
_LOGD ("(%s): bluez device removed", path);
device = g_hash_table_lookup (priv->devices, path);
if (device)
device_do_remove (self, device);
}
static void
get_properties_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
{
NMBluez4Adapter *self;
NMBluez4AdapterPrivate *priv;
gs_free_error GError *error = NULL;
GVariant *ret, *properties;
char **devices;
int i;
ret = _nm_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), result,
G_VARIANT_TYPE ("(a{sv})"), &error);
if ( !ret
&& g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
self = NM_BLUEZ4_ADAPTER (user_data);
priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
g_clear_object (&priv->proxy_cancellable);
if (!ret) {
g_dbus_error_strip_remote_error (error);
_LOGW ("bluez error getting adapter properties: %s", error->message);
goto done;
}
properties = g_variant_get_child_value (ret, 0);
(void) g_variant_lookup (properties, "Address", "s", &priv->address);
if (g_variant_lookup (properties, "Devices", "^ao", &devices)) {
for (i = 0; devices[i]; i++)
device_created (priv->proxy, devices[i], self);
g_strfreev (devices);
}
g_variant_unref (properties);
g_variant_unref (ret);
priv->initialized = TRUE;
done:
g_signal_emit (self, signals[INITIALIZED], 0, priv->initialized);
}
static void
_proxy_new_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
NMBluez4Adapter *self;
NMBluez4AdapterPrivate *priv;
gs_free_error GError *error = NULL;
GDBusProxy *proxy;
proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
if ( !proxy
&& g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
self = user_data;
priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
if (!proxy) {
_LOGW ("bluez error creating D-Bus proxy: %s", error->message);
g_clear_object (&priv->proxy_cancellable);
g_signal_emit (self, signals[INITIALIZED], 0, priv->initialized);
return;
}
priv->proxy = proxy;
_nm_dbus_signal_connect (priv->proxy, "DeviceCreated", G_VARIANT_TYPE ("(o)"),
G_CALLBACK (device_created), self);
_nm_dbus_signal_connect (priv->proxy, "DeviceRemoved", G_VARIANT_TYPE ("(o)"),
G_CALLBACK (device_removed), self);
g_dbus_proxy_call (priv->proxy, "GetProperties",
NULL,
G_DBUS_CALL_FLAGS_NONE, -1,
priv->proxy_cancellable,
get_properties_cb,
self);
}
/*****************************************************************************/
static gboolean
_find_all (gpointer key, gpointer value, gpointer user_data)
{
return TRUE;
}
/*****************************************************************************/
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE ((NMBluez4Adapter *) object);
switch (prop_id) {
case PROP_PATH:
g_value_set_string (value, priv->path);
break;
case PROP_ADDRESS:
g_value_set_string (value, priv->address);
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)
{
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE ((NMBluez4Adapter *) object);
switch (prop_id) {
case PROP_PATH:
/* construct-only */
priv->path = g_value_dup_string (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
/*****************************************************************************/
static void
nm_bluez4_adapter_init (NMBluez4Adapter *self)
{
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
priv->devices = g_hash_table_new_full (nm_str_hash, g_str_equal,
NULL, NULL);
}
NMBluez4Adapter *
nm_bluez4_adapter_new (const char *path, NMSettings *settings)
{
NMBluez4Adapter *self;
NMBluez4AdapterPrivate *priv;
g_return_val_if_fail (NM_IS_SETTINGS (settings), NULL);
self = (NMBluez4Adapter *) g_object_new (NM_TYPE_BLUEZ4_ADAPTER,
NM_BLUEZ4_ADAPTER_PATH, path,
NULL);
priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
priv->settings = g_object_ref (settings);
priv->proxy_cancellable = g_cancellable_new ();
g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
NM_BLUEZ_SERVICE,
priv->path,
NM_BLUEZ4_ADAPTER_INTERFACE,
priv->proxy_cancellable,
_proxy_new_cb,
self);
return self;
}
static void
dispose (GObject *object)
{
NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (object);
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
NMBluezDevice *device;
nm_clear_g_cancellable (&priv->proxy_cancellable);
while ((device = g_hash_table_find (priv->devices, _find_all, NULL)))
device_do_remove (self, device);
if (priv->proxy) {
g_signal_handlers_disconnect_by_data (priv->proxy, self);
g_clear_object (&priv->proxy);
}
G_OBJECT_CLASS (nm_bluez4_adapter_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (object);
NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self);
g_hash_table_destroy (priv->devices);
g_free (priv->address);
g_free (priv->path);
G_OBJECT_CLASS (nm_bluez4_adapter_parent_class)->finalize (object);
g_object_unref (priv->settings);
}
static void
nm_bluez4_adapter_class_init (NMBluez4AdapterClass *config_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (config_class);
object_class->get_property = get_property;
object_class->set_property = set_property;
object_class->dispose = dispose;
object_class->finalize = finalize;
obj_properties[PROP_PATH] =
g_param_spec_string (NM_BLUEZ4_ADAPTER_PATH, "", "",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS);
obj_properties[PROP_ADDRESS] =
g_param_spec_string (NM_BLUEZ4_ADAPTER_ADDRESS, "", "",
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
signals[INITIALIZED] = g_signal_new (NM_BLUEZ4_ADAPTER_INITIALIZED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
signals[DEVICE_ADDED] = g_signal_new (NM_BLUEZ4_ADAPTER_DEVICE_ADDED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_OBJECT);
signals[DEVICE_REMOVED] = g_signal_new (NM_BLUEZ4_ADAPTER_DEVICE_REMOVED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_OBJECT);
}

View file

@ -1,57 +0,0 @@
/* 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 (C) 2009 - 2012 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_BLUEZ4_ADAPTER_H__
#define __NETWORKMANAGER_BLUEZ4_ADAPTER_H__
#include "nm-bluez-device.h"
#define NM_TYPE_BLUEZ4_ADAPTER (nm_bluez4_adapter_get_type ())
#define NM_BLUEZ4_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ4_ADAPTER, NMBluez4Adapter))
#define NM_BLUEZ4_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ4_ADAPTER, NMBluez4AdapterClass))
#define NM_IS_BLUEZ4_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ4_ADAPTER))
#define NM_IS_BLUEZ4_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ4_ADAPTER))
#define NM_BLUEZ4_ADAPTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ4_ADAPTER, NMBluez4AdapterClass))
/* Properties */
#define NM_BLUEZ4_ADAPTER_PATH "path"
#define NM_BLUEZ4_ADAPTER_ADDRESS "address"
/* Signals */
#define NM_BLUEZ4_ADAPTER_INITIALIZED "initialized"
#define NM_BLUEZ4_ADAPTER_DEVICE_ADDED "device-added"
#define NM_BLUEZ4_ADAPTER_DEVICE_REMOVED "device-removed"
typedef struct _NMBluez4Adapter NMBluez4Adapter;
typedef struct _NMBluez4AdapterClass NMBluez4AdapterClass;
GType nm_bluez4_adapter_get_type (void);
NMBluez4Adapter *nm_bluez4_adapter_new (const char *path,
NMSettings *settings);
const char *nm_bluez4_adapter_get_path (NMBluez4Adapter *self);
const char *nm_bluez4_adapter_get_address (NMBluez4Adapter *self);
gboolean nm_bluez4_adapter_get_initialized (NMBluez4Adapter *self);
GSList *nm_bluez4_adapter_get_devices (NMBluez4Adapter *self);
#endif /* __NETWORKMANAGER_BLUEZ4_ADAPTER_H__ */

View file

@ -1,355 +0,0 @@
/* 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 (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2013 Red Hat, Inc.
*/
#include "nm-default.h"
#include "nm-bluez4-manager.h"
#include <signal.h>
#include <stdlib.h>
#include "nm-bluez4-adapter.h"
#include "nm-bluez-common.h"
#include "nm-core-internal.h"
#include "settings/nm-settings.h"
/*****************************************************************************/
enum {
BDADDR_ADDED,
LAST_SIGNAL,
};
static guint signals[LAST_SIGNAL] = { 0 };
typedef struct {
gulong name_owner_changed_id;
NMSettings *settings;
GDBusProxy *proxy;
GCancellable *proxy_cancellable;
NMBluez4Adapter *adapter;
} NMBluez4ManagerPrivate;
struct _NMBluez4Manager {
GObject parent;
NMBluez4ManagerPrivate _priv;
};
struct _NMBluez4ManagerClass {
GObjectClass parent;
};
G_DEFINE_TYPE (NMBluez4Manager, nm_bluez4_manager, G_TYPE_OBJECT)
#define NM_BLUEZ4_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMBluez4Manager, NM_IS_BLUEZ4_MANAGER)
/*****************************************************************************/
#define _NMLOG_DOMAIN LOGD_BT
#define _NMLOG(level, ...) __NMLOG_DEFAULT (level, _NMLOG_DOMAIN, "bluez4-manager", __VA_ARGS__)
/*****************************************************************************/
static void
emit_bdaddr_added (NMBluez4Manager *self, NMBluezDevice *device)
{
g_signal_emit (self, signals[BDADDR_ADDED], 0,
device,
nm_bluez_device_get_address (device),
nm_bluez_device_get_name (device),
nm_bluez_device_get_path (device),
nm_bluez_device_get_capabilities (device));
}
void
nm_bluez4_manager_query_devices (NMBluez4Manager *self)
{
NMBluez4ManagerPrivate *priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
GSList *devices, *iter;
if (!priv->adapter)
return;
devices = nm_bluez4_adapter_get_devices (priv->adapter);
for (iter = devices; iter; iter = g_slist_next (iter))
emit_bdaddr_added (self, NM_BLUEZ_DEVICE (iter->data));
g_slist_free (devices);
}
static void
device_added (NMBluez4Adapter *adapter, NMBluezDevice *device, gpointer user_data)
{
emit_bdaddr_added (NM_BLUEZ4_MANAGER (user_data), device);
}
static void
device_removed (NMBluez4Adapter *adapter, NMBluezDevice *device, gpointer user_data)
{
/* Re-emit the signal on the device for now; flatten this later */
g_signal_emit_by_name (device, NM_BLUEZ_DEVICE_REMOVED);
}
static void
adapter_initialized (NMBluez4Adapter *adapter, gboolean success, gpointer user_data)
{
NMBluez4Manager *self = NM_BLUEZ4_MANAGER (user_data);
NMBluez4ManagerPrivate *priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
if (success) {
GSList *devices, *iter;
devices = nm_bluez4_adapter_get_devices (adapter);
for (iter = devices; iter; iter = g_slist_next (iter))
emit_bdaddr_added (self, NM_BLUEZ_DEVICE (iter->data));
g_slist_free (devices);
g_signal_connect (adapter, NM_BLUEZ4_ADAPTER_DEVICE_ADDED,
G_CALLBACK (device_added), self);
g_signal_connect (adapter, NM_BLUEZ4_ADAPTER_DEVICE_REMOVED,
G_CALLBACK (device_removed), self);
} else {
g_object_unref (priv->adapter);
priv->adapter = NULL;
}
}
static void
adapter_removed (GDBusProxy *proxy, const char *path, NMBluez4Manager *self)
{
NMBluez4ManagerPrivate *priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
if (priv->adapter && !strcmp (path, nm_bluez4_adapter_get_path (priv->adapter))) {
if (nm_bluez4_adapter_get_initialized (priv->adapter)) {
GSList *devices, *iter;
devices = nm_bluez4_adapter_get_devices (priv->adapter);
for (iter = devices; iter; iter = g_slist_next (iter))
g_signal_emit_by_name (NM_BLUEZ_DEVICE (iter->data), NM_BLUEZ_DEVICE_REMOVED);
g_slist_free (devices);
}
g_object_unref (priv->adapter);
priv->adapter = NULL;
}
}
static void
default_adapter_changed (GDBusProxy *proxy, const char *path, NMBluez4Manager *self)
{
NMBluez4ManagerPrivate *priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
const char *cur_path = NULL;
if (priv->adapter)
cur_path = nm_bluez4_adapter_get_path (priv->adapter);
if (cur_path) {
if (!path || strcmp (path, cur_path)) {
/* Default adapter changed */
adapter_removed (priv->proxy, cur_path, self);
} else {
/* This adapter is already the default */
return;
}
}
/* Add the new default adapter */
if (path) {
priv->adapter = nm_bluez4_adapter_new (path, priv->settings);
g_signal_connect (priv->adapter, NM_BLUEZ4_ADAPTER_INITIALIZED,
G_CALLBACK (adapter_initialized), self);
}
}
static void
default_adapter_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
{
NMBluez4Manager *self;
NMBluez4ManagerPrivate *priv;
gs_unref_variant GVariant *ret = NULL;
gs_free_error GError *error = NULL;
const char *default_adapter;
ret = _nm_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), result,
G_VARIANT_TYPE ("(o)"), &error);
if ( !ret
&& g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
self = NM_BLUEZ4_MANAGER (user_data);
priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
g_clear_object (&priv->proxy_cancellable);
if (!ret) {
/* Ignore "No such adapter" errors; just means bluetooth isn't active */
if ( !_nm_dbus_error_has_name (error, "org.bluez.Error.NoSuchAdapter")
&& !_nm_dbus_error_has_name (error, "org.freedesktop.systemd1.LoadFailed")
&& !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)) {
g_dbus_error_strip_remote_error (error);
_LOGW ("bluez error getting default adapter: %s",
error->message);
}
return;
}
g_variant_get (ret, "(&o)", &default_adapter);
default_adapter_changed (priv->proxy, default_adapter, self);
}
static void
name_owner_changed (NMBluez4Manager *self)
{
NMBluez4ManagerPrivate *priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
gs_free char *owner = NULL;
nm_clear_g_cancellable (&priv->proxy_cancellable);
owner = g_dbus_proxy_get_name_owner (priv->proxy);
if (!owner) {
/* Throwing away the adapter removes all devices too */
g_clear_object (&priv->adapter);
return;
}
priv->proxy_cancellable = g_cancellable_new ();
g_dbus_proxy_call (priv->proxy, "DefaultAdapter",
NULL,
G_DBUS_CALL_FLAGS_NONE, -1,
priv->proxy_cancellable,
default_adapter_cb,
self);
}
static void
name_owner_changed_cb (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
name_owner_changed (user_data);
}
static void
_proxy_new_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
NMBluez4Manager *self;
NMBluez4ManagerPrivate *priv;
gs_free_error GError *error = NULL;
GDBusProxy *proxy;
proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
if ( !proxy
&& g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
self = user_data;
priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
if (!proxy) {
_LOGW ("bluez error creating D-Bus proxy: %s", error->message);
g_clear_object (&priv->proxy_cancellable);
return;
}
priv->proxy = proxy;
_nm_dbus_signal_connect (priv->proxy, "AdapterRemoved", G_VARIANT_TYPE ("(o)"),
G_CALLBACK (adapter_removed), self);
_nm_dbus_signal_connect (priv->proxy, "DefaultAdapterChanged", G_VARIANT_TYPE ("(o)"),
G_CALLBACK (default_adapter_changed), self);
g_signal_connect (priv->proxy, "notify::g-name-owner",
G_CALLBACK (name_owner_changed_cb), self);
name_owner_changed (self);
}
/*****************************************************************************/
static void
nm_bluez4_manager_init (NMBluez4Manager *self)
{
NMBluez4ManagerPrivate *priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
priv->proxy_cancellable = g_cancellable_new ();
g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
NM_BLUEZ_SERVICE,
NM_BLUEZ_MANAGER_PATH,
NM_BLUEZ4_MANAGER_INTERFACE,
priv->proxy_cancellable,
_proxy_new_cb,
self);
}
NMBluez4Manager *
nm_bluez4_manager_new (NMSettings *settings)
{
NMBluez4Manager *instance;
g_return_val_if_fail (NM_IS_SETTINGS (settings), NULL);
instance = g_object_new (NM_TYPE_BLUEZ4_MANAGER, NULL);
NM_BLUEZ4_MANAGER_GET_PRIVATE (instance)->settings = g_object_ref (settings);
return instance;
}
static void
dispose (GObject *object)
{
NMBluez4Manager *self = NM_BLUEZ4_MANAGER (object);
NMBluez4ManagerPrivate *priv = NM_BLUEZ4_MANAGER_GET_PRIVATE (self);
nm_clear_g_cancellable (&priv->proxy_cancellable);
if (priv->proxy) {
g_signal_handlers_disconnect_by_data (priv->proxy, self);
g_clear_object (&priv->proxy);
}
g_clear_object (&priv->adapter);
G_OBJECT_CLASS (nm_bluez4_manager_parent_class)->dispose (object);
g_clear_object (&priv->settings);
}
static void
nm_bluez4_manager_class_init (NMBluez4ManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = dispose;
signals[BDADDR_ADDED] =
g_signal_new (NM_BLUEZ_MANAGER_BDADDR_ADDED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
0, NULL, NULL, NULL,
G_TYPE_NONE, 5, G_TYPE_OBJECT, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
}

View file

@ -1,40 +0,0 @@
/* 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 (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2013 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_BLUEZ4_MANAGER_H__
#define __NETWORKMANAGER_BLUEZ4_MANAGER_H__
#define NM_TYPE_BLUEZ4_MANAGER (nm_bluez4_manager_get_type ())
#define NM_BLUEZ4_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ4_MANAGER, NMBluez4Manager))
#define NM_BLUEZ4_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ4_MANAGER, NMBluez4ManagerClass))
#define NM_IS_BLUEZ4_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ4_MANAGER))
#define NM_IS_BLUEZ4_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ4_MANAGER))
#define NM_BLUEZ4_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ4_MANAGER, NMBluez4ManagerClass))
typedef struct _NMBluez4Manager NMBluez4Manager;
typedef struct _NMBluez4ManagerClass NMBluez4ManagerClass;
GType nm_bluez4_manager_get_type (void);
NMBluez4Manager *nm_bluez4_manager_new (NMSettings *settings);
void nm_bluez4_manager_query_devices (NMBluez4Manager *manager);
#endif /* __NETWORKMANAGER_BLUEZ4_MANAGER_H__ */