Skip to content
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

Exclude preferred routing roles from nodeinfo interrogation behavior #5242

Merged
merged 7 commits into from
Nov 4, 2024
Merged

Exclude preferred routing roles from nodeinfo interrogation behavior #5242

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4ec354
Exclude prefered routing roles from nodeinfo interrogation behavior
thebentern Nov 3, 2024
ece6323
Exclude prefered routing roles from nodeinfo interrogation behavior
thebentern Nov 3, 2024
4b33adc
Merge branch 'master' into router-remove-interrogation
thebentern Nov 4, 2024
1c0f960
Merge branch 'master' into router-remove-interrogation
thebentern Nov 4, 2024
406ab85
Merge branch 'router-remove-interrogation' of https://github.com/mesh…
thebentern Nov 4, 2024
4e8c51b
Update MeshService.cpp
thebentern Nov 4, 2024
ac4ae3b
Rework logic to prevent spammy router logs
thebentern Nov 4, 2024
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
8 changes: 5 additions & 3 deletions src/mesh/MeshService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "RTC.h"
#include "TypeConversions.h"
#include "main.h"
#include "meshUtils.h"
#include "mesh-pb-constants.h"
#include "meshUtils.h"
#include "modules/NodeInfoModule.h"
#include "modules/PositionModule.h"
#include "power.h"
Expand Down Expand Up @@ -79,14 +79,16 @@ int MeshService::handleFromRadio(const meshtastic_MeshPacket *mp)
powerFSM.trigger(EVENT_PACKET_FOR_PHONE); // Possibly keep the node from sleeping

nodeDB->updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
bool isPreferredRebroadcaster =
IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_ROUTER, meshtastic_Config_DeviceConfig_Role_REPEATER);
if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
mp->decoded.portnum == meshtastic_PortNum_TELEMETRY_APP && mp->decoded.request_id > 0) {
LOG_DEBUG("Received telemetry response. Skip sending our NodeInfo."); // because this potentially a Repeater which will
// ignore our request for its NodeInfo
} else if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && !nodeDB->getMeshNode(mp->from)->has_user &&
nodeInfoModule) {
LOG_INFO("Heard new node on channel %d, sending NodeInfo and asking for a response.", mp->channel);
nodeInfoModule && !isPreferredRebroadcaster) {
if (airTime->isTxAllowedChannelUtil(true)) {
LOG_INFO("Heard new node on channel %d, sending NodeInfo and asking for a response.", mp->channel);
nodeInfoModule->sendOurNodeInfo(mp->from, true, mp->channel);
} else {
fifieldt marked this conversation as resolved.
Show resolved Hide resolved
LOG_DEBUG("Skip sending NodeInfo due to > 25 percent channel util.");
Expand Down