mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-07-12 11:52:07 +10:00
forgot the bytewise reverse of the outgoing path
This commit is contained in:
@@ -38,20 +38,29 @@ class ChannelMessagePathScreen extends StatelessWidget {
|
|||||||
message.pathVariants,
|
message.pathVariants,
|
||||||
);
|
);
|
||||||
|
|
||||||
final primaryPath = !channelMessage && !message.isOutgoing
|
final hashByteWidth =
|
||||||
? Uint8List.fromList(primaryPathTmp.reversed.toList())
|
(message.pathHashWidth ?? connector.pathHashByteWidth)
|
||||||
: primaryPathTmp;
|
|
||||||
final hashByteWidth = (message.pathHashWidth ?? connector.pathHashByteWidth)
|
|
||||||
.clamp(1, 4)
|
.clamp(1, 4)
|
||||||
.toInt();
|
.toInt();
|
||||||
final hops = _buildPathHops(primaryPath, connector, l10n, hashByteWidth);
|
final primaryPath = !channelMessage && !message.isOutgoing
|
||||||
|
? _reversePathByHop(primaryPathTmp, hashByteWidth)
|
||||||
|
: primaryPathTmp;
|
||||||
|
final hops = _buildPathHops(
|
||||||
|
primaryPath,
|
||||||
|
connector,
|
||||||
|
l10n,
|
||||||
|
hashByteWidth,
|
||||||
|
);
|
||||||
final hasHopDetails = primaryPath.isNotEmpty;
|
final hasHopDetails = primaryPath.isNotEmpty;
|
||||||
|
|
||||||
// Convert observed path byte length to hop count using the packet width.
|
// Convert observed path byte length to hop count using the packet width.
|
||||||
// Legacy messages fall back to the current connector width.
|
// Legacy messages fall back to the current connector width.
|
||||||
// Reported path length (V3+) is already stored as a hop count; preserve
|
// Reported path length (V3+) is already stored as a hop count; preserve
|
||||||
// the negative flood sentinel when present.
|
// the negative flood sentinel when present.
|
||||||
final observedHopCount = _hopCountFromBytes(primaryPath.length, hashByteWidth);
|
final observedHopCount = _hopCountFromBytes(
|
||||||
|
primaryPath.length,
|
||||||
|
hashByteWidth,
|
||||||
|
);
|
||||||
final reportedHopCount = message.pathLength;
|
final reportedHopCount = message.pathLength;
|
||||||
final effectiveHopCount = observedHopCount > 0
|
final effectiveHopCount = observedHopCount > 0
|
||||||
? observedHopCount
|
? observedHopCount
|
||||||
@@ -482,16 +491,15 @@ class _ChannelMessagePathMapScreenState
|
|||||||
primaryPath,
|
primaryPath,
|
||||||
);
|
);
|
||||||
|
|
||||||
final selectedPath =
|
|
||||||
((!widget.message.isOutgoing && !widget.channelMessage) ||
|
|
||||||
(widget.message.isOutgoing && widget.channelMessage))
|
|
||||||
? Uint8List.fromList(selectedPathTmp.reversed.toList())
|
|
||||||
: selectedPathTmp;
|
|
||||||
|
|
||||||
final width =
|
final width =
|
||||||
(widget.message.pathHashWidth ?? connector.pathHashByteWidth)
|
(widget.message.pathHashWidth ?? connector.pathHashByteWidth)
|
||||||
.clamp(1, 4)
|
.clamp(1, 4)
|
||||||
.toInt();
|
.toInt();
|
||||||
|
final selectedPath =
|
||||||
|
((!widget.message.isOutgoing && !widget.channelMessage) ||
|
||||||
|
(widget.message.isOutgoing && widget.channelMessage))
|
||||||
|
? _reversePathByHop(selectedPathTmp, width)
|
||||||
|
: selectedPathTmp;
|
||||||
final selectedIndex = _indexForPath(selectedPathTmp, observedPaths);
|
final selectedIndex = _indexForPath(selectedPathTmp, observedPaths);
|
||||||
final hops = _buildPathHops(
|
final hops = _buildPathHops(
|
||||||
selectedPath,
|
selectedPath,
|
||||||
@@ -941,7 +949,10 @@ class _PathHop {
|
|||||||
|
|
||||||
String get displayLabel {
|
String get displayLabel {
|
||||||
final prefixLabel = hopBytes != null && hopBytes!.isNotEmpty
|
final prefixLabel = hopBytes != null && hopBytes!.isNotEmpty
|
||||||
? hopBytes!.map((b) => b.toRadixString(16).padLeft(2, '0')).join('').toUpperCase()
|
? hopBytes!
|
||||||
|
.map((b) => b.toRadixString(16).padLeft(2, '0'))
|
||||||
|
.join('')
|
||||||
|
.toUpperCase()
|
||||||
: _formatPrefix(prefix);
|
: _formatPrefix(prefix);
|
||||||
return '($prefixLabel) ${_resolveName(contact, l10n)}';
|
return '($prefixLabel) ${_resolveName(contact, l10n)}';
|
||||||
}
|
}
|
||||||
@@ -1070,9 +1081,21 @@ String _formatPrefix(int prefix) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String _formatPathPrefixes(Uint8List pathBytes, int hashByteWidth) {
|
String _formatPathPrefixes(Uint8List pathBytes, int hashByteWidth) {
|
||||||
return PathHelper.splitPathBytes(pathBytes, hashByteWidth)
|
return PathHelper.splitPathBytes(
|
||||||
.map(PathHelper.formatHopHex)
|
pathBytes,
|
||||||
.join(',');
|
hashByteWidth,
|
||||||
|
).map(PathHelper.formatHopHex).join(',');
|
||||||
|
}
|
||||||
|
|
||||||
|
Uint8List _reversePathByHop(Uint8List pathBytes, int hashByteWidth) {
|
||||||
|
final hops = PathHelper.splitPathBytes(pathBytes, hashByteWidth);
|
||||||
|
if (hops.length <= 1) return Uint8List.fromList(pathBytes);
|
||||||
|
|
||||||
|
final reversedBytes = <int>[];
|
||||||
|
for (final hop in hops.reversed) {
|
||||||
|
reversedBytes.addAll(hop);
|
||||||
|
}
|
||||||
|
return Uint8List.fromList(reversedBytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
int _hopCountFromBytes(int byteCount, int hashByteWidth) {
|
int _hopCountFromBytes(int byteCount, int hashByteWidth) {
|
||||||
@@ -1081,7 +1104,11 @@ int _hopCountFromBytes(int byteCount, int hashByteWidth) {
|
|||||||
return (byteCount + width - 1) ~/ width;
|
return (byteCount + width - 1) ~/ width;
|
||||||
}
|
}
|
||||||
|
|
||||||
String _formatHopCount(int byteCount, int hashByteWidth, AppLocalizations l10n) {
|
String _formatHopCount(
|
||||||
|
int byteCount,
|
||||||
|
int hashByteWidth,
|
||||||
|
AppLocalizations l10n,
|
||||||
|
) {
|
||||||
return l10n.chat_hopsCount(_hopCountFromBytes(byteCount, hashByteWidth));
|
return l10n.chat_hopsCount(_hopCountFromBytes(byteCount, hashByteWidth));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user