catarrh
f492f29ea6
The diagrams conflated the SIMtrace2 hardware with the sniffer that reads it and omitted the original Osmocom simtrace2-sniff: they showed simtrace2-pysniff feeding the GSMTAP listener with the hardware only as its subtitle, and a second, unexplained "SIMtrace2 hardware / direct USB" box. The diagrams now show the device -> sniffer -> GSMTAP relationship explicitly: SIMtrace2 hardware is read either by simtrace2-pysniff or by the original simtrace2-sniff, and FX2 hardware by the sigrok_iso7816_stream decoder; the sniffers/decoder stream GSMTAP-SIM to the UDP :4729 listener. The direct USB path is drawn separately from the device to the server and is labelled "pysniff code in-process": --capture direct uses the bundled simtrace2_pysniff package (DirectSniffer -> SniffSession) inside the server process, not the simtrace2-pysniff CLI, and bypasses GSMTAP. PCAP/COMPRION import, SQLite and the browser UI keep their places. The READMEs' alt text, the first-run capture-mode notes and the Usage command comments now name the original simtrace2-sniff as a GSMTAP source and say the direct mode runs the bundled sniffer code inside the server. Both languages; 558 Python + 80 Node tests; runtime zip still carries both diagrams and the README image guard passes.
73 lines
6.4 KiB
XML
73 lines
6.4 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
||
<svg xmlns="http://www.w3.org/2000/svg" width="960" height="640" viewBox="0 0 960 640" role="img" aria-labelledby="diagram-title diagram-desc" font-family="'Segoe UI', 'Helvetica Neue', Arial, 'DejaVu Sans', sans-serif">
|
||
<title id="diagram-title">SIMtrace Analyser: захват и анализ</title>
|
||
<desc id="diagram-desc">Оборудование SIMtrace2 читает simtrace2-pysniff (входит в комплект) или оригинальный simtrace2-sniff, а оборудование FX2 — декодер sigrok_iso7816_stream; оба источника передают GSMTAP-SIM слушателю UDP :4729. Сервер также может читать оборудование SIMtrace2 напрямую по USB встроенным кодом сниффера и импортирует трассы PCAP/COMPRION из файлов. simtrace-analyser-server декодирует и сохраняет трафик в SQLite и раздаёт веб-интерфейс.</desc>
|
||
<defs>
|
||
<marker id="arrow" viewBox="0 0 10 10" refX="9" refY="5" markerWidth="7" markerHeight="7" orient="auto-start-reverse">
|
||
<path d="M0 0 L10 5 L0 10 Z" fill="#64748b"/>
|
||
</marker>
|
||
</defs>
|
||
<rect x="1" y="1" width="958" height="638" rx="18" fill="#ffffff" stroke="#e2e8f0" stroke-width="1.5"/>
|
||
<text x="480" y="30" text-anchor="middle" font-size="14" fill="#475569">захват → анализ</text>
|
||
|
||
<!-- устройства захвата -->
|
||
<rect x="100" y="48" width="250" height="64" rx="12" fill="#f8fafc" stroke="#cbd5e1" stroke-width="1.5"/>
|
||
<text x="225" y="74" text-anchor="middle" font-size="15" font-weight="600" fill="#0f172a">Оборудование SIMtrace2</text>
|
||
<text x="225" y="94" text-anchor="middle" font-size="12" fill="#475569">USB-сниффер Osmocom</text>
|
||
|
||
<rect x="610" y="48" width="250" height="64" rx="12" fill="#f8fafc" stroke="#cbd5e1" stroke-width="1.5"/>
|
||
<text x="735" y="74" text-anchor="middle" font-size="15" font-weight="600" fill="#0f172a">Логический анализатор FX2</text>
|
||
<text x="735" y="94" text-anchor="middle" font-size="12" fill="#475569">клон Saleae</text>
|
||
|
||
<line x1="225" y1="112" x2="225" y2="148" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
<line x1="735" y1="112" x2="735" y2="148" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
|
||
<!-- снифферы -->
|
||
<rect x="100" y="150" width="250" height="96" rx="12" fill="#eff6ff" stroke="#93c5fd" stroke-width="1.5"/>
|
||
<text x="225" y="176" text-anchor="middle" font-size="14" font-weight="600" fill="#0f172a">Снифферы SIMtrace2</text>
|
||
<text x="225" y="202" text-anchor="middle" font-size="13" fill="#334155" font-family="'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace">simtrace2-pysniff</text>
|
||
<text x="225" y="224" text-anchor="middle" font-size="13" fill="#334155" font-family="'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace">simtrace2-sniff (Osmocom)</text>
|
||
|
||
<rect x="610" y="150" width="250" height="96" rx="12" fill="#f5f3ff" stroke="#c4b5fd" stroke-width="1.5"/>
|
||
<text x="735" y="190" text-anchor="middle" font-size="14" font-weight="600" fill="#0f172a" font-family="'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace">sigrok_iso7816_stream</text>
|
||
<text x="735" y="212" text-anchor="middle" font-size="13" fill="#475569">декодер</text>
|
||
|
||
<line x1="225" y1="246" x2="425" y2="278" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
<line x1="735" y1="246" x2="535" y2="278" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
|
||
<!-- слушатель GSMTAP -->
|
||
<rect x="350" y="280" width="260" height="72" rx="12" fill="#fffbeb" stroke="#fcd34d" stroke-width="1.5"/>
|
||
<text x="480" y="310" text-anchor="middle" font-size="16" font-weight="600" fill="#0f172a" font-family="'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace">GSMTAP UDP :4729</text>
|
||
<text x="480" y="332" text-anchor="middle" font-size="13" fill="#475569">слушатель</text>
|
||
|
||
<!-- импорт файлов -->
|
||
<rect x="650" y="280" width="240" height="72" rx="12" fill="#f8fafc" stroke="#cbd5e1" stroke-width="1.5"/>
|
||
<text x="770" y="310" text-anchor="middle" font-size="14" font-weight="600" fill="#0f172a">Импорт PCAP / COMPRION</text>
|
||
<text x="770" y="332" text-anchor="middle" font-size="13" fill="#475569">из файлов</text>
|
||
|
||
<line x1="480" y1="352" x2="480" y2="390" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
<line x1="770" y1="352" x2="635" y2="390" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
|
||
<!-- прямой USB-путь минует снифферы и GSMTAP -->
|
||
<path d="M100 84 H52 V448 H258" fill="none" stroke="#64748b" stroke-width="2" stroke-linejoin="round" marker-end="url(#arrow)"/>
|
||
<text x="64" y="418" font-size="12" font-weight="600" fill="#475569">прямой USB</text>
|
||
<text x="64" y="436" font-size="12" fill="#475569">код pysniff внутри сервера</text>
|
||
|
||
<!-- анализирующий сервер -->
|
||
<rect x="260" y="392" width="440" height="84" rx="12" fill="#ecfdf5" stroke="#6ee7b7" stroke-width="1.5"/>
|
||
<text x="480" y="427" text-anchor="middle" font-size="18" font-weight="600" fill="#0f172a" font-family="'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace">simtrace-analyser-server</text>
|
||
<text x="480" y="451" text-anchor="middle" font-size="13" fill="#475569">декодирует · сохраняет</text>
|
||
|
||
<line x1="400" y1="476" x2="250" y2="514" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
<line x1="560" y1="476" x2="710" y2="514" stroke="#64748b" stroke-width="2" marker-end="url(#arrow)"/>
|
||
|
||
<!-- хранилище и интерфейс -->
|
||
<rect x="110" y="516" width="280" height="76" rx="12" fill="#f8fafc" stroke="#cbd5e1" stroke-width="1.5"/>
|
||
<text x="250" y="548" text-anchor="middle" font-size="18" font-weight="600" fill="#0f172a">SQLite</text>
|
||
<text x="250" y="570" text-anchor="middle" font-size="13" fill="#475569">sessions.db</text>
|
||
|
||
<rect x="570" y="516" width="280" height="76" rx="12" fill="#f8fafc" stroke="#cbd5e1" stroke-width="1.5"/>
|
||
<text x="710" y="548" text-anchor="middle" font-size="18" font-weight="600" fill="#0f172a">Браузер (веб-интерфейс)</text>
|
||
<text x="710" y="570" text-anchor="middle" font-size="13" fill="#475569">устанавливаемое PWA</text>
|
||
</svg>
|