From 41caa3d02bb9ee6434e025df658727a70a470286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2ESchr=C3=B6der?= Date: Wed, 12 Mar 2025 02:00:16 +0100 Subject: [PATCH] fixed Stuff --- src/mesh/Router.cpp | 8 -------- src/modules/NeighborInfoModule.cpp | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index d9ac9ae9e..e437665f6 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -653,14 +653,6 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src) if (!skipHandle) { MeshModule::callModules(*p, src); - if(config.network.routingAlgorithm == meshtastic_Config_RoutingConfig_FishEyeState && moduleConfig.fish_eye_state_routing.enabled == true && ((isToUs(p) || isBroadcast(p->to)) && p->decoded.dest != 0 && !isBroadcast(p->decoded.dest))){ - meshtastic_MeshPacket *copy = allocForSending(); - copy->decoded = p->decoded; - copy->to = fishEyeStateRoutingModule->getNextHopForID(copy->decoded.dest); - copy->from = nodeDB->getNodeNum(); - service->sendToMesh(copy); - } - #if !MESHTASTIC_EXCLUDE_MQTT // Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not to // us (because we would be able to decrypt it) diff --git a/src/modules/NeighborInfoModule.cpp b/src/modules/NeighborInfoModule.cpp index 7aae5520c..947c529ff 100644 --- a/src/modules/NeighborInfoModule.cpp +++ b/src/modules/NeighborInfoModule.cpp @@ -151,6 +151,7 @@ bool NeighborInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, // If the hopLimit is the same as hopStart, then it is a neighbor getOrCreateNeighbor(mp.from, mp.from, 0, mp.rx_snr); // Set the broadcast interval to 0, as we don't know it } + // Note: np can be a Nullptr at this point if(np && moduleConfig.has_fish_eye_state_routing && moduleConfig.fish_eye_state_routing.enabled && (config.network.routingAlgorithm == meshtastic_Config_RoutingConfig_FishEyeState)){ //meshtastic_NeighborInfo help = *np; LOG_DEBUG("FSR: go IN");