commit 0dc6c201e5ee2fa1db0d71997bdd2084ec3190b4
author Harald Welte <laforge@osmocom.org> Tue Jan 24 18:10:13 2023 +0100
committer Harald Welte <laforge@osmocom.org> Fri Jan 27 20:46:08 2023 +0100
tree ac795f1666aa6255a9b026f097bb8ae95b1babce
parent f11f1308b1ed9f33b1373dfd132e74225d0c6c60

ts_51_011, ts_31_102: point to proper EF_EXTn file

We're using a shared class to implement the identical file encoding
for EF.{ADN,SDN,MBDN,BDN,FDN,CFIS}.  However, they all point to
different extension files.

Previosly for EF.SDN:
    "ext1_record_id": 255

Now for EF.SDN:
    "ext3_record_id": 255

Change-Id: I5301d41225266d35c05e41588811502e5595520d
Related: OS#5784

pySim/ts_51_011.py

diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py
index df1bfed..8196a55 100644
--- a/pySim/ts_51_011.py
+++ b/pySim/ts_51_011.py
@@ -358,14 +358,15 @@
 
 # TS 51.011 Section 10.5.1
 class EF_ADN(LinFixedEF):
-    def __init__(self, fid='6f3a', sfid=None, name='EF.ADN', desc='Abbreviated Dialing Numbers', **kwargs):
+    def __init__(self, fid='6f3a', sfid=None, name='EF.ADN', desc='Abbreviated Dialing Numbers', ext=1, **kwargs):
         super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(14, 30), **kwargs)
+        ext_name = 'ext%u_record_id' % ext
         self._construct = Struct('alpha_id'/COptional(GsmStringAdapter(Rpad(Bytes(this._.total_len-14)), codec='ascii')),
                                  'len_of_bcd'/Int8ub,
                                  'ton_npi'/TonNpi,
                                  'dialing_nr'/ExtendedBcdAdapter(BcdAdapter(Rpad(Bytes(10)))),
                                  'cap_conf_id'/Int8ub,
-                                 'ext1_record_id'/Int8ub)
+                                 ext_name/Int8ub)
 
 # TS 51.011 Section 10.5.5
 class EF_SMS(LinFixedEF):
@@ -497,7 +498,7 @@
         super().__init__(fid=fid, name=name, desc=desc, **kwargs)
         files = [
             EF_ADN(),
-            EF_ADN(fid='6f3b', name='EF.FDN', desc='Fixed dialling numbers'),
+            EF_ADN(fid='6f3b', name='EF.FDN', desc='Fixed dialling numbers', ext=2),
             EF_SMS(),
             LinFixedEF(fid='6f3d', name='EF.CCP',
                        desc='Capability Configuration Parameters', rec_len=(14, 14)),
@@ -507,7 +508,7 @@
             EF_SMSP(),
             EF_SMSS(),
             # LND
-            EF_ADN('6f49', None, 'EF.SDN', 'Service Dialling Numbers'),
+            EF_ADN('6f49', None, 'EF.SDN', 'Service Dialling Numbers', ext=3),
             EF_EXT('6f4a', None, 'EF.EXT1', 'Extension1 (ADN/SSC)'),
             EF_EXT('6f4b', None, 'EF.EXT2', 'Extension2 (FDN/SSC)'),
             EF_EXT('6f4c', None, 'EF.EXT3', 'Extension3 (SDN)'),