rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-22 10:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

make route errors a more general 'message delivery failure' reason

Browse Source 
in support of https://github.com/meshtastic/Meshtastic-device/issues/677
This commit is contained in:
Kevin Hester
2021-02-07 09:46:35 +08:00
parent e7af338c31
commit ccb232b6ac
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesh/DSRRouter.cpp
View File

@@ -105,7 +105,7 @@ void DSRRouter::sniffReceived(const MeshPacket *p)
// packets until ack arrives)
// FIXME, if we don't get a route reply at all (or a route error), timeout and generate a routeerror TIMEOUT on our own...
break;
case SubPacket_route_error_tag:
case SubPacket_error_reason_tag:
removeRoute(p->decoded.dest);
// FIXME: if any pending packets were waiting on this route, delete them
@@ -131,7 +131,7 @@ void DSRRouter::sniffReceived(const MeshPacket *p)
assert(p->decoded.source); // I think this is guaranteed by now
// FIXME - what if the current packet _is_ a route error packet?
sendRouteError(p, RouteError_NO_ROUTE);
sendRouteError(p, ErrorReason_NO_ROUTE);
}
// FIXME, stop local processing of this packet
@@ -145,7 +145,7 @@ void DSRRouter::sniffReceived(const MeshPacket *p)
if (pending && pending->packet->decoded.source) { // if source not set, this was not a multihop packet, just ignore
removeRoute(pending->packet->decoded.dest); // We no longer have a route to the specified node
sendRouteError(p, RouteError_GOT_NAK);
sendRouteError(p, ErrorReason_GOT_NAK);
}
}
}
@@ -230,7 +230,7 @@ void DSRRouter::sendNextHop(NodeNum n, const MeshPacket *p)
/**
* Send a route error packet towards whoever originally sent this message
*/
void DSRRouter::sendRouteError(const MeshPacket *p, RouteError err)
void DSRRouter::sendRouteError(const MeshPacket *p, ErrorReason err)
{
DEBUG_MSG("FIXME not implemented sendRouteError\n");
}