Skip to content

Fixes for RF24Gateway #58

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
TMRh20 merged 2 commits into from
May 29, 2026
Merged

Fixes for RF24Gateway #58

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63f236f
Fixes for RF24Gateway
TMRh20 May 29, 2026
816da1e
Add comments to latest fixes
TMRh20 May 29, 2026
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
15 changes: 14 additions & 1 deletion RF24Gateway.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ void ESBGateway<mesh_t, network_t, radio_t>::handleRadioIn()

msgStruct msg;

if (f.message_size > 0) {
if (f.message_size > 0 && f.message_size <= MAX_PAYLOAD_SIZE) {
memcpy(&msg.message, &f.message_buffer, f.message_size);
msg.size = f.message_size;

Expand Down Expand Up @@ -494,6 +494,11 @@ void ESBGateway<mesh_t, network_t, radio_t>::handleRadioOut()

std::uint8_t* tmp = msgTx->message;

if (msgTx->size < 6) {
txQueue.pop();
return;
}

if (!config_TUN) { // TAP can use RF24Mesh for address assignment, but will still use ARP for address resolution

uint32_t RF24_STR = 0x34324652; // Identifies the mac as an RF24 mac
Expand Down Expand Up @@ -551,6 +556,11 @@ void ESBGateway<mesh_t, network_t, radio_t>::handleRadioOut()
}
else { // TUN always needs to use RF24Mesh for address assignment AND resolution

if (msgTx->size < 20) {
txQueue.pop();
continue;
}

uint8_t lastOctet = tmp[19];
int16_t meshAddr;

Expand Down Expand Up @@ -758,6 +768,9 @@ void ESBGateway<mesh_t, network_t, radio_t>::sendUDP(uint8_t nodeID, RF24Network

uint8_t buffer[MAX_PAYLOAD_SIZE + 11];

if (frame.message_size > MAX_PAYLOAD_SIZE) {
return;
}
memcpy(&buffer[0], &nodeID, 1);
memcpy(&buffer[1], &frame.header, 8);
memcpy(&buffer[9], &frame.message_size, 2);
Expand Down