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

bluez: pass NMBluetoothCapabilities to nm_bluez_device

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2013-09-18 22:59:03 +02:00
parent 7aa5128b41
commit ed966c7e3f
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/bluez-manager/nm-bluez-device.c
View File

@@ -45,6 +45,7 @@ typedef struct {
gboolean initialized; gboolean initialized;
gboolean usable; gboolean usable;
NMBluetoothCapabilities connection_bt_type;
char *address; char *address;
guint8 bin_address[ETH_ALEN]; guint8 bin_address[ETH_ALEN];
@@ -252,14 +253,16 @@ cp_connections_loaded (NMConnectionProvider *provider, NMBluezDevice *self)
/***********************************************************/ /***********************************************************/
void void
nm_bluez_device_call_disconnect (NMBluezDevice *self, gboolean dun) nm_bluez_device_call_disconnect (NMBluezDevice *self)
{ {
NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self); NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
g_return_if_fail (priv->connection_bt_type == NM_BT_CAPABILITY_NAP || priv->connection_bt_type == NM_BT_CAPABILITY_DUN);
if (!priv->type_proxy) if (!priv->type_proxy)
return; return;
if (dun) { if (priv->connection_bt_type == NM_BT_CAPABILITY_DUN) {
/* Don't ever pass NULL through dbus; rfcomm_iface /* Don't ever pass NULL through dbus; rfcomm_iface
* might happen to be NULL for some reason. * might happen to be NULL for some reason.
*/ */
@@ -273,6 +276,7 @@ nm_bluez_device_call_disconnect (NMBluezDevice *self, gboolean dun)
} }
g_clear_object (&priv->type_proxy); g_clear_object (&priv->type_proxy);
priv->connection_bt_type = NM_BT_CAPABILITY_NONE;
} }
static void static void
@@ -306,7 +310,7 @@ bluez_connect_cb (DBusGProxy *proxy,
void void
nm_bluez_device_connect_async (NMBluezDevice *self, nm_bluez_device_connect_async (NMBluezDevice *self,
gboolean dun, NMBluetoothCapabilities connection_bt_type,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
@@ -314,6 +318,8 @@ nm_bluez_device_connect_async (NMBluezDevice *self,
NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self); NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
DBusGConnection *connection; DBusGConnection *connection;
g_return_if_fail (connection_bt_type == NM_BT_CAPABILITY_NAP || connection_bt_type == NM_BT_CAPABILITY_DUN);
connection = nm_dbus_manager_get_connection (nm_dbus_manager_get ()); connection = nm_dbus_manager_get_connection (nm_dbus_manager_get ());
simple = g_simple_async_result_new (G_OBJECT (self), simple = g_simple_async_result_new (G_OBJECT (self),
@@ -324,7 +330,7 @@ nm_bluez_device_connect_async (NMBluezDevice *self,
priv->type_proxy = dbus_g_proxy_new_for_name (connection, priv->type_proxy = dbus_g_proxy_new_for_name (connection,
BLUEZ_SERVICE, BLUEZ_SERVICE,
priv->path, priv->path,
dun ? BLUEZ_SERIAL_INTERFACE : BLUEZ_NETWORK_INTERFACE); connection_bt_type == NM_BT_CAPABILITY_DUN ? BLUEZ_SERIAL_INTERFACE : BLUEZ_NETWORK_INTERFACE);
if (!priv->type_proxy) if (!priv->type_proxy)
g_simple_async_report_error_in_idle (G_OBJECT (self), g_simple_async_report_error_in_idle (G_OBJECT (self),
callback, callback,
@@ -332,14 +338,17 @@ nm_bluez_device_connect_async (NMBluezDevice *self,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_FAILED, G_IO_ERROR_FAILED,
"Unable to create proxy"); "Unable to create proxy");
else else {
dbus_g_proxy_begin_call_with_timeout (priv->type_proxy, "Connect", dbus_g_proxy_begin_call_with_timeout (priv->type_proxy, "Connect",
bluez_connect_cb, bluez_connect_cb,
simple, simple,
NULL, NULL,
20000, 20000,
G_TYPE_STRING, dun ? BLUETOOTH_CONNECT_DUN : BLUETOOTH_CONNECT_NAP, G_TYPE_STRING,
connection_bt_type == NM_BT_CAPABILITY_DUN ? BLUETOOTH_CONNECT_DUN : BLUETOOTH_CONNECT_NAP,
G_TYPE_INVALID); G_TYPE_INVALID);
priv->connection_bt_type = connection_bt_type;
}
} }
const char * const char *

5
src/bluez-manager/nm-bluez-device.h
View File

@@ -80,7 +80,7 @@ gboolean nm_bluez_device_get_connected (NMBluezDevice *self);
void void
nm_bluez_device_connect_async (NMBluezDevice *self, nm_bluez_device_connect_async (NMBluezDevice *self,
gboolean dun, NMBluetoothCapabilities connection_bt_type,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
@@ -90,8 +90,7 @@ nm_bluez_device_connect_finish (NMBluezDevice *self,
GError **error); GError **error);
void void
nm_bluez_device_call_disconnect (NMBluezDevice *self, nm_bluez_device_call_disconnect (NMBluezDevice *self);
gboolean dun);
#endif /* NM_BLUEZ_DEVICE_H */ #endif /* NM_BLUEZ_DEVICE_H */

14
src/devices/nm-device-bt.c
View File

@@ -808,7 +808,6 @@ static NMActStageReturn
act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
{ {
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device); NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
gboolean dun = FALSE;
NMConnection *connection; NMConnection *connection;
connection = nm_device_get_connection (device); connection = nm_device_get_connection (device);
@@ -824,18 +823,13 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
return NM_ACT_STAGE_RETURN_FAILURE; return NM_ACT_STAGE_RETURN_FAILURE;
} }
if (priv->bt_type == NM_BT_CAPABILITY_DUN)
dun = TRUE;
else if (priv->bt_type == NM_BT_CAPABILITY_NAP)
dun = FALSE;
else
g_assert_not_reached ();
nm_log_dbg (LOGD_BT, "(%s): requesting connection to the device", nm_log_dbg (LOGD_BT, "(%s): requesting connection to the device",
nm_device_get_iface (device)); nm_device_get_iface (device));
/* Connect to the BT device */ /* Connect to the BT device */
nm_bluez_device_connect_async (priv->bt_device, dun, bluez_connect_cb, device); nm_bluez_device_connect_async (priv->bt_device,
priv->bt_type & (NM_BT_CAPABILITY_DUN | NM_BT_CAPABILITY_NAP),
bluez_connect_cb, device);
if (priv->timeout_id) if (priv->timeout_id)
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);
@@ -910,7 +904,7 @@ deactivate (NMDevice *device)
} }
} }
nm_bluez_device_call_disconnect (priv->bt_device, dun); nm_bluez_device_call_disconnect (priv->bt_device);
if (priv->timeout_id) { if (priv->timeout_id) {
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);