From 9f9f5a6157265b1b20a99b1d4707462f73b06a6f Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sat, 27 Oct 2018 02:10:34 +0700 Subject: [PATCH] pySim-*.py: add command line option for Calypso reader Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df --- pySim-prog.py | 7 +++++++ pySim-read.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/pySim-prog.py b/pySim-prog.py index ba1b783a..d6d7ad54 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -58,6 +58,10 @@ def parse_options(): help="Which PC/SC reader number for SIM access", default=None, ) + parser.add_option("--osmocon", dest="osmocon_sock", metavar="PATH", + help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)", + default=None, + ) parser.add_option("-t", "--type", dest="type", help="Card type (user -t list to view) [default: %default]", default="auto", @@ -566,6 +570,9 @@ if __name__ == '__main__': if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + elif opts.osmocon_sock is not None: + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) diff --git a/pySim-read.py b/pySim-read.py index 066b0df3..43564532 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -56,6 +56,10 @@ def parse_options(): help="Which PC/SC reader number for SIM access", default=None, ) + parser.add_option("--osmocon", dest="osmocon_sock", metavar="PATH", + help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)", + default=None, + ) (options, args) = parser.parse_args() @@ -74,6 +78,9 @@ if __name__ == '__main__': if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + elif opts.osmocon_sock is not None: + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)