Skip to content

Fix free space check for remote commands and HEARTBEAT frames #510

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
Mar 7, 2023
Merged

Fix free space check for remote commands and HEARTBEAT frames #510

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
6 changes: 3 additions & 3 deletions Firmware/LoRaSerial/Radio.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2351,7 +2351,7 @@ PacketType rcvDatagram()
// * Received datagramType
// * DATAGRAM_DUPLICATE
// * DATAGRAM_BAD
PacketType validateDatagram(VIRTUAL_CIRCUIT * vc, PacketType datagramType, uint8_t ackNumber, uint16_t freeBytes)
PacketType validateDatagram(VIRTUAL_CIRCUIT * vc, PacketType datagramType, uint8_t ackNumber, int freeBytes)
{
if (ackNumber != vc->rmtTxAckNumber)
{
Expand Down Expand Up @@ -2389,12 +2389,12 @@ PacketType validateDatagram(VIRTUAL_CIRCUIT * vc, PacketType datagramType, uint8
}

//Verify that there is sufficient space in the serialTransmitBuffer
if (inCommandMode || ((sizeof(serialTransmitBuffer) - availableTXBytes()) < rxDataBytes))
if (inCommandMode || (freeBytes < rxDataBytes))
{
if (settings.debugReceive || settings.debugDatagrams)
{
systemPrintTimestamp();
systemPrintln("Insufficient space in the serialTransmitBuffer");
systemPrintln("Insufficient space in the receive buffer");
}
insufficientSpace++;

Expand Down