Skip to content

Fix find info resp when called on non-descriptor attributes #148

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
Dec 14, 2020
Merged

Fix find info resp when called on non-descriptor attributes #148

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/local/BLELocalAttribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include "utility/BLEUuid.h"

#define BLE_ATTRIBUTE_TYPE_SIZE 2

enum BLEAttributeType {
BLETypeUnknown = 0x0000,

Expand Down
5 changes: 3 additions & 2 deletions src/utility/ATT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,8 @@ void ATTClass::findInfoReq(uint16_t connectionHandle, uint16_t mtu, uint8_t dlen
BLELocalAttribute* attribute = GATT.attribute(i);
uint16_t handle = (i + 1);
bool isValueHandle = (attribute->type() == BLETypeCharacteristic) && (((BLELocalCharacteristic*)attribute)->valueHandle() == handle);
int uuidLen = isValueHandle ? 2 : attribute->uuidLength();
bool isDescriptor = attribute->type() == BLETypeDescriptor;
int uuidLen = (isValueHandle || isDescriptor) ? attribute->uuidLength() : BLE_ATTRIBUTE_TYPE_SIZE;
int infoType = (uuidLen == 2) ? 0x01 : 0x02;

if (response[1] == 0) {
Expand All @@ -699,7 +700,7 @@ void ATTClass::findInfoReq(uint16_t connectionHandle, uint16_t mtu, uint8_t dlen
memcpy(&response[responseLength], &handle, sizeof(handle));
responseLength += sizeof(handle);

if (isValueHandle || attribute->type() == BLETypeDescriptor) {
if (isValueHandle || isDescriptor) {
// add the UUID
memcpy(&response[responseLength], attribute->uuidData(), uuidLen);
responseLength += uuidLen;
Expand Down