colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bluetooth: minor cleanup for device connect

Browse Source
This commit is contained in:
Dan Williams
2010-01-27 17:28:35 -08:00
parent 4e5539c895
commit 75898f075b
1 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/nm-device-bt.c
View File

@@ -567,6 +567,7 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
NMActRequest *req; NMActRequest *req;
NMDBusManager *dbus_mgr; NMDBusManager *dbus_mgr;
DBusGConnection *g_connection; DBusGConnection *g_connection;
gboolean dun = FALSE;
req = nm_device_get_act_request (device); req = nm_device_get_act_request (device);
g_assert (req); g_assert (req);
@@ -581,43 +582,31 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
g_connection = nm_dbus_manager_get_connection (dbus_mgr); g_connection = nm_dbus_manager_get_connection (dbus_mgr);
g_object_unref (dbus_mgr); g_object_unref (dbus_mgr);
if (priv->bt_type == NM_BT_CAPABILITY_DUN) { if (priv->bt_type == NM_BT_CAPABILITY_DUN)
priv->type_proxy = dbus_g_proxy_new_for_name (g_connection, dun = TRUE;
BLUEZ_SERVICE, else if (priv->bt_type == NM_BT_CAPABILITY_NAP)
nm_device_get_udi (device), dun = FALSE;
BLUEZ_SERIAL_INTERFACE); else
if (!priv->type_proxy) {
// FIXME: set a reason code
return NM_ACT_STAGE_RETURN_FAILURE;
}
dbus_g_proxy_begin_call_with_timeout (priv->type_proxy, "Connect",
nm_device_bt_connect_cb,
device,
NULL,
20000,
G_TYPE_STRING, BLUETOOTH_DUN_UUID,
G_TYPE_INVALID);
} else if (priv->bt_type == NM_BT_CAPABILITY_NAP) {
priv->type_proxy = dbus_g_proxy_new_for_name (g_connection,
BLUEZ_SERVICE,
nm_device_get_udi (device),
BLUEZ_NETWORK_INTERFACE);
if (!priv->type_proxy) {
// FIXME: set a reason code
return NM_ACT_STAGE_RETURN_FAILURE;
}
dbus_g_proxy_begin_call_with_timeout (priv->type_proxy, "Connect",
nm_device_bt_connect_cb,
device,
NULL,
20000,
G_TYPE_STRING, BLUETOOTH_NAP_UUID,
G_TYPE_INVALID);
} else
g_assert_not_reached (); g_assert_not_reached ();
priv->type_proxy = dbus_g_proxy_new_for_name (g_connection,
BLUEZ_SERVICE,
nm_device_get_udi (device),
dun ? BLUEZ_SERIAL_INTERFACE : BLUEZ_NETWORK_INTERFACE);
if (!priv->type_proxy) {
// FIXME: set a reason code
return NM_ACT_STAGE_RETURN_FAILURE;
}
/* Connect to the BT device */
dbus_g_proxy_begin_call_with_timeout (priv->type_proxy, "Connect",
nm_device_bt_connect_cb,
device,
NULL,
20000,
G_TYPE_STRING, dun ? BLUETOOTH_DUN_UUID : BLUETOOTH_NAP_UUID,
G_TYPE_INVALID);
/* Watch for BT device property changes */ /* Watch for BT device property changes */
dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED, dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED,
G_TYPE_NONE, G_TYPE_NONE,