<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/18225">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Treat MCC and MNC as strings, not integers<br><br>A MNC of 02 and 002 are *not* equal. The former is a two-digit MNC<br>and the latter is a three-digit MNC. Hence, we shouldn't treat<br>MNCs as integer values as we have no clue how many leading zeroes<br>(if any) the user entered.<br><br>Change-Id: I9d1d07a64888c76703c3e430bbdd822080c05819<br>Closes: OS#4523<br>---<br>M pySim-prog.py<br>M pySim/utils.py<br>2 files changed, 19 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/18225/1</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 67719b4..4ac480c 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -98,13 +98,13 @@</span><br><span> help="Country code [default: %default]",</span><br><span> default=1,</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-x", "--mcc", dest="mcc", type="int",</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-x", "--mcc", dest="mcc", type="string",</span><br><span> help="Mobile Country Code [default: %default]",</span><br><span style="color: hsl(0, 100%, 40%);">- default=901,</span><br><span style="color: hsl(120, 100%, 40%);">+ default="901",</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- parser.add_option("-y", "--mnc", dest="mnc", type="int",</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-y", "--mnc", dest="mnc", type="string",</span><br><span> help="Mobile Network Code [default: %default]",</span><br><span style="color: hsl(0, 100%, 40%);">- default=55,</span><br><span style="color: hsl(120, 100%, 40%);">+ default="55",</span><br><span> )</span><br><span> parser.add_option("--mnclen", dest="mnclen", type="choice",</span><br><span> help="Length of Mobile Network Code [default: %default]",</span><br><span>@@ -219,7 +219,7 @@</span><br><span> return d[0:len]</span><br><span> </span><br><span> def _mcc_mnc_digits(mcc, mnc):</span><br><span style="color: hsl(0, 100%, 40%);">- return ('%03d%03d' if mnc > 100 else '%03d%02d') % (mcc, mnc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return '%s%s' % (mcc, mnc)</span><br><span> </span><br><span> def _cc_digits(cc):</span><br><span> return ('%03d' if cc > 100 else '%02d') % cc</span><br><span>@@ -272,8 +272,17 @@</span><br><span> mcc = opts.mcc</span><br><span> mnc = opts.mnc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if not ((0 < mcc < 999) and (0 < mnc < 999)):</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError('mcc & mnc must be between 0 and 999')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not mcc.isdigit() or not mnc.isdigit():</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('mcc & mnc must only contain decimal digits')</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(mcc) < 1 or len(mcc) > 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('mcc must be between 1 .. 3 digits')</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(mnc) < 1 or len(mnc) > 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('mnc must be between 1 .. 3 digits')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # MCC always has 3 digits</span><br><span style="color: hsl(120, 100%, 40%);">+ mcc = lpad(mcc, 3, "0")</span><br><span style="color: hsl(120, 100%, 40%);">+ # MNC must be at least 2 digits</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = lpad(mnc, 2, "0")</span><br><span> </span><br><span> # Digitize country code (2 or 3 digits)</span><br><span> cc_digits = _cc_digits(opts.country)</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index a1689ca..43616a9 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -102,7 +102,9 @@</span><br><span> </span><br><span> def enc_plmn(mcc, mnc):</span><br><span> """Converts integer MCC/MNC into 3 bytes for EF"""</span><br><span style="color: hsl(0, 100%, 40%);">- return swap_nibbles(lpad('%d' % int(mcc), 3) + lpad('%d' % int(mnc), 3))</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(mnc) == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ mnc = "F%s" % mnc</span><br><span style="color: hsl(120, 100%, 40%);">+ return swap_nibbles("%s%s" % (mcc, mnc))</span><br><span> </span><br><span> def dec_spn(ef):</span><br><span> byte1 = int(ef[0:2])</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/18225">change 18225</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/+/18225"/><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: I9d1d07a64888c76703c3e430bbdd822080c05819 </div>
<div style="display:none"> Gerrit-Change-Number: 18225 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>