pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-19 16:29:31 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

changed Addressing according to Comment

Browse Source
This commit is contained in:
J.Schröder 2025-03-24 23:16:03 +01:00
parent 1753fe027f
commit 12989edabb
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesh/MeshService.cpp
View File

@ -234,12 +234,12 @@ ErrorCode MeshService::sendQueueStatusToPhone(const meshtastic_QueueStatus &qs,
void MeshService::sendToMesh(meshtastic_MeshPacket *p, RxSource src, bool ccToPhone)
{
if(config.network.routingAlgorithm == meshtastic_Config_RoutingConfig_FishEyeState && moduleConfig.fish_eye_state_routing.enabled){
if(p->decoded.dest != 0 && p->decoded.dest != NODENUM_BROADCAST){
p->to = fishEyeStateRoutingModule->getNextHopForID(p->decoded.dest);
}else if ((p->decoded.dest == 0) && (p->to != 0) && (p->to != NODENUM_BROADCAST ))
if(p->to != 0 && p->to != NODENUM_BROADCAST && !isToUs(p)){
p->decoded.dest = fishEyeStateRoutingModule->getNextHopForID(p->to);
}else if ((p->to == 0) && (p->decoded.dest != 0) && (p->decoded.dest != NODENUM_BROADCAST ) && (p->decoded.dest != nodeDB->getNodeNum()))
{
p->decoded.dest = p->to;
p->to = fishEyeStateRoutingModule->getNextHopForID(p->decoded.dest);
p->to = p->decoded.dest;
p->decoded.dest = fishEyeStateRoutingModule->getNextHopForID(p->to);
}
}

7
src/mesh/Router.cpp
View File

@ -653,13 +653,14 @@ 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 && (isToUs(p) && (p->decoded.dest != nodeDB->getNodeNum()) && (p->decoded.dest != 0) && (p->decoded.dest != NODENUM_BROADCAST))){
if(config.network.routingAlgorithm == meshtastic_Config_RoutingConfig_FishEyeState && moduleConfig.fish_eye_state_routing.enabled && (!isToUs(p) && (p->decoded.dest == nodeDB->getNodeNum()) && (p->to != 0) && (p->to != NODENUM_BROADCAST))){
meshtastic_MeshPacket *copy = allocForSending();
copy->decoded = p->decoded;
copy->to = fishEyeStateRoutingModule->getNextHopForID(copy->decoded.dest);
copy->to = p->to;
copy->decoded.dest = fishEyeStateRoutingModule->getNextHopForID(copy->to);
copy->from = nodeDB->getNodeNum();
char * logout = "";
sprintf(logout, "Forwarding Package to Node %u to Next-Hop %u",p->decoded.dest,copy->to);
sprintf(logout, "Forwarding Package to Node %u to Next-Hop %u",copy->to,copy->decoded.dest);
LOG_DEBUG(logout);
service->sendToMesh(copy);
}