Merge pull request #10575 from paul-szczepanek-arm/CCC-writeback-fix

adbridge · web-flow · commit 8e44a75a7540 · 2019-05-15T12:06:58.000+01:00
BLE: fix CCC callback not being called when writing to a CCC
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp
@@ -510,7 +510,7 @@ ble_error_t GattServer::insert_descriptor(
 #endif // BLE_FEATURE_SECURITY
         }
 
-        if (properties & READ_PROPERTY) {
+        if (properties & READ_PROPERTY && !(attribute_it->settings & ATTS_SET_CCC)) {
             attribute_it->settings |= ATTS_SET_READ_CBACK;
         }
     }
@@ -543,7 +543,7 @@ ble_error_t GattServer::insert_descriptor(
 #endif // BLE_FEATURE_SECURITY
         }
 
-        if (properties & WRITABLE_PROPERTIES) {
+        if (properties & WRITABLE_PROPERTIES && !(attribute_it->settings & ATTS_SET_CCC)) {
             attribute_it->settings |= ATTS_SET_WRITE_CBACK;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ ble_error_t GattServer::insert_descriptor(`
`510`	`510`	`#endif // BLE_FEATURE_SECURITY`
`511`	`511`	`}`
`512`	`512`
`513`		`- if (properties & READ_PROPERTY) {`
	`513`	`+ if (properties & READ_PROPERTY && !(attribute_it->settings & ATTS_SET_CCC)) {`
`514`	`514`	`attribute_it->settings \|= ATTS_SET_READ_CBACK;`
`515`	`515`	`}`
`516`	`516`	`}`
`@@ -543,7 +543,7 @@ ble_error_t GattServer::insert_descriptor(`
`543`	`543`	`#endif // BLE_FEATURE_SECURITY`
`544`	`544`	`}`
`545`	`545`
`546`		`- if (properties & WRITABLE_PROPERTIES) {`
	`546`	`+ if (properties & WRITABLE_PROPERTIES && !(attribute_it->settings & ATTS_SET_CCC)) {`
`547`	`547`	`attribute_it->settings \|= ATTS_SET_WRITE_CBACK;`
`548`	`548`	`}`
`549`	`549`	`}`