Skip to content

Restyle [linux] Make BLE connection retry on SW connection abort error #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
restyled-io wants to merge 2 commits into from
Closed

Restyle [linux] Make BLE connection retry on SW connection abort error #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9e6d3
[linux] Make BLE connection retry on SW connection abort error
LuDuda May 8, 2022
bdb46c2
Restyled by clang-format
restyled-commits May 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/platform/Linux/bluez/Helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1740,15 +1740,35 @@ struct ConnectParams
BluezEndpoint * mEndpoint;
};

static void ConnectDeviceDone(GObject * aObject, GAsyncResult * aResult, gpointer)
static void ConnectDeviceDone(GObject * aObject, GAsyncResult * aResult, gpointer apEndpoint)
{
BluezDevice1 * device = BLUEZ_DEVICE1(aObject);
GError * error = nullptr;
gboolean success = bluez_device1_call_connect_finish(device, aResult, &error);

if (!success)
{
ChipLogError(DeviceLayer, "FAIL: ConnectDevice : %s", error->message);
ChipLogError(DeviceLayer, "FAIL: ConnectDevice : %s (%d)", error->message, error->code);

// Due to radio interferences or Wi-Fi coexistence, sometimes the BLE connection may not be
// established (e.g. Connection Indication Packet is missed by BLE peripheral). In such case,
// BlueZ returns "Software caused connection abort error", and we should make a connection retry.
// It's important to make sure that the connection is correctly ceased, by calling `Disconnect()`
// D-Bus method, or else `Connect()` returns immediately without any effect.
// Note that still there is a global timeout that applies, so there is no need to limit retries.
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_DBUS_ERROR) && strstr(error->message, "Software caused connection abort"))
{
BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apEndpoint);
assert(endpoint != nullptr);

// Clear the error before another call.
g_clear_error(&error);

bluez_device1_call_disconnect_sync(device, NULL, &error);
bluez_device1_call_connect(device, endpoint->mpConnectCancellable, ConnectDeviceDone, endpoint);
ExitNow();
}

BLEManagerImpl::HandleConnectFailed(CHIP_ERROR_INTERNAL);
ExitNow();
}
Expand All @@ -1769,7 +1789,7 @@ static gboolean ConnectDeviceImpl(ConnectParams * apParams)
assert(endpoint != nullptr);

g_cancellable_reset(endpoint->mpConnectCancellable);
bluez_device1_call_connect(device, endpoint->mpConnectCancellable, ConnectDeviceDone, nullptr);
bluez_device1_call_connect(device, endpoint->mpConnectCancellable, ConnectDeviceDone, endpoint);
g_object_unref(device);
chip::Platform::Delete(apParams);

Expand Down