Copy data from read auth callback

pull/14625/head
Paul Szczepanek 2021-05-05 14:31:35 +01:00
parent 376fda5bf5
commit 55ffb176d5
2 changed files with 34 additions and 8 deletions

View File

@ -1672,19 +1672,26 @@ public:
*
* @attention This function is not meant to be called by user code.
*
* @param[in] params Context of the read-auth request; it contains an
* @param[in,out] params Context of the read-auth request; it contains an
* out-parameter used as a reply and the handler can fill it with outgoing
* data.
* data. The params->data provides a pointer to the data and params->len
* provides the length of this data. params->len is also used to pass the
* maximum size of data that the params->data can contain. If you set the
* params->len to a value larger than the passed in value the read operation
* will fail.
*
* @return A GattAuthCallbackReply_t value indicating whether authorization
* is granted.
*
* @note If the read is approved, the event handler can specify an outgoing
* value directly with the help of the fields params->data and params->len.
*
* @note If the read request is approved and params->data remains nullptr, then
* the current characteristic value is used in the read response payload.
*
* @note If the read is approved, the event handler can specify an outgoing
* value directly with the help of the fields
* GattReadAuthCallbackParams::data and GattReadAuthCallbackParams::len.
* @note The params->len parameter initially contains the maximum length of
* data that can be returned. Set it to the length of your data but it must
* not be larger than the original value.
*/
GattAuthCallbackReply_t authorizeRead(GattReadAuthCallbackParams *params)
{

View File

@ -1130,7 +1130,7 @@ uint8_t GattServer::atts_read_cb(
connId,
handle,
offset,
/* len */ 0,
/* len */ pAttr->maxLen,
/* data */ nullptr,
AUTH_CALLBACK_REPLY_SUCCESS
};
@ -1146,8 +1146,27 @@ uint8_t GattServer::atts_read_cb(
return read_auth_params.authorizationReply & 0xFF;
}
pAttr->pValue = read_auth_params.data;
*pAttr->pLen = read_auth_params.len;
/* if new data provided copy into the attribute value buffer */
if (read_auth_params.data) {
if (read_auth_params.offset + read_auth_params.len > pAttr->maxLen) {
tr_error("Read authorisation callback set length larger than maximum attribute length. Cannot copy data");
GattReadCallbackParams read_params = {
connId,
handle,
offset,
read_auth_params.len,
read_auth_params.data,
BLE_ERROR_INVALID_PARAM,
};
getInstance().handleDataReadEvent(&read_params);
return ATT_ERR_UNLIKELY;
}
memcpy(pAttr->pValue + read_auth_params.offset, read_auth_params.data, read_auth_params.len);
*pAttr->pLen = read_auth_params.len;
}
}
tr_debug("Read attribute %d on connection %d - value=%s",