catarrh
7eaf7e9b53
Support the sigrok-iso7816-stream decoder (FX2 logic-analyzer passive SIM sniffer, github.com/anttro/sigrok_iso7816_stream) which streams GSMTAP-SIM on UDP 4729 and adds two custom sub-types for line events. - gsmtap.py: GSMTAP_SIM_RST_EVENT (0x10) / GSMTAP_SIM_VCC_EVENT (0x11). - capture.py: gsmtap_msg_type() maps 0x10→'rst', 0x11→'vcc' (shared by the listener and tests); pcap.py _SUB_TYPE_NAMES gains the same entries so PCAP re-imports of these captures preserve the events. - decode.py: decode_line_event() decodes [direction, level, reserved] into reset asserted/de-asserted or power applied/removed + level; routed through decode_sniff_msg. - database.py: reset-assert and power-removal invalidate the per-channel file selection (card-level transition); de-assert / power-on are markers only. - frontend: RST/VCC labels (RESET ASSERTED / VCC OFF, …), a detail-view branch (Event + Level + raw), and list styling (.apdu-type.rst/.vcc). README notes the custom sub-type compatibility. Tests: +8 (line-event vectors, sniff routing, subtype + PCAP round-trip mappings) — 359 total. Version 1.21.0, SW cache simtrace-analyser-v31.
104 lines
3.3 KiB
Python
104 lines
3.3 KiB
Python
"""Tests for CaptureManager session lifecycle (empty-session discard)."""
|
|
|
|
import os
|
|
import tempfile
|
|
import unittest
|
|
|
|
from simtrace2_pysniff.server.capture import CaptureManager, gsmtap_msg_type
|
|
from simtrace2_pysniff.server.database import Database
|
|
|
|
|
|
class TestGsmtapSubtypeMapping(unittest.TestCase):
|
|
def test_custom_line_event_subtypes(self):
|
|
self.assertEqual(gsmtap_msg_type(0x10), 'rst')
|
|
self.assertEqual(gsmtap_msg_type(0x11), 'vcc')
|
|
|
|
def test_standard_subtypes(self):
|
|
self.assertEqual(gsmtap_msg_type(0x00), 'tpdu')
|
|
self.assertEqual(gsmtap_msg_type(0x01), 'atr')
|
|
self.assertEqual(gsmtap_msg_type(0x02), 'tpdu') # PPS combined
|
|
|
|
|
|
class _FakeBackend:
|
|
def __init__(self, messages=()):
|
|
self._messages = list(messages)
|
|
|
|
def start(self):
|
|
pass
|
|
|
|
def stop(self):
|
|
pass
|
|
|
|
def iter_messages(self):
|
|
yield from self._messages
|
|
|
|
|
|
class _DisconnectingSession:
|
|
def iter_messages(self):
|
|
from simtrace2_pysniff.device import DeviceDisconnected
|
|
raise DeviceDisconnected('disconnected')
|
|
yield
|
|
|
|
|
|
class TestCaptureManager(unittest.TestCase):
|
|
def _manager(self, backend):
|
|
tmp = tempfile.NamedTemporaryFile(suffix='.db', delete=False)
|
|
tmp.close()
|
|
db = Database(tmp.name)
|
|
self.addCleanup(lambda: (db._conn.close(), os.remove(tmp.name)))
|
|
return CaptureManager(backend, db), db
|
|
|
|
def test_empty_capture_discarded(self):
|
|
mgr, db = self._manager(_FakeBackend())
|
|
sid = mgr.start_session()
|
|
self.assertIsNotNone(sid)
|
|
self.assertIsNone(mgr.stop_session())
|
|
self.assertIsNone(db.get_session(sid))
|
|
|
|
def test_non_empty_capture_kept(self):
|
|
mgr, db = self._manager(_FakeBackend([('tpdu', b'\x80\xf2\x00\x00\x00', 0)]))
|
|
sid = mgr.start_session()
|
|
self.assertEqual(mgr.stop_session(), sid)
|
|
self.assertIsNotNone(db.get_session(sid))
|
|
self.assertEqual(db.count_messages(sid), 1)
|
|
|
|
def test_direct_sniffer_device_disconnect(self):
|
|
from simtrace2_pysniff.server.capture import DirectSniffer
|
|
sn = DirectSniffer()
|
|
sn._session = _DisconnectingSession()
|
|
self.assertEqual(list(sn.iter_messages()), [])
|
|
|
|
def test_capture_gap_message_inserted(self):
|
|
# A 'gap' marker yielded by the backend is stored as a message.
|
|
mgr, db = self._manager(_FakeBackend([
|
|
('gap', b'', 0),
|
|
('tpdu', b'\x80\xf2\x00\x00\x00', 0),
|
|
]))
|
|
sid = mgr.start_session()
|
|
self.assertEqual(mgr.stop_session(), sid)
|
|
msgs = db.get_messages(sid)
|
|
self.assertEqual([m['type'] for m in msgs], ['gap', 'tpdu'])
|
|
|
|
def test_direct_sniffer_connected(self):
|
|
from simtrace2_pysniff.server.capture import DirectSniffer
|
|
|
|
class _FakeSession:
|
|
connected = True
|
|
|
|
sn = DirectSniffer()
|
|
sn._session = _FakeSession()
|
|
self.assertTrue(sn.connected)
|
|
_FakeSession.connected = False
|
|
self.assertFalse(sn.connected)
|
|
|
|
def test_device_connected_gsmtap_none(self):
|
|
from simtrace2_pysniff.server.capture import GsmtapListener
|
|
listener = GsmtapListener(bind_port=0)
|
|
self.addCleanup(listener.stop)
|
|
mgr, _ = self._manager(listener)
|
|
self.assertIsNone(mgr.device_connected)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|