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

bluetooth: fix race condition causing NAP connections to fail (rh #572340)

Browse source 
The race would start DHCP before we had the BNEP interface from
bluez, causing the wrong interface name to be used.
This commit is contained in:
Dan Williams 2010-03-23 22:51:19 -07:00
parent b7d21eba69
commit 35e5656e65
1 changed files with 60 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/nm-device-bt.c
View file

@ -51,6 +51,9 @@ typedef struct {
char *name; char *name;
guint32 capabilities; guint32 capabilities;
gboolean connected;
gboolean have_iface;
DBusGProxy *type_proxy; DBusGProxy *type_proxy;
DBusGProxy *dev_proxy; DBusGProxy *dev_proxy;
@ -535,6 +538,53 @@ nm_device_bt_modem_removed (NMDeviceBt *self, NMModem *modem)
return TRUE; return TRUE;
} }
static gboolean
modem_find_timeout (gpointer user_data)
{
NMDeviceBt *self = NM_DEVICE_BT (user_data);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
priv->timeout_id = 0;
nm_device_state_changed (NM_DEVICE (user_data),
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND);
return FALSE;
}
static void
check_connect_continue (NMDeviceBt *self)
{
NMDevice *device = NM_DEVICE (self);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
gboolean pan = (priv->bt_type == NM_BT_CAPABILITY_NAP);
gboolean dun = (priv->bt_type == NM_BT_CAPABILITY_DUN);
if (!priv->connected || !priv->have_iface)
return;
nm_info ("Activation (%s %s/bluetooth) Stage 2 of 5 (Device Configure) "
"successful. Will connect via %s.",
nm_device_get_iface (device),
nm_device_get_ip_iface (device),
dun ? "DUN" : (pan ? "PAN" : "unknown"));
if (pan) {
/* Bluez says we're connected now. Start IP config. */
nm_device_activate_schedule_stage3_ip_config_start (device);
} else if (dun) {
/* Wait for ModemManager to find the modem */
if (priv->timeout_id)
g_source_remove (priv->timeout_id);
priv->timeout_id = g_timeout_add_seconds (20, modem_find_timeout, self);
nm_info ("Activation (%s/bluetooth) Stage 2 of 5 (Device Configure) "
"waiting for modem to appear.",
nm_device_get_iface (device));
} else
g_assert_not_reached ();
}
static void static void
bluez_connect_cb (DBusGProxy *proxy, bluez_connect_cb (DBusGProxy *proxy,
DBusGProxyCall *call_id, DBusGProxyCall *call_id,
@ -573,20 +623,8 @@ bluez_connect_cb (DBusGProxy *proxy,
} }
/* Stage 3 gets scheduled when Bluez says we're connected */ /* Stage 3 gets scheduled when Bluez says we're connected */
} priv->have_iface = TRUE;
check_connect_continue (self);
static gboolean
modem_find_timeout (gpointer user_data)
{
NMDeviceBt *self = NM_DEVICE_BT (user_data);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
priv->timeout_id = 0;
nm_device_state_changed (NM_DEVICE (user_data),
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND);
return FALSE;
} }
static void static void
@ -608,28 +646,8 @@ bluez_property_changed (DBusGProxy *proxy,
connected = g_value_get_boolean (value); connected = g_value_get_boolean (value);
if (connected) { if (connected) {
if (state == NM_DEVICE_STATE_CONFIG) { if (state == NM_DEVICE_STATE_CONFIG) {
gboolean pan = (priv->bt_type == NM_BT_CAPABILITY_NAP); priv->connected = TRUE;
gboolean dun = (priv->bt_type == NM_BT_CAPABILITY_DUN); check_connect_continue (self);
nm_info ("Activation (%s/bluetooth) Stage 2 of 5 (Device Configure) "
"successful. Will connect via %s.",
nm_device_get_iface (device),
dun ? "DUN" : (pan ? "PAN" : "unknown"));
if (pan) {
/* Bluez says we're connected now. Start IP config. */
nm_device_activate_schedule_stage3_ip_config_start (device);
} else if (dun) {
/* Wait for ModemManager to find the modem */
if (priv->timeout_id)
g_source_remove (priv->timeout_id);
priv->timeout_id = g_timeout_add_seconds (20, modem_find_timeout, self);
nm_info ("Activation (%s/bluetooth) Stage 2 of 5 (Device Configure) "
"waiting for modem to appear.",
nm_device_get_iface (device));
} else
g_assert_not_reached ();
} }
} else { } else {
gboolean fail = FALSE; gboolean fail = FALSE;
@ -645,8 +663,10 @@ bluez_property_changed (DBusGProxy *proxy,
fail = TRUE; fail = TRUE;
} }
if (fail) if (fail) {
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_CARRIER); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_CARRIER);
priv->connected = FALSE;
}
} }
} }
@ -761,6 +781,9 @@ real_deactivate_quickly (NMDevice *device)
{ {
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device); NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
priv->have_iface = FALSE;
priv->connected = FALSE;
if (priv->bt_type == NM_BT_CAPABILITY_DUN) { if (priv->bt_type == NM_BT_CAPABILITY_DUN) {
if (priv->modem) { if (priv->modem) {