Skip to content

make MQTT read more robust, more tolerant parsing in getFileContent #21

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 7 commits into from
May 18, 2022
Merged

make MQTT read more robust, more tolerant parsing in getFileContent #21

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
893fc5f
allow begin to be outside the libray
mazgch May 6, 2022
cdef232
better parsing of response
mazgch May 8, 2022
febfd29
less baud rates
mazgch May 10, 2022
2cbe2fb
clarify comments
mazgch May 10, 2022
c1ed11d
Update SparkFun_u-blox_SARA-R5_Arduino_Library.h
mazgch May 10, 2022
2a1eeb2
Update SparkFun_u-blox_SARA-R5_Arduino_Library.cpp
mazgch May 10, 2022
c0ffe28
Update SparkFun_u-blox_SARA-R5_Arduino_Library.cpp
mazgch May 10, 2022
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
38 changes: 27 additions & 11 deletions src/SparkFun_u-blox_SARA-R5_Arduino_Library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4143,21 +4143,37 @@ SARA_R5_error_t SARA_R5::readMQTT(int* pQos, String* pTopic, uint8_t *readDest,
free(response);
return SARA_R5_ERROR_UNEXPECTED_RESPONSE;
}

err = SARA_R5_ERROR_SUCCESS;
searchPtr = strstr(searchPtr, "\"");
if (pTopic) {
searchPtr[topic_length+1] = '\0'; // zero terminate
*pTopic = searchPtr+1;
searchPtr[topic_length+1] = '\"'; // restore
}
searchPtr = strstr(searchPtr + topic_length + 2, "\"");
if (readDest) {
*bytesRead = (data_length > readLength) ? readLength : data_length;
memcpy(readDest, searchPtr+1, *bytesRead);
if (searchPtr!= NULL) {
if (pTopic) {
searchPtr[topic_length + 1] = '\0'; // zero terminate
*pTopic = searchPtr + 1;
searchPtr[topic_length + 1] = '\"'; // restore
}
searchPtr = strstr(searchPtr + topic_length + 2, "\"");
if (readDest && (searchPtr != NULL) && (response + responseLength >= searchPtr + data_length + 1) && (searchPtr[data_length + 1] == '"')) {
if (data_length > readLength) {
data_length = readLength;
if (_printDebug == true) {
_debugPort->print(F("readMQTT: error: trucate message"));
}
err = SARA_R5_ERROR_OUT_OF_MEMORY;
}
memcpy(readDest, searchPtr+1, data_length);
*bytesRead = data_length;
} else {
if (_printDebug == true) {
_debugPort->print(F("readMQTT: error: message end "));
}
err = SARA_R5_ERROR_UNEXPECTED_RESPONSE;
}
}
free(command);
free(response);

return (data_length > readLength) ? SARA_R5_ERROR_OUT_OF_MEMORY : SARA_R5_ERROR_SUCCESS;
return err;
}

SARA_R5_error_t SARA_R5::getMQTTprotocolError(int *error_code, int *error_code2)
Expand Down Expand Up @@ -4832,7 +4848,7 @@ SARA_R5_error_t SARA_R5::getFileContents(String filename, String *contents)
// A large file will completely fill the backlog buffer - but it will be pruned afterwards
// Note to self: if the file contents contain "OK\r\n" sendCommandWithResponse will return true too early...
// To try and avoid this, look for \"\r\nOK\r\n
const char fileReadTerm[] = "\"\r\nOK\r\n";
const char fileReadTerm[] = "\r\nOK\r\n"; //LARA-R6 returns "\"\r\n\r\nOK\r\n" while SARA-R5 return "\"\r\nOK\r\n";
err = sendCommandWithResponse(command, fileReadTerm,
response, (5 * SARA_R5_STANDARD_RESPONSE_TIMEOUT),
(fileSize + minimumResponseAllocation));
Expand Down