rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-09 03:17:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rsyslog-client

Browse Source
This commit is contained in:
Thomas Göttgens
2023-01-31 17:26:23 +01:00
committed by GitHub
parent e1914dd464 04add9b91e
commit 1f0e64e794
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesh/FloodingRouter.cpp
View File

@@ -59,11 +59,6 @@ void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
LOG_DEBUG("Ignoring a simple (0 id) broadcast\n");
}
}
if (config.device.rebroadcast_mode == meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY) {
LOG_DEBUG("Cancelling rebroadcast of message from node on a foreign mesh, due to local only rebroadcast mode\n");
Router::cancelSending(p->to, p->decoded.request_id);
}
// handle the packet as normal
Router::sniffReceived(p, c);
}

2
src/modules/RoutingModule.cpp
View File

@@ -46,5 +46,5 @@ void RoutingModule::sendAckNak(meshtastic_Routing_Error err, NodeNum to, PacketI
RoutingModule::RoutingModule() : ProtobufModule("routing", meshtastic_PortNum_ROUTING_APP, &meshtastic_Routing_msg)
{
isPromiscuous = true;
encryptedOk = true;
encryptedOk = config.device.rebroadcast_mode != meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY;
}

2
src/platform/rp2040/rp2040CryptoEngine.cpp
View File

@@ -1,6 +1,6 @@
#include "configuration.h"
#include "CryptoEngine.h"
#include "aes.hpp"
#include "configuration.h"
class RP2040CryptoEngine : public CryptoEngine
{