GSMTAP: --gsmtap-bind to listen beyond loopback (containers)
A container's 127.0.0.1 is its own loopback, so a GSMTAP feed sent to the container's bridge address never reached the listener: it was hard-bound to 127.0.0.1. - `simtrace-analyser-server --gsmtap-bind ADDR` (default 127.0.0.1) is passed through GsmtapListener to GsmtapReceiver (whose bind_ip already existed), including the receiver re-created by a start() after close. The startup banner prints the effective bind address next to the port. - READMEs (EN/RU) document the option, naming the container case. - tests: the listener forwards the address on construction and on start(), binds 0.0.0.0, and keeps the loopback default. Verified end-to-end: with --gsmtap-bind 0.0.0.0 the socket listens on 0.0.0.0:14732 and an ATR + APDU sent to 127.0.0.1:14732 landed in the capture session (2 messages); without the flag it listens on 127.0.0.1. 557 Python + 80 Node tests.
This commit is contained in:
1 parent
c810ff50cf
commit
903ead9791
5 files changed
+51
-5
No files matched your search
@@ -342,6 +342,8 @@ Server options:
|
|||||||
--db FILE SQLite database path (default: ~/.simtrace-analyser/sessions.db)
|
--db FILE SQLite database path (default: ~/.simtrace-analyser/sessions.db)
|
||||||
--capture MODE gsmtap | direct | disabled (default: gsmtap)
|
--capture MODE gsmtap | direct | disabled (default: gsmtap)
|
||||||
--gsmtap-port PORT UDP port for the GSMTAP listener (default: 4729)
|
--gsmtap-port PORT UDP port for the GSMTAP listener (default: 4729)
|
||||||
|
--gsmtap-bind ADDR UDP bind address for the GSMTAP listener (default: 127.0.0.1;
|
||||||
|
use 0.0.0.0 to receive from a Docker bridge or another host)
|
||||||
--web-dir PATH PWA static files directory (default: the PWA bundled in
|
--web-dir PATH PWA static files directory (default: the PWA bundled in
|
||||||
the installed package, or <repo>/frontend from source)
|
the installed package, or <repo>/frontend from source)
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -351,6 +351,8 @@ TS 51.011), поэтому FID, повторно используемый в р
|
|||||||
--db FILE путь к базе SQLite (по умолчанию: ~/.simtrace-analyser/sessions.db)
|
--db FILE путь к базе SQLite (по умолчанию: ~/.simtrace-analyser/sessions.db)
|
||||||
--capture MODE gsmtap | direct | disabled (по умолчанию: gsmtap)
|
--capture MODE gsmtap | direct | disabled (по умолчанию: gsmtap)
|
||||||
--gsmtap-port PORT UDP-порт листенера GSMTAP (по умолчанию: 4729)
|
--gsmtap-port PORT UDP-порт листенера GSMTAP (по умолчанию: 4729)
|
||||||
|
--gsmtap-bind ADDR UDP-адрес привязки листенера GSMTAP (по умолчанию: 127.0.0.1;
|
||||||
|
используйте 0.0.0.0, чтобы принимать из Docker-сети или с другого хоста)
|
||||||
--web-dir PATH каталог статических файлов PWA (по умолчанию: PWA внутри
|
--web-dir PATH каталог статических файлов PWA (по умолчанию: PWA внутри
|
||||||
установленного пакета или <repo>/frontend при запуске из исходников)
|
установленного пакета или <repo>/frontend при запуске из исходников)
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
"""simtrace-analyser-server — CLI entry point.
|
"""simtrace-analyser-server — CLI entry point.
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
simtrace-analyser-server --capture gsmtap [--gsmtap-port 4729] [--port 8081]
|
simtrace-analyser-server --capture gsmtap [--gsmtap-bind 0.0.0.0]
|
||||||
|
[--gsmtap-port 4729] [--port 8081]
|
||||||
simtrace-analyser-server --capture direct [--port 8081]
|
simtrace-analyser-server --capture direct [--port 8081]
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -46,6 +47,9 @@ def main():
|
|||||||
help='Capture mode: gsmtap (listen UDP 4729), direct (SIMtrace2 USB), or disabled (no capture)')
|
help='Capture mode: gsmtap (listen UDP 4729), direct (SIMtrace2 USB), or disabled (no capture)')
|
||||||
p.add_argument('--gsmtap-port', type=int, default=4729,
|
p.add_argument('--gsmtap-port', type=int, default=4729,
|
||||||
help='UDP port for GSMTAP listener (default: 4729)')
|
help='UDP port for GSMTAP listener (default: 4729)')
|
||||||
|
p.add_argument('--gsmtap-bind', default='127.0.0.1', metavar='ADDR',
|
||||||
|
help='UDP bind address for the GSMTAP listener '
|
||||||
|
'(default: 127.0.0.1; use 0.0.0.0 in a container)')
|
||||||
p.add_argument('--log-interval', type=float, default=60.0,
|
p.add_argument('--log-interval', type=float, default=60.0,
|
||||||
help='Seconds between capture liveness heartbeat logs '
|
help='Seconds between capture liveness heartbeat logs '
|
||||||
'(default: 60.0)')
|
'(default: 60.0)')
|
||||||
@@ -61,7 +65,7 @@ def main():
|
|||||||
|
|
||||||
capture = None
|
capture = None
|
||||||
if args.capture == 'gsmtap':
|
if args.capture == 'gsmtap':
|
||||||
backend = GsmtapListener(bind_port=args.gsmtap_port)
|
backend = GsmtapListener(bind_ip=args.gsmtap_bind, bind_port=args.gsmtap_port)
|
||||||
capture = CaptureManager(backend, db, log_interval=args.log_interval)
|
capture = CaptureManager(backend, db, log_interval=args.log_interval)
|
||||||
elif args.capture == 'direct':
|
elif args.capture == 'direct':
|
||||||
backend = DirectSniffer()
|
backend = DirectSniffer()
|
||||||
@@ -78,6 +82,7 @@ def main():
|
|||||||
print(f'simtrace-analyser-server v{__version__} — http://{args.host}:{args.port}', file=sys.stderr)
|
print(f'simtrace-analyser-server v{__version__} — http://{args.host}:{args.port}', file=sys.stderr)
|
||||||
print(f' capture mode: {args.capture}', file=sys.stderr)
|
print(f' capture mode: {args.capture}', file=sys.stderr)
|
||||||
if args.capture == 'gsmtap':
|
if args.capture == 'gsmtap':
|
||||||
|
print(f' GSMTAP bind: {args.gsmtap_bind}', file=sys.stderr)
|
||||||
print(f' GSMTAP port: {args.gsmtap_port}', file=sys.stderr)
|
print(f' GSMTAP port: {args.gsmtap_port}', file=sys.stderr)
|
||||||
print(f' database: {args.db}', file=sys.stderr)
|
print(f' database: {args.db}', file=sys.stderr)
|
||||||
print(f' PWA served at http://{args.host}:{args.port}/', file=sys.stderr)
|
print(f' PWA served at http://{args.host}:{args.port}/', file=sys.stderr)
|
||||||
|
|||||||
@@ -39,15 +39,17 @@ def gsmtap_msg_type(sub_type):
|
|||||||
|
|
||||||
|
|
||||||
class GsmtapListener:
|
class GsmtapListener:
|
||||||
def __init__(self, bind_port=4729):
|
def __init__(self, bind_port=4729, bind_ip='127.0.0.1'):
|
||||||
self._bind_port = bind_port
|
self._bind_port = bind_port
|
||||||
self._receiver = GsmtapReceiver(bind_port=bind_port)
|
self._bind_ip = bind_ip
|
||||||
|
self._receiver = GsmtapReceiver(bind_ip=bind_ip, bind_port=bind_port)
|
||||||
self._running = False
|
self._running = False
|
||||||
self._dropped = 0
|
self._dropped = 0
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
if getattr(self._receiver, '_closed', False):
|
if getattr(self._receiver, '_closed', False):
|
||||||
self._receiver = GsmtapReceiver(bind_port=self._bind_port)
|
self._receiver = GsmtapReceiver(bind_ip=self._bind_ip,
|
||||||
|
bind_port=self._bind_port)
|
||||||
self._running = True
|
self._running = True
|
||||||
self._dropped = 0
|
self._dropped = 0
|
||||||
|
|
||||||
|
|||||||
@@ -206,6 +206,41 @@ class TestGsmtapListenerRobustness(unittest.TestCase):
|
|||||||
self.assertEqual(listener.dropped, 1)
|
self.assertEqual(listener.dropped, 1)
|
||||||
|
|
||||||
|
|
||||||
|
class TestGsmtapListenerBind(unittest.TestCase):
|
||||||
|
def test_bind_ip_reaches_the_receiver(self):
|
||||||
|
from simtrace_analyser import capture
|
||||||
|
calls = []
|
||||||
|
|
||||||
|
class _FakeReceiver:
|
||||||
|
def __init__(self, bind_ip='127.0.0.1', bind_port=4729):
|
||||||
|
calls.append((bind_ip, bind_port))
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
real = capture.GsmtapReceiver
|
||||||
|
capture.GsmtapReceiver = _FakeReceiver
|
||||||
|
try:
|
||||||
|
listener = capture.GsmtapListener(bind_ip='0.0.0.0', bind_port=4729)
|
||||||
|
listener._receiver._closed = True # force start() to re-create it
|
||||||
|
listener.start()
|
||||||
|
finally:
|
||||||
|
capture.GsmtapReceiver = real
|
||||||
|
self.assertEqual(calls, [('0.0.0.0', 4729), ('0.0.0.0', 4729)])
|
||||||
|
|
||||||
|
def test_all_interfaces_bind(self):
|
||||||
|
from simtrace_analyser.capture import GsmtapListener
|
||||||
|
listener = GsmtapListener(bind_ip='0.0.0.0', bind_port=0)
|
||||||
|
self.addCleanup(listener.stop)
|
||||||
|
self.assertEqual(listener._receiver._sock.getsockname()[0], '0.0.0.0')
|
||||||
|
|
||||||
|
def test_default_bind_is_loopback(self):
|
||||||
|
from simtrace_analyser.capture import GsmtapListener
|
||||||
|
listener = GsmtapListener(bind_port=0)
|
||||||
|
self.addCleanup(listener.stop)
|
||||||
|
self.assertEqual(listener._receiver._sock.getsockname()[0], '127.0.0.1')
|
||||||
|
|
||||||
|
|
||||||
class TestCaptureLoopRobustness(unittest.TestCase):
|
class TestCaptureLoopRobustness(unittest.TestCase):
|
||||||
def test_capture_loop_survives_insert_error(self):
|
def test_capture_loop_survives_insert_error(self):
|
||||||
mgr = CaptureManager(_OneShotBackend(), _NullDb())
|
mgr = CaptureManager(_OneShotBackend(), _NullDb())
|
||||||
|
|||||||
Reference in new issue
Block a user