<p>herlesupreeth has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/17665">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move parsing of MSISDN to generic Card class<br><br>Change-Id: I5b726bc0dc8c8e5eb42f209b1fe0f35a46ac91be<br>---<br>M pySim-read.py<br>M pySim/cards.py<br>2 files changed, 11 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/65/17665/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index a18cc77..b84be29 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -200,13 +200,11 @@</span><br><span> </span><br><span>      # EF.MSISDN</span><br><span>  try:</span><br><span style="color: hsl(0, 100%, 40%);">-    #       print(scc.record_size(['3f00', '7f10', '6f40']))</span><br><span style="color: hsl(0, 100%, 40%);">-                (res, sw) = scc.read_record(['3f00', '7f10', '6f40'], 1)</span><br><span style="color: hsl(120, 100%, 40%);">+              (res, sw) = card.read_msisdn()</span><br><span>               if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">-                        res_dec = dec_msisdn(res)</span><br><span style="color: hsl(0, 100%, 40%);">-                       if res_dec is not None:</span><br><span style="color: hsl(0, 100%, 40%);">-                         # (npi, ton, msisdn) = res_dec</span><br><span style="color: hsl(0, 100%, 40%);">-                          print("MSISDN (NPI=%d ToN=%d): %s" % res_dec)</span><br><span style="color: hsl(120, 100%, 40%);">+                       # (npi, ton, msisdn) = res</span><br><span style="color: hsl(120, 100%, 40%);">+                    if res is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+                           print("MSISDN (NPI=%d ToN=%d): %s" % res)</span><br><span>                  else:</span><br><span>                                print("MSISDN: Not available")</span><br><span>             else:</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index fe4ecb8..06753c3 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -201,6 +201,13 @@</span><br><span>            else:</span><br><span>                        return (None, sw)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def read_msisdn(self):</span><br><span style="color: hsl(120, 100%, 40%);">+                (res, sw) = self._scc.read_record(EF['MSISDN'], 1)</span><br><span style="color: hsl(120, 100%, 40%);">+            if sw == '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+                      return (dec_msisdn(res), sw)</span><br><span style="color: hsl(120, 100%, 40%);">+          else:</span><br><span style="color: hsl(120, 100%, 40%);">+                 return (None, sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  # Read the (full) AID for either ISIM or USIM application</span><br><span>    def read_aid(self, isim = False):</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/17665">change 17665</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/+/17665"/><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: I5b726bc0dc8c8e5eb42f209b1fe0f35a46ac91be </div>
<div style="display:none"> Gerrit-Change-Number: 17665 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>