Skip to content

Cressi GOA: cap BLE read target to remaining bytes on last packet #126

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

Closed
mikeller wants to merge 1 commit into from
+12 −2
Closed

Cressi GOA: cap BLE read target to remaining bytes on last packet #126

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
14 changes: 12 additions & 2 deletions src/cressi_goa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,20 @@ cressi_goa_device_download (cressi_goa_device_t *device, dc_buffer_t *buffer, dc

if (transport == DC_TRANSPORT_BLE) {
// Read the data packet.
// On the first outer iteration (nbytes == 0) size has not yet been
// updated from the packet header, so always read a full SZ_DATA
// block. On subsequent iterations cap the target to the number of
// remaining bytes so the BLE layer is not asked to read past the
// last partial packet into the 16-byte EOT end-of-transfer marker.
unsigned int target = SZ_DATA;
if (nbytes > 0 && (size - nbytes) < SZ_DATA) {
target = size - nbytes;
}

unsigned int packetsize = 0;
while (packetsize < SZ_DATA) {
while (packetsize < target) {
size_t len = 0;
status = dc_iostream_read (device->iostream, packet + 3 + packetsize, SZ_DATA - packetsize, &len);
status = dc_iostream_read (device->iostream, packet + 3 + packetsize, target - packetsize, &len);
if (status != DC_STATUS_SUCCESS) {
ERROR (abstract->context, "Failed to receive the answer.");
return status;
Expand Down