<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24570">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ts_31_102: Fully support USIM EF.AD<br><br>The USIM EF.AD has quite some more bits, it should have a separate<br>implementation and not reuse te DF.GSM/EF.AD implementation.<br><br>Change-Id: Iaf195cb63d5d12fc906a7e7cd85e3fd44589a41e<br>---<br>M pySim/ts_31_102.py<br>1 file changed, 26 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/24570/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py</span><br><span>index d6f5dc0..075d6bf 100644</span><br><span>--- a/pySim/ts_31_102.py</span><br><span>+++ b/pySim/ts_31_102.py</span><br><span>@@ -276,13 +276,15 @@</span><br><span> # ADF.USIM</span><br><span> ######################################################################</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import enum</span><br><span> from struct import unpack, pack</span><br><span> from construct import *</span><br><span style="color: hsl(120, 100%, 40%);">+from construct import Optional as COptional</span><br><span> from pySim.construct import *</span><br><span> from pySim.filesystem import *</span><br><span> from pySim.tlv import *</span><br><span> from pySim.ts_102_221 import EF_ARR</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel, EF_AD</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel</span><br><span> from pySim.ts_51_011 import EF_CBMID, EF_CBMIR, EF_ADN, EF_SMS, EF_MSISDN, EF_SMSP, EF_SMSS</span><br><span> from pySim.ts_51_011 import EF_SMSR, EF_DCK, EF_EXT, EF_CNL, EF_OPL, EF_MBI, EF_MWIS</span><br><span> from pySim.ts_51_011 import EF_MMSN, EF_MMSICP, EF_MMSUP, EF_MMSUCP, EF_VGCS, EF_VGCSS, EF_NIA</span><br><span>@@ -555,6 +557,28 @@</span><br><span> super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size)</span><br><span> self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/HexAdapter(Bytes(5)), 'rfu'/Int8ub,</span><br><span> 'lu_status'/Int8ub)</span><br><span style="color: hsl(120, 100%, 40%);">+# TS 31.102 Section 4.2.18</span><br><span style="color: hsl(120, 100%, 40%);">+class EF_AD(TransparentEF):</span><br><span style="color: hsl(120, 100%, 40%);">+ class OP_MODE(enum.IntEnum):</span><br><span style="color: hsl(120, 100%, 40%);">+ normal = 0x00</span><br><span style="color: hsl(120, 100%, 40%);">+ type_approval = 0x80</span><br><span style="color: hsl(120, 100%, 40%);">+ normal_and_specific_facilities = 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+ type_approval_and_specific_facilities = 0x81</span><br><span style="color: hsl(120, 100%, 40%);">+ maintenance_off_line = 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_test = 0x04</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, fid='6fad', sfid=0x03, name='EF.AD', desc='Administrative Data', size={4,6}):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._construct = BitStruct(</span><br><span style="color: hsl(120, 100%, 40%);">+ # Byte 1</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ms_operation_mode'/Bytewise(Enum(Byte, EF_AD.OP_MODE)),</span><br><span style="color: hsl(120, 100%, 40%);">+ # Byte 2 + 3</span><br><span style="color: hsl(120, 100%, 40%);">+ 'additional_info'/Bytewise(FlagsEnum(Int16ub, ciphering_indicator=1, csg_display_control=2,</span><br><span style="color: hsl(120, 100%, 40%);">+ prose_services=4, extended_drx=8)),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'rfu'/BitsRFU(4),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'mnc_len'/BitsInteger(4),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'extensions'/COptional(Bytewise(GreedyBytesRFU))</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span> </span><br><span> # TS 31.102 Section 4.2.23</span><br><span> class EF_PSLOCI(TransparentEF):</span><br><span>@@ -817,7 +841,7 @@</span><br><span> EF_ACC(sfid=0x06),</span><br><span> EF_PLMNsel('6f7b', 0x0d, 'EF.FPLMN', 'Forbidden PLMNs', size={12,None}),</span><br><span> EF_LOCI(),</span><br><span style="color: hsl(0, 100%, 40%);">- EF_AD(sfid=0x03),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_AD(),</span><br><span> EF_CBMID(sfid=0x0e),</span><br><span> EF_ECC(),</span><br><span> EF_CBMIR(),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24570">change 24570</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/+/24570"/><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: Iaf195cb63d5d12fc906a7e7cd85e3fd44589a41e </div>
<div style="display:none"> Gerrit-Change-Number: 24570 </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>