<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/17520">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-read.py: Added a common card detection function for both pySim-prog.py and pySim-read.py<br><br>This function is used to detect the card type and return Card class/Card subclasses object<br>if its a know card or else None. Also, an initial step towards refactoring of code.<br><br>Change-Id: I71f57c6403dc933bd9d54f90df3d3fe105b4f66f<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>M pySim/cards.py<br>M pysim-testdata/Fairwaves-SIM.ok<br>M pysim-testdata/Wavemobile-SIM.ok<br>M pysim-testdata/fakemagicsim.ok<br>M pysim-testdata/sysmoISIM-SJA2.ok<br>M pysim-testdata/sysmoUSIM-SJS1.ok<br>M pysim-testdata/sysmosim-gr1.ok<br>9 files changed, 44 insertions(+), 36 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 a7081ff..e3045a6 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> import simplejson as json</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.cards import _cards_classes</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.cards import _cards_classes, card_detect</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid</span><br><span> from pySim.ts_51_011 import EF</span><br><span> from pySim.card_handler import *</span><br><span>@@ -609,36 +609,6 @@</span><br><span> fh.close()</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def card_detect(opts, scc):</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Detect type if needed</span><br><span style="color: hsl(0, 100%, 40%);">- card = None</span><br><span style="color: hsl(0, 100%, 40%);">- ctypes = dict([(kls.name, kls) for kls in _cards_classes])</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.type in ("auto", "auto_once"):</span><br><span style="color: hsl(0, 100%, 40%);">- for kls in _cards_classes:</span><br><span style="color: hsl(0, 100%, 40%);">- card = kls.autodetect(scc)</span><br><span style="color: hsl(0, 100%, 40%);">- if card:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Autodetected card type: %s" % card.name)</span><br><span style="color: hsl(0, 100%, 40%);">- card.reset()</span><br><span style="color: hsl(0, 100%, 40%);">- break</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if card is None:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Autodetection failed")</span><br><span style="color: hsl(0, 100%, 40%);">- return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.type == "auto_once":</span><br><span style="color: hsl(0, 100%, 40%);">- opts.type = card.name</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- elif opts.type in ctypes:</span><br><span style="color: hsl(0, 100%, 40%);">- card = ctypes[opts.type](scc)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError("Unknown card type: %s" % opts.type)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return card</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def process_card(opts, first, card_handler):</span><br><span> </span><br><span> if opts.dry_run is False:</span><br><span>@@ -647,7 +617,7 @@</span><br><span> </span><br><span> if opts.dry_run is False:</span><br><span> # Get card</span><br><span style="color: hsl(0, 100%, 40%);">- card = card_detect(opts, scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ card = card_detect(opts.type, scc)</span><br><span> if card is None:</span><br><span> print("No card detected!")</span><br><span> return -1</span><br><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 55b43d7..bad2047 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -31,6 +31,7 @@</span><br><span> from pySim.ts_51_011 import EF, DF</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.cards import card_detect, Card</span><br><span> from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn, format_xplmn_w_act, dec_spn</span><br><span> </span><br><span> </span><br><span>@@ -94,6 +95,9 @@</span><br><span> # Program the card</span><br><span> print("Reading ...")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Initialize Card object by auto detecting the card</span><br><span style="color: hsl(120, 100%, 40%);">+ card = card_detect("auto", scc) or Card(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # EF.ICCID</span><br><span> (res, sw) = scc.read_binary(EF['ICCID'])</span><br><span> if sw == '9000':</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index fe7f0fd..a43da9c 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -1104,3 +1104,31 @@</span><br><span> card.reset()</span><br><span> return card</span><br><span> return None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def card_detect(ctype, scc):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Detect type if needed</span><br><span style="color: hsl(120, 100%, 40%);">+ card = None</span><br><span style="color: hsl(120, 100%, 40%);">+ ctypes = dict([(kls.name, kls) for kls in _cards_classes])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ctype in ("auto", "auto_once"):</span><br><span style="color: hsl(120, 100%, 40%);">+ for kls in _cards_classes:</span><br><span style="color: hsl(120, 100%, 40%);">+ card = kls.autodetect(scc)</span><br><span style="color: hsl(120, 100%, 40%);">+ if card:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Autodetected card type: %s" % card.name)</span><br><span style="color: hsl(120, 100%, 40%);">+ card.reset()</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if card is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Autodetection failed")</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ctype == "auto_once":</span><br><span style="color: hsl(120, 100%, 40%);">+ ctype = card.name</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ elif ctype in ctypes:</span><br><span style="color: hsl(120, 100%, 40%);">+ card = ctypes[ctype](scc)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Unknown card type: %s" % ctype)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return card</span><br><span>diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>index dfcf05d..ffe9c42 100644</span><br><span>--- a/pysim-testdata/Fairwaves-SIM.ok</span><br><span>+++ b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>@@ -1,5 +1,6 @@</span><br><span> Using PC/SC reader (dev=0) interface</span><br><span> Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+Autodetected card type: Fairwaves-SIM</span><br><span> ICCID: 8988219000000117833</span><br><span> IMSI: 001010000000111</span><br><span> GID1: ffffffffffffffff</span><br><span>diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>index 8447023..03191b3 100644</span><br><span>--- a/pysim-testdata/Wavemobile-SIM.ok</span><br><span>+++ b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>@@ -1,9 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Using PC/SC reader (dev=4) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=3) interface</span><br><span> Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+Autodetected card type: Wavemobile-SIM</span><br><span> ICCID: 89445310150011013678</span><br><span> IMSI: 001010000000102</span><br><span style="color: hsl(0, 100%, 40%);">-GID1: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span style="color: hsl(0, 100%, 40%);">-GID2: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span style="color: hsl(120, 100%, 40%);">+GID1: Can't read file -- SW match failed! Expected 9000 and got 6a82.</span><br><span style="color: hsl(120, 100%, 40%);">+GID2: Can't read file -- SW match failed! Expected 9000 and got 6a82.</span><br><span> SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff</span><br><span> SPN: wavemobile</span><br><span> Display HPLMN: False</span><br><span>@@ -45,7 +46,7 @@</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span style="color: hsl(120, 100%, 40%);">+HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 6a82.</span><br><span> ACC: abce</span><br><span> MSISDN: Not available</span><br><span> AD: 00ffff02</span><br><span>diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok</span><br><span>index 816b3dc..4ee5c7f 100644</span><br><span>--- a/pysim-testdata/fakemagicsim.ok</span><br><span>+++ b/pysim-testdata/fakemagicsim.ok</span><br><span>@@ -1,5 +1,6 @@</span><br><span> Using PC/SC reader (dev=2) interface</span><br><span> Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+Autodetected card type: fakemagicsim</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span> GID1: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>index ce4ce7c..0ccb8e9 100644</span><br><span>--- a/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -1,5 +1,6 @@</span><br><span> Using PC/SC reader (dev=0) interface</span><br><span> Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+Autodetected card type: sysmoISIM-SJA2</span><br><span> ICCID: 8988211900000000004</span><br><span> IMSI: 001010000000102</span><br><span> GID1: ffffffffffffffffffff</span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index 83a8e9e..0299e3f 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -1,5 +1,6 @@</span><br><span> Using PC/SC reader (dev=1) interface</span><br><span> Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+Autodetected card type: sysmoUSIM-SJS1</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span> GID1: ffffffffffffffffffff</span><br><span>diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok</span><br><span>index 50f949d..04e4965 100644</span><br><span>--- a/pysim-testdata/sysmosim-gr1.ok</span><br><span>+++ b/pysim-testdata/sysmosim-gr1.ok</span><br><span>@@ -1,5 +1,6 @@</span><br><span> Using PC/SC reader (dev=3) interface</span><br><span> Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+Autodetected card type: sysmosim-gr1</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span> GID1: Can't read file -- SW match failed! Expected 9000 and got 9404.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/17520">change 17520</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/+/17520"/><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: I71f57c6403dc933bd9d54f90df3d3fe105b4f66f </div>
<div style="display:none"> Gerrit-Change-Number: 17520 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>