Change in pysim[master]: pySim-*.py: add command line option for Calypso reader

2018-11-12 Thread Vadim Yanitskiy 
Vadim Yanitskiy has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11482 )

Change subject: pySim-*.py: add command line option for Calypso reader
..

pySim-*.py: add command line option for Calypso reader

Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
---
M pySim-prog.py
M pySim-read.py
2 files changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/pySim-prog.py b/pySim-prog.py
index ba1b783..d6d7ad5 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -58,6 +58,10 @@
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 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 066b0df..4356453 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -56,6 +56,10 @@
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 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)

--
To view, visit https://gerrit.osmocom.org/11482
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
Gerrit-Change-Number: 11482
Gerrit-PatchSet: 4
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Assignee: tnt 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: tnt

Change in pysim[master]: pySim-*.py: add command line option for Calypso reader

2018-10-31 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11482 )

Change subject: pySim-*.py: add command line option for Calypso reader
..


Patch Set 4: Code-Review+2

slightly related; maybe it makes sense to generalize some of the command line 
option parsing and share it between the two programs, rather than having 
copy+paste?


--
To view, visit https://gerrit.osmocom.org/11482
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
Gerrit-Change-Number: 11482
Gerrit-PatchSet: 4
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 31 Oct 2018 08:22:34 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in pysim[master]: pySim-*.py: add command line option for Calypso reader

2018-10-28 Thread Vadim Yanitskiy 
Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11482

to look at the new patch set (#4).

Change subject: pySim-*.py: add command line option for Calypso reader
..

pySim-*.py: add command line option for Calypso reader

Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
---
M pySim-prog.py
M pySim-read.py
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/11482/4
--
To view, visit https://gerrit.osmocom.org/11482
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
Gerrit-Change-Number: 11482
Gerrit-PatchSet: 4
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Jenkins Builder (102)

Change in pysim[master]: pySim-*.py: add command line option for Calypso reader

2018-10-28 Thread Vadim Yanitskiy 
Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11482

to look at the new patch set (#3).

Change subject: pySim-*.py: add command line option for Calypso reader
..

pySim-*.py: add command line option for Calypso reader

Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
---
M pySim-prog.py
M pySim-read.py
2 files changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/11482/3
--
To view, visit https://gerrit.osmocom.org/11482
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
Gerrit-Change-Number: 11482
Gerrit-PatchSet: 3
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Jenkins Builder (102)

Change in pysim[master]: pySim-*.py: add command line option for Calypso reader

2018-10-26 Thread Vadim Yanitskiy 
Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/11482


Change subject: pySim-*.py: add command line option for Calypso reader
..

pySim-*.py: add command line option for Calypso reader

Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
---
M pySim-prog.py
M pySim-read.py
2 files changed, 14 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/11482/1

diff --git a/pySim-prog.py b/pySim-prog.py
index ba1b783..8a17d9d 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -58,6 +58,10 @@
help="Which PC/SC reader number for SIM access",
default=None,
)
+   parser.add_option("--calypso-phy", 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 opts.pcsc_dev is not None:
from pySim.transport.pcsc import PcscSimLink
sl = PcscSimLink(opts.pcsc_dev)
+   if 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 066b0df..65184ed 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -56,6 +56,10 @@
help="Which PC/SC reader number for SIM access",
default=None,
)
+   parser.add_option("--calypso-phy", 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 opts.pcsc_dev is not None:
from pySim.transport.pcsc import PcscSimLink
sl = PcscSimLink(opts.pcsc_dev)
+   if 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)

--
To view, visit https://gerrit.osmocom.org/11482
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df
Gerrit-Change-Number: 11482
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy