<p>herlesupreeth has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/20315">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move reading of USIM service table to generic USIM class<br><br>Change-Id: I537547f3bd01a547310358f8a8fceddcb4c79f37<br>---<br>M pySim-read.py<br>M pySim/cards.py<br>2 files changed, 21 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/20315/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 a4f15f8..3e19a02 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -256,14 +256,20 @@</span><br><span>                              print("EHPLMN:\n%s" % (res))</span><br><span>                       else:</span><br><span>                                print("EHPLMN: Can't read, response code = %s" % (sw,))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>              # EF.UST</span><br><span style="color: hsl(0, 100%, 40%);">-                (res, sw) = card.read_binary(EF_USIM_ADF_map['UST'])</span><br><span style="color: hsl(0, 100%, 40%);">-            if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">-                        print("USIM Service Table: %s" % res)</span><br><span style="color: hsl(0, 100%, 40%);">-                 # Print those which are available</span><br><span style="color: hsl(0, 100%, 40%);">-                       print("%s" % dec_st(res, table="usim"))</span><br><span style="color: hsl(0, 100%, 40%);">-             else:</span><br><span style="color: hsl(0, 100%, 40%);">-                   print("USIM Service Table: Can't read, response code = %s" % (sw,))</span><br><span style="color: hsl(120, 100%, 40%);">+             try:</span><br><span style="color: hsl(120, 100%, 40%);">+                  if card.file_exists(EF_USIM_ADF_map['UST']):</span><br><span style="color: hsl(120, 100%, 40%);">+                          # res[0] - EF content of UST</span><br><span style="color: hsl(120, 100%, 40%);">+                          # res[1] - Human readable format of services marked available in UST</span><br><span style="color: hsl(120, 100%, 40%);">+                          (res, sw) = card.read_ust()</span><br><span style="color: hsl(120, 100%, 40%);">+                           if sw == '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+                                      print("USIM Service Table: %s" % res[0])</span><br><span style="color: hsl(120, 100%, 40%);">+                                    print("%s" % res[1])</span><br><span style="color: hsl(120, 100%, 40%);">+                                else:</span><br><span style="color: hsl(120, 100%, 40%);">+                                 print("USIM Service Table: Can't read, response code = %s" % (sw,))</span><br><span style="color: hsl(120, 100%, 40%);">+             except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+                        print("USIM Service Table: Can't read file -- " + str(e))</span><br><span> </span><br><span>          #EF.ePDGId - Home ePDG Identifier</span><br><span>            try:</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index c4bf812..ae4aaf2 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -277,6 +277,14 @@</span><br><span>                                             EF_USIM_ADF_map['ePDGId'], epdgid_tlv)</span><br><span>               return sw</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def read_ust(self):</span><br><span style="color: hsl(120, 100%, 40%);">+           (res, sw) = self._scc.read_binary(EF_USIM_ADF_map['UST'])</span><br><span style="color: hsl(120, 100%, 40%);">+             if sw == '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+                      # Print those which are available</span><br><span style="color: hsl(120, 100%, 40%);">+                     return ([res, dec_st(res, table="usim")], sw)</span><br><span style="color: hsl(120, 100%, 40%);">+               else:</span><br><span style="color: hsl(120, 100%, 40%);">+                 return ([None, None], sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> class _MagicSimBase(Card):</span><br><span>        """</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/20315">change 20315</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/+/20315"/><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: I537547f3bd01a547310358f8a8fceddcb4c79f37 </div>
<div style="display:none"> Gerrit-Change-Number: 20315 </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>