<p>herlesupreeth has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16944">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fixed MCC and MCC representation in the output of pySim-read<br><br>Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096<br>---<br>M pySim/utils.py<br>1 file changed, 18 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 65f10c5..3b6c0bc 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -124,9 +124,13 @@</span><br><span>         digit3 = ia[1] & 0x0F               # 2nd byte, LSB</span><br><span>      if digit3 == 0xF and digit2 == 0xF and digit1 == 0xF:</span><br><span>                return 0xFFF # 4095</span><br><span style="color: hsl(0, 100%, 40%);">-     mcc = digit1 * 100</span><br><span style="color: hsl(0, 100%, 40%);">-      mcc += digit2 * 10</span><br><span style="color: hsl(0, 100%, 40%);">-      mcc += digit3</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = 0</span><br><span style="color: hsl(120, 100%, 40%);">+       if digit1 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+             mcc += digit1 * 100</span><br><span style="color: hsl(120, 100%, 40%);">+   if digit2 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+             mcc += digit2 * 10</span><br><span style="color: hsl(120, 100%, 40%);">+    if digit3 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+             mcc += digit3</span><br><span>        return mcc</span><br><span> </span><br><span> def dec_mnc_from_plmn(plmn):</span><br><span>@@ -139,12 +143,17 @@</span><br><span>       mnc = 0</span><br><span>      # signifies two digit MNC</span><br><span>    if digit3 == 0xF:</span><br><span style="color: hsl(0, 100%, 40%);">-               mnc += digit1 * 10</span><br><span style="color: hsl(0, 100%, 40%);">-              mnc += digit2</span><br><span style="color: hsl(120, 100%, 40%);">+         if digit1 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+                     mnc += digit1 * 10</span><br><span style="color: hsl(120, 100%, 40%);">+            if digit2 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+                     mnc += digit2</span><br><span>        else:</span><br><span style="color: hsl(0, 100%, 40%);">-           mnc += digit1 * 100</span><br><span style="color: hsl(0, 100%, 40%);">-             mnc += digit2 * 10</span><br><span style="color: hsl(0, 100%, 40%);">-              mnc += digit3</span><br><span style="color: hsl(120, 100%, 40%);">+         if digit1 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+                     mnc += digit1 * 100</span><br><span style="color: hsl(120, 100%, 40%);">+           if digit2 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+                     mnc += digit2 * 10</span><br><span style="color: hsl(120, 100%, 40%);">+            if digit3 != 0XF:</span><br><span style="color: hsl(120, 100%, 40%);">+                     mnc += digit3</span><br><span>        return mnc</span><br><span> </span><br><span> def dec_act(twohexbytes):</span><br><span>@@ -182,7 +191,7 @@</span><br><span>            if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF:</span><br><span>                    rec_str = "unused"</span><br><span>                 else:</span><br><span style="color: hsl(0, 100%, 40%);">-                   rec_str = "MCC: %3s MNC: %3s AcT: %s" % (rec_info['mcc'], rec_info['mnc'], ", ".join(rec_info['act']))</span><br><span style="color: hsl(120, 100%, 40%);">+                    rec_str = "MCC: %03d MNC: %03d AcT: %s" % (rec_info['mcc'], rec_info['mnc'], ", ".join(rec_info['act']))</span><br><span>                 s += "\t%s # %s\n" % (rec_data, rec_str)</span><br><span>   return s</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16944">change 16944</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/+/16944"/><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: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 </div>
<div style="display:none"> Gerrit-Change-Number: 16944 </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>