ts_31_102, ts_31_103: Add EF.FromPreferred

Change-Id: I7dc989a4ab198f3eaa45ba7060c8087354a544bb
This commit is contained in:
Harald Welte
2021-04-21 10:58:24 +02:00
parent 16ec96a0c9
commit 71290077b9
2 changed files with 11 additions and 3 deletions

View File

@@ -278,7 +278,7 @@ EF_USIM_ADF_map = {
from struct import unpack, pack from struct import unpack, pack
from construct import * from construct import *
from pySim.construct import LV, HexAdapter, BcdAdapter from pySim.construct import LV, HexAdapter, BcdAdapter, BitsRFU
from pySim.filesystem import * from pySim.filesystem import *
from pySim.ts_102_221 import EF_ARR from pySim.ts_102_221 import EF_ARR
from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel, EF_AD from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel, EF_AD
@@ -608,6 +608,13 @@ class EF_IPS(CyclicEF):
self._construct = Struct('status'/PaddedString(2, 'ascii'), self._construct = Struct('status'/PaddedString(2, 'ascii'),
'link_to_ef_ipd'/Int8ub, 'rfu'/Byte) 'link_to_ef_ipd'/Int8ub, 'rfu'/Byte)
# TS 31.102 Section 4.2.106
class EF_FromPreferred(TransparentEF):
def __init__(self, fid='6ff7', sfid=None, name='EF.FromPreferred', size={1,1},
desc='From Preferred'):
super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size)
self._construct = BitStruct('rfu'/BitsRFU(7), 'from_preferred'/Bit)
###################################################################### ######################################################################
# DF.5GS # DF.5GS
###################################################################### ######################################################################
@@ -814,6 +821,7 @@ class ADF_USIM(CardADF):
LinFixedEF('6fef', None, 'EF.SDNURI', 'Service Dialling Numbers URI'), LinFixedEF('6fef', None, 'EF.SDNURI', 'Service Dialling Numbers URI'),
EF_IPS(), EF_IPS(),
# FIXME: from EF_ePDGid onwards # FIXME: from EF_ePDGid onwards
EF_FromPreferred(),
# FIXME: DF_SoLSA # FIXME: DF_SoLSA
# FIXME: DF_PHONEBOOK # FIXME: DF_PHONEBOOK
# FIXME: DF_GSM_ACCESS # FIXME: DF_GSM_ACCESS

View File

@@ -25,7 +25,7 @@ Various constants from 3GPP TS 31.103 V16.1.0
from pySim.filesystem import * from pySim.filesystem import *
from pySim.utils import * from pySim.utils import *
from pySim.ts_51_011 import EF_AD, EF_SMS, EF_SMSS, EF_SMSR, EF_SMSP from pySim.ts_51_011 import EF_AD, EF_SMS, EF_SMSS, EF_SMSR, EF_SMSP
from pySim.ts_31_102 import ADF_USIM from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred
import pySim.ts_102_221 import pySim.ts_102_221
# Mapping between ISIM Service Number and its description # Mapping between ISIM Service Number and its description
@@ -188,7 +188,7 @@ class ADF_ISIM(CardADF):
EF_SMSR(), EF_SMSR(),
EF_SMSP(), EF_SMSP(),
EF_UICCIARI(), EF_UICCIARI(),
# FromPreferred EF_FromPreferred(),
EF_IMSConfigData(), EF_IMSConfigData(),
EF_XCAPConfigData(), EF_XCAPConfigData(),
EF_WebRTCURI(), EF_WebRTCURI(),