fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: various fixes

Browse source 
Make stuff actually work this time around.
This commit is contained in:
Dan Williams 2009-05-13 22:54:13 -04:00
parent f4aa499c4c
commit 4d58683276
4 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bluez-manager/nm-bluez-adapter.c
View file

@ -129,8 +129,6 @@ device_initialized (NMBluezDevice *device, gboolean success, gpointer user_data)
if (!success) if (!success)
g_hash_table_remove (priv->devices, nm_bluez_device_get_path (device)); g_hash_table_remove (priv->devices, nm_bluez_device_get_path (device));
else
device_usable (device, NULL, self);
} }
static void static void

4
src/bluez-manager/nm-bluez-common.h
View file

@ -22,8 +22,8 @@
#define NM_BLUEZ_COMMON_H #define NM_BLUEZ_COMMON_H
enum { enum {
NM_BLUEZ_TYPE_DUN = 1 << 1, NM_BLUEZ_TYPE_DUN = 1 << 1,
NM_BLUEZ_TYPE_PANU = 1 << 2, NM_BLUEZ_TYPE_NAP = 1 << 2,
}; };
#define BLUEZ_SERVICE "org.bluez" #define BLUEZ_SERVICE "org.bluez"

47
src/bluez-manager/nm-bluez-device.c
View file

@ -40,7 +40,6 @@ typedef struct {
gboolean initialized; gboolean initialized;
gboolean usable; gboolean usable;
gboolean paired;
guint32 class; guint32 class;
char *address; char *address;
@ -57,7 +56,6 @@ enum {
PROP_NAME, PROP_NAME,
PROP_UUIDS, PROP_UUIDS,
PROP_RSSI, PROP_RSSI,
PROP_PAIRED,
PROP_USABLE, PROP_USABLE,
LAST_PROP LAST_PROP
@ -152,10 +150,28 @@ convert_uuids (const char **strings)
guint32 uuids = 0; guint32 uuids = 0;
for (iter = strings; iter && *iter; iter++) { for (iter = strings; iter && *iter; iter++) {
if (!strcmp (*iter, "DialupNetworking")) char **parts;
guint uuid16;
parts = g_strsplit (*iter, "-", -1);
if (parts == NULL || parts[0] == NULL) {
g_strfreev (parts);
continue;
}
uuid16 = g_ascii_strtoull (parts[0], NULL, 16);
g_strfreev (parts);
switch (uuid16) {
case 0x1103:
uuids |= NM_BLUEZ_TYPE_DUN; uuids |= NM_BLUEZ_TYPE_DUN;
else if (!strcmp (*iter, "PANU")) break;
uuids |= NM_BLUEZ_TYPE_PANU; case 0x1116:
uuids |= NM_BLUEZ_TYPE_NAP;
break;
default:
break;
}
} }
return uuids; return uuids;
@ -169,7 +185,6 @@ check_emit_usable (NMBluezDevice *self)
if ( priv->initialized if ( priv->initialized
&& priv->uuids && priv->uuids
&& is_phone_or_modem (priv->class) && is_phone_or_modem (priv->class)
&& priv->paired
&& priv->name && priv->name
&& priv->address) { && priv->address) {
if (!priv->usable) { if (!priv->usable) {
@ -195,7 +210,6 @@ property_changed (DBusGProxy *proxy,
const char *str; const char *str;
guint32 uint_val; guint32 uint_val;
gint int_val; gint int_val;
gboolean bool_val;
if (!strcmp (property, "Name")) { if (!strcmp (property, "Name")) {
str = g_value_get_string (value); str = g_value_get_string (value);
@ -205,14 +219,11 @@ property_changed (DBusGProxy *proxy,
g_free (priv->name); g_free (priv->name);
priv->name = str ? g_strdup (str) : NULL; priv->name = str ? g_strdup (str) : NULL;
g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_NAME); g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_NAME);
check_emit_usable (self);
} }
} else if (!strcmp (property, "Class")) { } else if (!strcmp (property, "Class")) {
uint_val = g_value_get_uint (value); uint_val = g_value_get_uint (value);
if (priv->class != uint_val) { if (priv->class != uint_val)
priv->class = uint_val; priv->class = uint_val;
check_emit_usable (self);
}
} else if (!strcmp (property, "RSSI")) { } else if (!strcmp (property, "RSSI")) {
int_val = g_value_get_int (value); int_val = g_value_get_int (value);
if (priv->rssi != int_val) { if (priv->rssi != int_val) {
@ -224,15 +235,10 @@ property_changed (DBusGProxy *proxy,
if (priv->uuids != uint_val) { if (priv->uuids != uint_val) {
priv->uuids = uint_val; priv->uuids = uint_val;
g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_UUIDS); g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_UUIDS);
check_emit_usable (self);
}
} else if (!strcmp (property, "Paired")) {
bool_val = g_value_get_boolean (value);
if (priv->paired != bool_val) {
priv->paired = bool_val;
check_emit_usable (self);
} }
} }
check_emit_usable (self);
} }
static void static void
@ -247,7 +253,7 @@ get_properties_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
if (!dbus_g_proxy_end_call (proxy, call, &err, if (!dbus_g_proxy_end_call (proxy, call, &err,
DBUS_TYPE_G_MAP_OF_VARIANT, &properties, DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
G_TYPE_INVALID)) { G_TYPE_INVALID)) {
nm_warning ("bluez error getting adapter properties: %s", nm_warning ("bluez error getting device properties: %s",
err && err->message ? err->message : "(unknown)"); err && err->message ? err->message : "(unknown)");
g_error_free (err); g_error_free (err);
g_signal_emit (self, signals[INITIALIZED], 0, FALSE); g_signal_emit (self, signals[INITIALIZED], 0, FALSE);
@ -371,9 +377,6 @@ get_property (GObject *object, guint prop_id,
case PROP_RSSI: case PROP_RSSI:
g_value_set_int (value, priv->rssi); g_value_set_int (value, priv->rssi);
break; break;
case PROP_PAIRED:
g_value_set_boolean (value, priv->paired);
break;
case PROP_USABLE: case PROP_USABLE:
g_value_set_boolean (value, priv->usable); g_value_set_boolean (value, priv->usable);
break; break;

6
src/nm-manager.c
View file

@ -1803,14 +1803,14 @@ bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr,
gpointer user_data) gpointer user_data)
{ {
gboolean has_dun = (uuids & NM_BLUEZ_TYPE_DUN); gboolean has_dun = (uuids & NM_BLUEZ_TYPE_DUN);
gboolean has_pan = (uuids & NM_BLUEZ_TYPE_PANU); gboolean has_nap = (uuids & NM_BLUEZ_TYPE_NAP);
g_message ("%s: BT device %s added (%s%s%s)", g_message ("%s: BT device %s added (%s%s%s)",
__func__, __func__,
bdaddr, bdaddr,
has_dun ? "DUN" : "", has_dun ? "DUN" : "",
has_dun ? " " : "", has_dun && has_nap ? " " : "",
has_pan ? "PANU" : ""); has_nap ? "NAP" : "");
} }
static void static void