<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23028">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils: catch exceptions during reader initalitation<br><br>Failed reader initializations happen frome time to time, mostly because<br>of messed up commandline arguments. This results in ugly crashes very<br>often. Lets control this a bit by catching the exception string and<br>print it.<br><br>Change-Id: I313017355da01bbef7c3d3f1899555aadb509319<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>M pySim/utils.py<br>3 files changed, 25 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index cf503d0..fbf2b73 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -720,6 +720,8 @@</span><br><span> </span><br><span> # Init card reader driver</span><br><span> sl = init_reader(opts)</span><br><span style="color: hsl(120, 100%, 40%);">+ if sl is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1)</span><br><span> </span><br><span> # Create command layer</span><br><span> scc = SimCardCommands(transport=sl)</span><br><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index f901260..7906685 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -82,6 +82,8 @@</span><br><span> </span><br><span> # Init card reader driver</span><br><span> sl = init_reader(opts)</span><br><span style="color: hsl(120, 100%, 40%);">+ if sl is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1)</span><br><span> </span><br><span> # Create command layer</span><br><span> scc = SimCardCommands(transport=sl)</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index c150184..67bfa74 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -607,24 +607,28 @@</span><br><span> """</span><br><span> Init card reader driver</span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.pcsc_dev is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using PC/SC reader interface")</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.pcsc import PcscSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(0, 100%, 40%);">- elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using Calypso-based (OsmocomBB) reader interface")</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span style="color: hsl(0, 100%, 40%);">- elif opts.modem_dev is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using modem for Generic SIM Access (3GPP TS 27.007)")</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.modem_atcmd import ModemATCommandLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud)</span><br><span style="color: hsl(0, 100%, 40%);">- else: # Serial reader is default</span><br><span style="color: hsl(0, 100%, 40%);">- print("Using serial reader interface")</span><br><span style="color: hsl(0, 100%, 40%);">- from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(0, 100%, 40%);">- sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.pcsc_dev is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using PC/SC reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.pcsc import PcscSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using Calypso-based (OsmocomBB) reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif opts.modem_dev is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using modem for Generic SIM Access (3GPP TS 27.007)")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.modem_atcmd import ModemATCommandLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud)</span><br><span style="color: hsl(120, 100%, 40%);">+ else: # Serial reader is default</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using serial reader interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+ sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(120, 100%, 40%);">+ return sl</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Card reader initialization failed with exception:\n" + str(e))</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return sl</span><br><span> </span><br><span> def enc_ePDGSelection(hexstr, mcc, mnc, epdg_priority='0001', epdg_fqdn_format='00'):</span><br><span> """</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23028">change 23028</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/23028"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 </div>
<div style="display:none"> Gerrit-Change-Number: 23028 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>