pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-15 17:42:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Router

Browse Source
This commit is contained in:
Ben Meadors 2023-01-28 08:17:29 -06:00
parent e01e830c0e
commit 654d38ed3f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesh/Router.cpp
View File

@ -192,12 +192,6 @@ void printBytes(const char *label, const uint8_t *p, size_t numbytes)
*/ */
ErrorCode Router::send(meshtastic_MeshPacket *p) ErrorCode Router::send(meshtastic_MeshPacket *p)
{ {
// Skip the normal ceremony for repeaters
if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER) {
assert(iface);
return iface->send(p);
}
if (p->to == nodeDB.getNodeNum()) { if (p->to == nodeDB.getNodeNum()) {
LOG_ERROR("BUG! send() called with packet destined for local node!\n"); LOG_ERROR("BUG! send() called with packet destined for local node!\n");
packetPool.release(p); packetPool.release(p);

15
src/modules/RepeaterModule.cpp
View File

@ -9,10 +9,17 @@ RepeaterModule *repeaterModule;
bool RepeaterModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Routing *r) bool RepeaterModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Routing *r)
{ {
printPacket("Repeater rebroadcasting message", &mp); printPacket("Repeater observed message", &mp);
meshtastic_MeshPacket *p = const_cast<meshtastic_MeshPacket *>(&mp); router->sniffReceived(&mp, r);
router->send(p);
return true; // FIXME - move this to a non promsicious PhoneAPI module?
// Note: we are careful not to send back packets that started with the phone back to the phone
if ((mp.to == NODENUM_BROADCAST || mp.to == nodeDB.getNodeNum()) && (mp.from != 0)) {
printPacket("Delivering rx packet", &mp);
service.handleFromRadio(&mp);
}
return false;
} }
meshtastic_MeshPacket *RepeaterModule::allocReply() meshtastic_MeshPacket *RepeaterModule::allocReply()