<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16944">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;">Fix MCC and MCC representation in the output of pySim-read<br><br>Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096<br>---<br>M pySim/utils.py<br>M pysim-testdata/Fairwaves-SIM.ok<br>M pysim-testdata/Wavemobile-SIM.ok<br>M pysim-testdata/sysmoISIM-SJA2.ok<br>M pysim-testdata/sysmoUSIM-SJS1.ok<br>5 files changed, 48 insertions(+), 23 deletions(-)<br><br></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 e8dd531..af4a491 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -124,10 +124,7 @@</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(0, 100%, 40%);">- return mcc</span><br><span style="color: hsl(120, 100%, 40%);">+ return derive_mcc(digit1, digit2, digit3)</span><br><span> </span><br><span> def dec_mnc_from_plmn(plmn):</span><br><span> ia = h2i(plmn)</span><br><span>@@ -136,16 +133,7 @@</span><br><span> digit3 = (ia[1] & 0xF0) >> 4 # 2nd byte, MSB</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%);">- mnc = 0</span><br><span style="color: hsl(0, 100%, 40%);">- # signifies two digit MNC</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- 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(0, 100%, 40%);">- return mnc</span><br><span style="color: hsl(120, 100%, 40%);">+ return derive_mnc(digit1, digit2, digit3)</span><br><span> </span><br><span> def dec_act(twohexbytes):</span><br><span> act_list = [</span><br><span>@@ -182,7 +170,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>@@ -233,3 +221,40 @@</span><br><span> return imsi[3:5]</span><br><span> else:</span><br><span> return None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def derive_mcc(digit1, digit2, digit3):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Derive decimal representation of the MCC (Mobile Country Code)</span><br><span style="color: hsl(120, 100%, 40%);">+ from three given digits.</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if digit1 != 0x0f:</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc += digit1 * 100</span><br><span style="color: hsl(120, 100%, 40%);">+ if digit2 != 0x0f:</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc += digit2 * 10</span><br><span style="color: hsl(120, 100%, 40%);">+ if digit3 != 0x0f:</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc += digit3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def derive_mnc(digit1, digit2, digit3=0x0f):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Derive decimal representation of the MNC (Mobile Network Code)</span><br><span style="color: hsl(120, 100%, 40%);">+ from two or (optionally) three given digits.</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # 3-rd digit is optional for the MNC. If present</span><br><span style="color: hsl(120, 100%, 40%);">+ # the algorythm is the same as for the MCC.</span><br><span style="color: hsl(120, 100%, 40%);">+ if digit3 != 0x0f:</span><br><span style="color: hsl(120, 100%, 40%);">+ return derive_mcc(digit1, digit2, digit3)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if digit1 != 0x0f:</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc += digit1 * 10</span><br><span style="color: hsl(120, 100%, 40%);">+ if digit2 != 0x0f:</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc += digit2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return mnc</span><br><span>diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>index 94df376..cd6e33b 100644</span><br><span>--- a/pysim-testdata/Fairwaves-SIM.ok</span><br><span>+++ b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>@@ -28,7 +28,7 @@</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span> HPLMNAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span>diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>index 8b14a30..30aeed8 100644</span><br><span>--- a/pysim-testdata/Wavemobile-SIM.ok</span><br><span>+++ b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>@@ -8,7 +8,7 @@</span><br><span> Display OPLMN: False</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span>@@ -26,7 +26,7 @@</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span> OPLMNwAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>index 77c4878..a64aa8b 100644</span><br><span>--- a/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -8,7 +8,7 @@</span><br><span> Display OPLMN: False</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span>@@ -22,7 +22,7 @@</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span> OPLMNwAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index d0523f8..8def4e3 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -8,7 +8,7 @@</span><br><span> Display OPLMN: True</span><br><span> PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span> PLMNwAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span>@@ -22,7 +22,7 @@</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span> OPLMNwAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span>@@ -36,7 +36,7 @@</span><br><span> ffffff0000 # unused</span><br><span> </span><br><span> HPLMNAcT:</span><br><span style="color: hsl(0, 100%, 40%);">- fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span style="color: hsl(120, 100%, 40%);">+ fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</span><br><span> ffffff0000 # unused</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: 9 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Assignee: dexter <pmaier@sysmocom.de> </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>