rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-18 08:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add Routing_Error_NONE"

Browse Source 
This reverts commit e1985fa0f9.
This commit is contained in:
Jonathan Bennett
2024-08-13 09:15:20 -05:00
parent bcd77c4523
commit f3fa8daedf
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesh/Router.cpp
View File

@@ -258,7 +258,7 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
meshtastic_MeshPacket *p_decoded = packetPool.allocCopy(*p);
auto encodeResult = perhapsEncode(p);
if (encodeResult != meshtastic_Routing_Error_NONE && encodeResult != meshtastic_Routing_Error_NONE_PKI) {
if (encodeResult != meshtastic_Routing_Error_NONE) {
packetPool.release(p_decoded);
abortSendAndNak(encodeResult, p);
return encodeResult; // FIXME - this isn't a valid ErrorCode
@@ -493,10 +493,8 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
p->encrypted.size = numbytes;
p->which_payload_variant = meshtastic_MeshPacket_encrypted_tag;
}
if (p->pki_encrypted)
return meshtastic_Routing_Error_NONE_PKI;
else
return meshtastic_Routing_Error_NONE;
return meshtastic_Routing_Error_NONE;
}
NodeNum Router::getNodeNum()