<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/21939">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;">utils.py: Bugfix for parsing non-programmed EFePDGSelection<br><br>Change-Id: I3a16af785d8ae9ea8730771367bba2d50690b414<br>---<br>M pySim/utils.py<br>M pysim-testdata/sysmoISIM-SJA2.ok<br>2 files changed, 9 insertions(+), 3 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 ebc2a95..cdb2926 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -651,6 +651,7 @@</span><br><span> def format_ePDGSelection(hexstr):</span><br><span> ePDGSelection_info_tag_chars = 2</span><br><span> ePDGSelection_info_tag_str = hexstr[:2]</span><br><span style="color: hsl(120, 100%, 40%);">+ s = ""</span><br><span> # Minimum length</span><br><span> len_chars = 2</span><br><span> # TODO: Need to determine length properly - definite length support only</span><br><span>@@ -659,6 +660,11 @@</span><br><span> # But, each PLMN entry is made of PLMN (3 Bytes) + ePDG Priority (2 Bytes) + ePDG FQDN format (1 Byte)</span><br><span> # Totalling to 6 Bytes, maybe length should be 6n</span><br><span> len_str = hexstr[ePDGSelection_info_tag_chars:ePDGSelection_info_tag_chars+len_chars]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Not programmed scenario</span><br><span style="color: hsl(120, 100%, 40%);">+ if int(len_str, 16) == 255 or int(ePDGSelection_info_tag_str, 16) == 255:</span><br><span style="color: hsl(120, 100%, 40%);">+ len_chars = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ePDGSelection_info_tag_chars = 0</span><br><span> if len_str[0] == '8':</span><br><span> # The bits 7 to 1 denotes the number of length octets if length > 127</span><br><span> if int(len_str[1]) > 0:</span><br><span>@@ -669,7 +675,6 @@</span><br><span> content_str = hexstr[ePDGSelection_info_tag_chars+len_chars:]</span><br><span> # Right pad to prevent index out of range - multiple of 6 bytes</span><br><span> content_str = rpad(content_str, len(content_str) + (12 - (len(content_str) % 12)))</span><br><span style="color: hsl(0, 100%, 40%);">- s = ""</span><br><span> for rec_data in hexstr_to_Nbytearr(content_str, 6):</span><br><span> rec_info = dec_ePDGSelection(rec_data)</span><br><span> if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF:</span><br><span>diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>index b6836e7..94c4328 100644</span><br><span>--- a/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>+++ b/pysim-testdata/sysmoISIM-SJA2.ok</span><br><span>@@ -108,7 +108,7 @@</span><br><span> ffffff # unused</span><br><span> ffffff # unused</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-USIM Service Table: beff9f9de73e0408400170730000002e00000000</span><br><span style="color: hsl(120, 100%, 40%);">+USIM Service Table: beff9f9de73e0408400170330006002e00000000</span><br><span> Service 2 - Fixed Dialling Numbers (FDN)</span><br><span> Service 3 - Extension 2</span><br><span> Service 4 - Service Dialling Numbers (SDN)</span><br><span>@@ -156,7 +156,8 @@</span><br><span> Service 90 - Operator CSG Lists and corresponding indications</span><br><span> Service 93 - Communication Control for IMS by USIM</span><br><span> Service 94 - Extended Terminal Applications</span><br><span style="color: hsl(0, 100%, 40%);">- Service 95 - Support of UICC access to IMS</span><br><span style="color: hsl(120, 100%, 40%);">+ Service 106 - ePDG configuration Information support</span><br><span style="color: hsl(120, 100%, 40%);">+ Service 107 - ePDG configuration Information configured</span><br><span> Service 122 - 5GS Mobility Management Information</span><br><span> Service 123 - 5G Security Parameters</span><br><span> Service 124 - Subscription identifier privacy support</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/21939">change 21939</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/+/21939"/><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: I3a16af785d8ae9ea8730771367bba2d50690b414 </div>
<div style="display:none"> Gerrit-Change-Number: 21939 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>