Skip to content

BLE:Cordio:Fix insert characteristic not handle error #9921

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

Merged
merged 1 commit into from
Mar 17, 2019
Merged

BLE:Cordio:Fix insert characteristic not handle error #9921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,22 +196,32 @@ ble_error_t GattServer::insert_characteristic(

// Create Characteristic Declaration Attribute
insert_characteristic_declaration_attribute(characteristic, attribute_it);
insert_characteristic_value_attribute(characteristic, attribute_it);
ble_error_t err = insert_characteristic_value_attribute(characteristic, attribute_it);
if (err) {
return err;
}


// insert descriptors
bool cccd_created = false;
for (size_t i = 0; i < characteristic->getDescriptorCount(); i++) {
insert_descriptor(
err = insert_descriptor(
characteristic,
characteristic->getDescriptor(i),
attribute_it,
cccd_created
);
if (err) {
return err;
}
}

// insert implicit CCCD
if ((properties & UPDATE_PROPERTIES) && (cccd_created == false)) {
insert_cccd(characteristic, attribute_it);
err = insert_cccd(characteristic, attribute_it);
if (err) {
return err;
}
}

return BLE_ERROR_NONE;
Expand Down