catarrh/otaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scp81: rename passthru to redirect, add a true passthru mode (v2.2.13)

Browse Source 
The former 'passthru' mode is now 'redirect': it pins the configured target
and every BIP channel is connected there (the card's requested address is
only logged; host/port required). The name 'passthru' now means the new mode:
no listener and no target - each channel dials the destination the card
requests in OPEN CHANNEL (Other address + Transport level port, TCP client,
remote, 0x02 only). The specs define no default port (TS 102 223 8.59), so an
incomplete or non-TCP request fails the channel with result 3A and an
open-fail log reason.

BipTerminal gains a mode (enable(host, port, mode=...), open(..., proto=...)),
reports it in status(), and the control API/status expose redirect (target)
and passthru (per-channel targets). The PWA mode selector shows four modes
with per-mode notes and disables Host/Port in passthru; the status line shows
each channel's actual target. Docs, help (EN/RU), READMEs and the AGENTS notes
updated; SW cache otaman-v179.

Breaking API change: mode:'passthru' has the new semantics - use
mode:'redirect' for the previous behavior (no alias).
This commit is contained in:
Антон Трошин
2026-09-17 08:17:28 +03:00
parent b02f28f6ce
commit 404fdf5a1c
13 changed files with 241 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_scp81.py
+25 -9
View File
@@ -682,38 +682,54 @@ class BipControlTest(unittest.TestCase):
self.assertFalse(resp['ok'])
self.assertIn('unsupported mode', resp['error'])
def test_passthru_mode_targets_the_external_server(self):
resp = server._scp81_bip_control({'action': 'start', 'mode': 'passthru',
def test_redirect_mode_targets_the_external_server(self):
resp = server._scp81_bip_control({'action': 'start', 'mode': 'redirect',
'host': '10.11.12.13', 'port': 10174})
self.assertTrue(resp['ok'], resp)
self.assertIsNone(server._SCP81_LISTENER) # no local listener
self.assertEqual(resp['listener']['mode'], 'passthru')
self.assertEqual(resp['listener']['mode'], 'redirect')
self.assertEqual(resp['listener']['host'], '10.11.12.13')
self.assertEqual(resp['listener']['port'], 10174)
self.assertEqual(resp['listener']['target'], '10.11.12.13:10174')
self.assertTrue(resp['bip']['enabled'])
self.assertEqual(server._BIP.target, ('10.11.12.13', 10174))
# the status endpoint sees the passthru mode while it runs ...
self.assertEqual(server._scp81_listener_status()['mode'], 'passthru')
# the status endpoint sees the redirect mode while it runs ...
self.assertEqual(server._scp81_listener_status()['mode'], 'redirect')
# ... and stopping clears it (no stale listener in the status)
server._scp81_bip_control({'action': 'stop'})
self.assertIsNone(server._scp81_listener_status())
self.assertFalse(server._BIP.enabled)
def test_passthru_mode_requires_an_explicit_target(self):
def test_redirect_mode_requires_an_explicit_target(self):
# No defaults for a remote platform: the target must be configured.
resp = server._scp81_bip_control({'action': 'start', 'mode': 'passthru'})
resp = server._scp81_bip_control({'action': 'start', 'mode': 'redirect'})
self.assertFalse(resp['ok'])
self.assertIn('host and port', resp['error'])
resp = server._scp81_bip_control({'action': 'start', 'mode': 'passthru',
resp = server._scp81_bip_control({'action': 'start', 'mode': 'redirect',
'host': '10.0.0.1'})
self.assertFalse(resp['ok'])
resp = server._scp81_bip_control({'action': 'start', 'mode': 'passthru',
resp = server._scp81_bip_control({'action': 'start', 'mode': 'redirect',
'port': 1234})
self.assertFalse(resp['ok'])
self.assertIsNone(server._SCP81_LISTENER)
self.assertFalse(server._BIP.enabled)
def test_passthru_mode_needs_no_target(self):
# Passthru: no listener and no pinned target - every BIP channel dials
# the destination the card requests in OPEN CHANNEL.
resp = server._scp81_bip_control({'action': 'start', 'mode': 'passthru'})
self.assertTrue(resp['ok'], resp)
self.assertIsNone(server._SCP81_LISTENER)
self.assertEqual(resp['listener'], {'mode': 'passthru'})
self.assertEqual(server._BIP.mode, 'passthru')
self.assertIsNone(server._BIP.target)
self.assertTrue(resp['bip']['enabled'])
self.assertEqual(resp['bip']['mode'], 'passthru')
self.assertEqual(server._scp81_listener_status(), {'mode': 'passthru'})
server._scp81_bip_control({'action': 'stop'})
self.assertIsNone(server._scp81_listener_status())
self.assertFalse(server._BIP.enabled)
def test_start_accepts_explicit_script_list(self):
server._SCP81_PSKS = {}
server._SCP81_PSK_LEGACY = None