From f20f39ab20e5e39bf1553339762326dd3288874e Mon Sep 17 00:00:00 2001 From: philon- Date: Sun, 20 Jul 2025 23:21:35 +0200 Subject: [PATCH] Fix node mapping and unknown node display in traceroute dialogs Corrects the mapping of 'from' and 'to' nodes in TracerouteResponseDialog to reflect the actual origin and destination of traceroute packets. Also updates TraceRoute to display a localized unknown name for node ID 4294967295 (0xffffff), improving clarity for unknown nodes. --- .../web/src/components/Dialog/TracerouteResponseDialog.tsx | 4 ++-- .../web/src/components/PageComponents/Messages/TraceRoute.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web/src/components/Dialog/TracerouteResponseDialog.tsx b/packages/web/src/components/Dialog/TracerouteResponseDialog.tsx index bea409e5..decbac9b 100644 --- a/packages/web/src/components/Dialog/TracerouteResponseDialog.tsx +++ b/packages/web/src/components/Dialog/TracerouteResponseDialog.tsx @@ -30,7 +30,7 @@ export const TracerouteResponseDialog = ({ const routeBack: number[] = traceroute?.data.routeBack ?? []; const snrTowards = (traceroute?.data.snrTowards ?? []).map((snr) => snr / 4); const snrBack = (traceroute?.data.snrBack ?? []).map((snr) => snr / 4); - const from = getNode(traceroute?.from ?? 0); + const from = getNode(traceroute?.to ?? 0); // The origin of the traceroute = the "to" node of the mesh packet const fromLongName = from?.user?.longName ?? (from ? `!${numberToHexUnpadded(from?.num)}` : t("unknown.shortName")); @@ -40,7 +40,7 @@ export const TracerouteResponseDialog = ({ ? `${numberToHexUnpadded(from?.num).substring(0, 4)}` : t("unknown.shortName")); - const toUser = getNode(traceroute?.to ?? 0); + const toUser = getNode(traceroute?.from ?? 0); // The destination of the traceroute = the "from" node of the mesh packet if (!toUser || !from) { return null; diff --git a/packages/web/src/components/PageComponents/Messages/TraceRoute.tsx b/packages/web/src/components/PageComponents/Messages/TraceRoute.tsx index 7f9d2ee1..caf176ee 100644 --- a/packages/web/src/components/PageComponents/Messages/TraceRoute.tsx +++ b/packages/web/src/components/PageComponents/Messages/TraceRoute.tsx @@ -41,7 +41,7 @@ const RoutePath = ({ title, from, to, path, snr }: RoutePathProps) => {

{getNode(hop)?.user?.longName ?? - `${t("traceRoute.nodeUnknownPrefix")}${numberToHexUnpadded(hop)}`} + `${t("unknown.longName")} (!${numberToHexUnpadded(hop)})`}

↓ {snr?.[i + 1] ?? t("unknown.num")}