mirrors
/
gattlib
mirror of https://github.com/labapart/gattlib
1
0
Fork 0
Code Issues Releases Wiki Activity

dbus: Check the disconnection of the handler has really succeeded

pull/166/head
Olivier Martin 2020-04-08 13:24:32 +02:00 committed by Olivier Martin
parent 52f195f5c2
commit 7107d9f5b4
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dbus/gattlib.c
View File

@ -961,26 +961,36 @@ int gattlib_notification_start(gatt_connection_t* connection, const uuid_t* uuid
} }
int gattlib_notification_stop(gatt_connection_t* connection, const uuid_t* uuid) { int gattlib_notification_stop(gatt_connection_t* connection, const uuid_t* uuid) {
size_t count;
struct dbus_characteristic dbus_characteristic = get_characteristic_from_uuid(connection, uuid); struct dbus_characteristic dbus_characteristic = get_characteristic_from_uuid(connection, uuid);
if (dbus_characteristic.type == TYPE_NONE) { if (dbus_characteristic.type == TYPE_NONE) {
return GATTLIB_NOT_FOUND; return GATTLIB_NOT_FOUND;
} }
#if BLUEZ_VERSION > BLUEZ_VERSIONS(5, 40) #if BLUEZ_VERSION > BLUEZ_VERSIONS(5, 40)
else if (dbus_characteristic.type == TYPE_BATTERY_LEVEL) { else if (dbus_characteristic.type == TYPE_BATTERY_LEVEL) {
g_signal_handlers_disconnect_by_func( count = g_signal_handlers_disconnect_by_func(
dbus_characteristic.battery, dbus_characteristic.battery,
G_CALLBACK (on_handle_battery_level_property_change), G_CALLBACK (on_handle_battery_level_property_change),
connection); connection);
if (count == 0) {
fprintf(stderr, "Could not find any notification attached to this UUID");
return GATTLIB_NOT_FOUND;
}
return GATTLIB_SUCCESS; return GATTLIB_SUCCESS;
} else { } else {
assert(dbus_characteristic.type == TYPE_GATT); assert(dbus_characteristic.type == TYPE_GATT);
} }
#endif #endif
g_signal_handlers_disconnect_by_func( count = g_signal_handlers_disconnect_by_func(
dbus_characteristic.gatt, dbus_characteristic.gatt,
G_CALLBACK (on_handle_characteristic_property_change), G_CALLBACK (on_handle_characteristic_property_change),
connection); connection);
if (count == 0) {
fprintf(stderr, "Could not find any notification attached to this UUID");
return GATTLIB_NOT_FOUND;
}
GError *error = NULL; GError *error = NULL;
org_bluez_gatt_characteristic1_call_stop_notify_sync( org_bluez_gatt_characteristic1_call_stop_notify_sync(
@ -1033,26 +1043,36 @@ int gattlib_indication_start(gatt_connection_t* connection, const uuid_t* uuid)
} }
int gattlib_indication_stop(gatt_connection_t* connection, const uuid_t* uuid) { int gattlib_indication_stop(gatt_connection_t* connection, const uuid_t* uuid) {
size_t count;
struct dbus_characteristic dbus_characteristic = get_characteristic_from_uuid(connection, uuid); struct dbus_characteristic dbus_characteristic = get_characteristic_from_uuid(connection, uuid);
if (dbus_characteristic.type == TYPE_NONE) { if (dbus_characteristic.type == TYPE_NONE) {
return GATTLIB_NOT_FOUND; return GATTLIB_NOT_FOUND;
} }
#if BLUEZ_VERSION > BLUEZ_VERSIONS(5, 40) #if BLUEZ_VERSION > BLUEZ_VERSIONS(5, 40)
else if (dbus_characteristic.type == TYPE_BATTERY_LEVEL) { else if (dbus_characteristic.type == TYPE_BATTERY_LEVEL) {
g_signal_handlers_disconnect_by_func( count = g_signal_handlers_disconnect_by_func(
dbus_characteristic.battery, dbus_characteristic.battery,
G_CALLBACK (on_handle_battery_level_property_change), G_CALLBACK (on_handle_battery_level_property_change),
connection); connection);
if (count == 0) {
fprintf(stderr, "Could not find any notification attached to this UUID");
return GATTLIB_NOT_FOUND;
}
return GATTLIB_SUCCESS; return GATTLIB_SUCCESS;
} else { } else {
assert(dbus_characteristic.type == TYPE_GATT); assert(dbus_characteristic.type == TYPE_GATT);
} }
#endif #endif
g_signal_handlers_disconnect_by_func( count = g_signal_handlers_disconnect_by_func(
dbus_characteristic.gatt, dbus_characteristic.gatt,
G_CALLBACK (on_handle_characteristic_indication), G_CALLBACK (on_handle_characteristic_indication),
connection); connection);
if (count == 0) {
fprintf(stderr, "Could not find any notification attached to this UUID");
return GATTLIB_NOT_FOUND;
}
GError *error = NULL; GError *error = NULL;
org_bluez_gatt_characteristic1_call_stop_notify_sync( org_bluez_gatt_characteristic1_call_stop_notify_sync(