fix from PR review

This commit is contained in:
PacoX
2026-05-13 13:44:42 +02:00
parent 94ed729985
commit 4a066e08dc
3 changed files with 13 additions and 11 deletions
+9 -8
View File
@@ -35,9 +35,10 @@ The current implementation intentionally clamps to modes `0..2`, so the supporte
Paths in messages and storage consist of: Paths in messages and storage consist of:
- **`pathLength`**: Hop count reported in the radio header (may differ from decoded path) - **`pathLength`**: Encoded path length in bytes as carried by the frame/header. This is not the hop count when `pathHashByteWidth > 1`.
- **`pathBytes`**: Raw bytes of the path, grouped by `pathHashByteWidth` - **`pathBytes`**: Raw bytes of the path, grouped by `pathHashByteWidth`
- **Example**: With `pathHashByteWidth=2`, a 3-hop path needs 6 bytes: - **`hopCount`**: Derived display value computed from bytes and width: `(byteCount + hashByteWidth - 1) ~/ hashByteWidth`
- **Example**: With `pathHashByteWidth=2`, a 3-hop path needs 6 bytes, so `pathLength = 6` and `hopCount = 3`:
- `pathBytes = [0xA1, 0xA2, 0xB1, 0xB2, 0xC1, 0xC2]` - `pathBytes = [0xA1, 0xA2, 0xB1, 0xB2, 0xC1, 0xC2]`
- Hops: `[0xA1A2]`, `[0xB1B2]`, `[0xC1C2]` - Hops: `[0xA1A2]`, `[0xB1B2]`, `[0xC1C2]`
@@ -49,12 +50,12 @@ Convert path byte length to hop count:
int hopCount = (byteCount + hashByteWidth - 1) ~/ hashByteWidth; int hopCount = (byteCount + hashByteWidth - 1) ~/ hashByteWidth;
``` ```
Use this consistently when displaying hop counts in UI to avoid mismatch between metadata (`pathLength`) and observed paths (`pathBytes`). Use this consistently when displaying hop counts in UI. Do not treat `pathLength` as a hop count when the path uses multi-byte hop hashes.
### Path Usage in Different Message Types ### Path Usage in Different Message Types
- **Direct messages**: Extract path from decrypted payload to trace sender route. - **Direct messages**: Extract path from decrypted payload to trace sender route.
- **Channel messages**: Decrypt hop-by-hop routing chain from payload; header includes `pathLength` metadata. - **Channel messages**: Decrypt hop-by-hop routing chain from payload; the header carries the encoded byte length for the path blob, not the derived hop count.
- **Contact storage**: Path length in byte 32, raw path bytes in bytes 33-96, grouped by detected `pathHashByteWidth`. - **Contact storage**: Path length in byte 32, raw path bytes in bytes 33-96, grouped by detected `pathHashByteWidth`.
### UI Hop Count Display ### UI Hop Count Display
@@ -65,12 +66,12 @@ Use this consistently when displaying hop counts in UI to avoid mismatch between
// Preferred: use actual observed path length // Preferred: use actual observed path length
final effectiveHopCount = (pathBytes.length + width - 1) ~/ width; final effectiveHopCount = (pathBytes.length + width - 1) ~/ width;
// Avoid: using radio metadata directly // Avoid: using encoded byte length as if it were a hop count
// pathLength can diverge from decoded bytes and cause UI mismatches // pathLength is bytes; converting it twice causes inflated counts
``` ```
Example scenario: Example scenario:
- Radio header reports `pathLength: 32` - Radio header reports `pathLength: 32` bytes
- Decoded path bytes: `[0xAB, 0xCD]` (2 bytes = 1 hop with width=2) - Decoded path bytes: `[0xAB, 0xCD]` (2 bytes = 1 hop with width=2)
- **Display**: "1 hop" (from pathBytes), NOT "32 hops" (from pathLength) - **Display**: "1 hop" (from `pathBytes`), not "32 hops" (which would double-count the encoded length)
+2 -1
View File
@@ -28,7 +28,8 @@ class NotificationService {
AppLocalizations get _l10n => lookupAppLocalizations(_locale); AppLocalizations get _l10n => lookupAppLocalizations(_locale);
String _logSafe(String value) { String _logSafe(String value) {
return Uri.encodeComponent(value.replaceAll('\n', ' ')); final sanitized = value.replaceAll(RegExp(r'[\x00-\x1F\x7F]'), ' ');
return Uri.encodeComponent(sanitized);
} }
// Rate limiting to prevent notification storms // Rate limiting to prevent notification storms
+2 -2
View File
@@ -157,8 +157,8 @@ class _PathSelectionDialogState extends State<PathSelectionDialog> {
return; return;
} }
// Check max path length (64 hops) // Check max path size in bytes, as defined by the protocol.
if (pathBytesList.length > 64) { if (pathBytesList.length > maxPathSize) {
showDismissibleSnackBar( showDismissibleSnackBar(
context, context,
content: Text(l10n.path_tooLong), content: Text(l10n.path_tooLong),