catarrh
2a58fec0a3
- capture.py: DirectSniffer/GsmtapListener yield (type, data, flags), CaptureManager passes flags to insert_message (change flags were previously dropped, leaving every change row with flags=0) - protocol.py: add _parse_fidi (1-byte value) — FIDI was mis-mapped to _parse_change (4-byte flags), so FIDI messages were silently dropped - database.py: pass flags into decode_sniff_msg - decode.py: decode_change(flags) reads flags directly; decode_sniff_msg gains flags parameter; change messages no longer require non-empty data - tests: fix FIDI test, add change/fidi decode tests (43 total)
112 lines
3.0 KiB
Python
112 lines
3.0 KiB
Python
"""Capture backends: GSMTAP listener and direct SIMtrace2 sniffer."""
|
|
|
|
import time
|
|
import threading
|
|
|
|
from ..gsmtap import GsmtapReceiver, GSMTAP_SIM_ATR, GSMTAP_SIM_APDU
|
|
|
|
|
|
class GsmtapListener:
|
|
def __init__(self, bind_port=4729):
|
|
self._receiver = GsmtapReceiver(bind_port=bind_port)
|
|
self._running = False
|
|
|
|
def start(self):
|
|
self._running = True
|
|
|
|
def stop(self):
|
|
self._running = False
|
|
self._receiver.close()
|
|
|
|
def iter_messages(self):
|
|
while self._running:
|
|
sub_type, data = self._receiver.read_packet()
|
|
if sub_type is None:
|
|
continue
|
|
msg_type = 'atr' if sub_type == GSMTAP_SIM_ATR else 'tpdu'
|
|
yield msg_type, data, 0
|
|
|
|
|
|
class DirectSniffer:
|
|
def __init__(self):
|
|
from ..device import SniffSession
|
|
self._session = SniffSession(
|
|
reconnect=True,
|
|
reconnect_delay_min=1.0,
|
|
reconnect_delay_max=10.0,
|
|
inactivity_timeout=0.0,
|
|
)
|
|
self._running = False
|
|
|
|
def start(self):
|
|
self._running = True
|
|
|
|
def stop(self):
|
|
self._running = False
|
|
self._session.close()
|
|
|
|
def iter_messages(self):
|
|
for msg in self._session.iter_messages():
|
|
if not self._running:
|
|
break
|
|
yield msg.type, msg.data, msg.flags
|
|
|
|
|
|
class CaptureManager:
|
|
def __init__(self, backend, db):
|
|
self._backend = backend
|
|
self._db = db
|
|
self._session_id = None
|
|
self._thread = None
|
|
self._start_time = 0.0
|
|
self._latest_msg_id = 0
|
|
|
|
@property
|
|
def active(self):
|
|
return self._session_id is not None
|
|
|
|
@property
|
|
def session_id(self):
|
|
return self._session_id
|
|
|
|
@property
|
|
def start_time(self):
|
|
return self._start_time
|
|
|
|
@property
|
|
def latest_msg_id(self):
|
|
return self._latest_msg_id
|
|
|
|
def start_session(self):
|
|
if self._session_id is not None:
|
|
self.stop_session()
|
|
|
|
mode = 'gsmtap' if isinstance(self._backend, GsmtapListener) else 'direct'
|
|
self._session_id = self._db.create_session(mode)
|
|
self._start_time = time.monotonic()
|
|
self._latest_msg_id = 0
|
|
self._backend.start()
|
|
|
|
self._thread = threading.Thread(target=self._capture_loop, daemon=True)
|
|
self._thread.start()
|
|
|
|
return self._session_id
|
|
|
|
def stop_session(self):
|
|
if self._session_id is None:
|
|
return
|
|
self._backend.stop()
|
|
self._db.close_session(self._session_id)
|
|
sid = self._session_id
|
|
self._session_id = None
|
|
self._start_time = 0.0
|
|
return sid
|
|
|
|
def _capture_loop(self):
|
|
for msg_type, data, flags in self._backend.iter_messages():
|
|
if self._session_id is None:
|
|
break
|
|
elapsed = round(time.monotonic() - self._start_time, 3)
|
|
mid = self._db.insert_message(self._session_id, elapsed, msg_type, data, flags)
|
|
self._latest_msg_id = mid
|