diff --git a/AGENTS.md b/AGENTS.md index 7f6548d..29534dd 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -367,7 +367,7 @@ The PPS exchange was previously emitted as a single packet under sub_type concatenated — a deviation from libosmocore's gsmtap.h. It is now split into the two standard subtypes: 0x02 (`PPS_REQ`, raw request bytes, span `ss..es_req`) and 0x03 (`PPS_RSP`, raw response bytes, span -`es_req..end`). Wireshark now dissects both halves, and simtrace2-pysniff +`es_req..end`). Wireshark now dissects both halves, and SIMtrace Analyser needs no change: its pcap importer already maps 0x03 to `pps` and `_decode_pps()` parses any 0xFF-leading frame (the response frame also starts with 0xFF). The PPS annotation and stderr log lines are unchanged. diff --git a/README.md b/README.md index 3acbf28..ad9337d 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ behave like a SIMtrace2 sniffer: SIM card ⇄ reader (passive tap on the contacts) → FX2 logic analyzer (fx2lafw, 8ch, 24MHz max) → sigrok-cli + iso7816 decoder - → GSMTAP UDP :4729 → [simtrace2-pysniff](https://github.com/anttro/simtrace2-pysniff) / Wireshark + → GSMTAP UDP :4729 → [SIMtrace Analyser](https://github.com/anttro/simtrace-analyser) / Wireshark ``` -[simtrace2-pysniff](https://github.com/anttro/simtrace2-pysniff) is the +[SIMtrace Analyser](https://github.com/anttro/simtrace-analyser) is the recommended tool for visualising live traces and viewing saved captures — it can also import/export GSMTAP pcap files (including the PCAP written by this decoder's `pcap_file=` option). @@ -398,7 +398,7 @@ Verified against the upstream example captures: # ATR+PPS+54 APDUs from the test_8 reader capture (~19s decode) # GSMTAP stream verified with tshark (ATR/APDU dissected natively), # custom 0x10/0x11 events verified with a UDP listener, and end-to-end -# into simtrace2-pysniff server (POST /api/capture/start → decode → stop). +# into the SIMtrace Analyser server (POST /api/capture/start → decode → stop). ``` A synthetic VCD generator covering RST/VCC edge cases lives in the project diff --git a/README_RUS.md b/README_RUS.md index 26383ff..b74a485 100644 --- a/README_RUS.md +++ b/README_RUS.md @@ -10,10 +10,10 @@ Saleae) ведёт себя как сниффер SIMtrace2: SIM-карта ⇄ ридер (пассивный съём с контактов) → логический анализатор FX2 (fx2lafw, 8 каналов, до 24 МГц) → sigrok-cli + декодер iso7816 - → GSMTAP UDP :4729 → [simtrace2-pysniff](https://github.com/anttro/simtrace2-pysniff) / Wireshark + → GSMTAP UDP :4729 → [SIMtrace Analyser](https://github.com/anttro/simtrace-analyser) / Wireshark ``` -[simtrace2-pysniff](https://github.com/anttro/simtrace2-pysniff) — +[SIMtrace Analyser](https://github.com/anttro/simtrace-analyser) — рекомендуемый инструмент для визуализации живых трасс и просмотра сохранённых записей; он также умеет импортировать и экспортировать GSMTAP pcap-файлы (включая PCAP, который этот декодер пишет через опцию @@ -418,7 +418,7 @@ start.bat rem запись + поток GSMTAP # ATR+PPS+54 APDU из записи ридера test_8 (~19 с декодирования) # Поток GSMTAP проверен через tshark (ATR/APDU разбираются нативно), # кастомные события 0x10/0x11 — через UDP-слушатель, и сквозным путём -# в сервер simtrace2-pysniff (POST /api/capture/start → decode → stop). +# в сервер SIMtrace Analyser (POST /api/capture/start → decode → stop). ``` Синтетический генератор VCD, покрывающий краевые случаи RST/VCC, живёт в diff --git a/gsmtap_stream.py b/gsmtap_stream.py index 32fd034..4a7dacd 100644 --- a/gsmtap_stream.py +++ b/gsmtap_stream.py @@ -2,7 +2,7 @@ ## GSMTAP live streaming for the ISO 7816 decoder. ## ## Sends decoded events as GSMTAP-SIM UDP packets, compatible with -## simtrace2-sniff, simtrace2-pysniff and the GSMTAP dissector in +## simtrace2-sniff, SIMtrace Analyser and the GSMTAP dissector in ## Wireshark. ## ## This program is free software; you can redistribute it and/or modify diff --git a/start.sh b/start.sh index 4a3cd16..419f642 100755 --- a/start.sh +++ b/start.sh @@ -80,7 +80,7 @@ Options: --restart-delay=S Seconds to wait between restarts (default: 2). -h, --help Show this help -GSMTAP stream defaults to 127.0.0.1:4729 (simtrace2-pysniff compatible). +GSMTAP stream defaults to 127.0.0.1:4729 (SIMtrace Analyser compatible). Capture runs continuously until Ctrl+C. stdin is detached from sigrok-cli so pressing keys/Enter in the terminal does NOT stop the capture (sigrok's