July 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: fix coding style in statements applying inverted mask

by laforge

Attention is currently required from: osmith, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28672 ) Change subject: trxcon: fix coding style in statements applying inverted mask ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I28b9fc34e0d40b02d0ca56e9e0bf4463cf4ff336 Gerrit-Change-Number: 28672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:38:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: implement GTP tunnel mapping via netfilter

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28309 ) Change subject: implement GTP tunnel mapping via netfilter ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic0d319eb4f98cd51a5999c804c4203ab0bdda650 Gerrit-Change-Number: 28309 Gerrit-PatchSet: 9 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:38:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: README: Mention the manual can also be built from the source

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28680 ) Change subject: README: Mention the manual can also be built from the source ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File README.md: https://gerrit.osmocom.org/c/pysim/+/28680/comment/29d5f71d_5e32b83f PS1, Line 18: w > vim's artifact Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 Gerrit-Change-Number: 28680 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:38:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: README: Mention the manual can also be built from the source

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28680 to look at the new patch set (#2). Change subject: README: Mention the manual can also be built from the source ...................................................................... README: Mention the manual can also be built from the source Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/28680/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 Gerrit-Change-Number: 28680 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in pysim[master]: introduce fully_qualified_path_str() method

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28684 to look at the new patch set (#2). Change subject: introduce fully_qualified_path_str() method ...................................................................... introduce fully_qualified_path_str() method Reduce all the copy+pasted '/'.join(path_list) constructs with a method returning the formatted path string. Change-Id: I5e9bfb425c3a3fade13ca4ccd2b891a0c21ed56d --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 24 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/28684/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5e9bfb425c3a3fade13ca4ccd2b891a0c21ed56d Gerrit-Change-Number: 28684 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add support for obsolete EF.RPLMNAcT

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28636 ) Change subject: ts_31_102: Add support for obsolete EF.RPLMNAcT ...................................................................... ts_31_102: Add support for obsolete EF.RPLMNAcT This file existed in earlier specs like Release 3.8.0, but was removed in later revisions. Still, there are cards around implementing that older spec, so let's add a decoder. Change-Id: Ic7163b2a01f64ef1223cf15b8d0813d3edf5b61a --- M pySim/ts_31_102.py 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index a4f3532..314f3c2 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -743,6 +743,15 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('max_start'/Int24ub) +# TS 31.102 (old releases like 3.8.0) Section 4.2.56 +class EF_RPLMNAcT(TransRecEF): + def __init__(self, fid='6f65', sfid=None, name='EF.RPLMNAcTD', size={2, 4}, rec_len=2, + desc='RPLMN Last used Access Technology', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) + def _decode_record_hex(self, in_hex): + return dec_act(in_hex) + # TODO: Encode + # TS 31.102 Section 4.2.77 class EF_VGCSCA(TransRecEF): def __init__(self, fid='6fd4', sfid=None, name='EF.VGCSCA', size={2, 100}, rec_len=2, @@ -1165,6 +1174,7 @@ EF_xPLMNwAcT('6f61', 0x11, 'EF.OPLMNwAcT', 'User controlled PLMN Selector with Access Technology', service=42), EF_xPLMNwAcT('6f62', 0x13, 'EF.HPLMNwAcT', 'HPLMN Selector with Access Technology', service=43), EF_ARR('6f06', 0x17), + EF_RPLMNAcT(), TransparentEF('6fc4', None, 'EF.NETPAR', 'Network Parameters'), EF_PNN('6fc5', 0x19, service=45), EF_OPL(service=46), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic7163b2a01f64ef1223cf15b8d0813d3edf5b61a Gerrit-Change-Number: 28636 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_102: Support for DF_MCS (Mission Critical Services)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28633 ) Change subject: ts_31_102: Support for DF_MCS (Mission Critical Services) ...................................................................... ts_31_102: Support for DF_MCS (Mission Critical Services) Change-Id: I0485a14c7820f7b345eeba6109a93b6d4bc639bf --- M pySim/ts_31_102_telecom.py M pySim/ts_51_011.py 2 files changed, 69 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102_telecom.py b/pySim/ts_31_102_telecom.py index 5b2162a..d0f33b1 100644 --- a/pySim/ts_31_102_telecom.py +++ b/pySim/ts_31_102_telecom.py @@ -5,7 +5,7 @@ # pylint: disable=undefined-variable """ -DF_PHONEBOOK, DF_MULTIMEDIA as specified in 3GPP TS 31.102 V16.6.0 +DF_PHONEBOOK, DF_MULTIMEDIA, DF_MCS as specified in 3GPP TS 31.102 V16.6.0 Needs to be a separate python module to avoid cyclic imports """ @@ -180,3 +180,69 @@ EF_MMDF(), ] self.add_files(files) + + +# TS 31.102 Section 4.6.4.1 +EF_MST_map = { + 1: 'MCPTT UE configuration data', + 2: 'MCPTT User profile data', + 3: 'MCS Group configuration data', + 4: 'MCPTT Service configuration data', + 5: 'MCS UE initial configuration data', + 6: 'MCData UE configuration data', + 7: 'MCData user profile data', + 8: 'MCData service configuration data', + 9: 'MCVideo UE configuration data', + 10: 'MCVideo user profile data', + 11: 'MCVideo service configuration data', + } + +# TS 31.102 Section 4.6.4.2 +class EF_MCS_CONFIG(BerTlvEF): + class McpttUeConfigurationData(BER_TLV_IE, tag=0x80): + pass + class McpttUserProfileData(BER_TLV_IE, tag=0x81): + pass + class McsGroupConfigurationData(BER_TLV_IE, tag=0x82): + pass + class McpttServiceConfigurationData(BER_TLV_IE, tag=0x83): + pass + class McsUeInitialConfigurationData(BER_TLV_IE, tag=0x84): + pass + class McdataUeConfigurationData(BER_TLV_IE, tag=0x85): + pass + class McdataUserProfileData(BER_TLV_IE, tag=0x86): + pass + class McdataServiceConfigurationData(BER_TLV_IE, tag=0x87): + pass + class McvideoUeConfigurationData(BER_TLV_IE, tag=0x88): + pass + class McvideoUserProfileData(BER_TLV_IE, tag=0x89): + pass + class McvideoServiceConfigurationData(BER_TLV_IE, tag=0x8a): + pass + class McsConfigDataCollection(TLV_IE_Collection, nested=[McpttUeConfigurationData, + McpttUserProfileData, McsGroupConfigurationData, + McpttServiceConfigurationData, McsUeInitialConfigurationData, + McdataUeConfigurationData, McdataUserProfileData, + McdataServiceConfigurationData, McvideoUeConfigurationData, + McvideoUserProfileData, McvideoServiceConfigurationData]): + pass + def __init__(self, fid='4F02', sfid=0x02, name='EF.MCS_CONFIG', desc='MCS configuration data', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_MCS_CONFIG.McsConfigDataCollection + +# TS 31.102 Section 4.6.4.1 +class EF_MST(EF_UServiceTable): + def __init__(self, fid='4F01', sfid=0x01, name='EF.MST', desc='MCS Service Table', size={2,2}, + table=EF_MST_map, **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, table=table) + +class DF_MCS(CardDF): + def __init__(self, fid='5F3D', name='DF.MCS', desc='Mission Critical Services', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_MST(), + EF_MCS_CONFIG(), + ] + self.add_files(files) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index b2a9ca4..362d484 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -32,7 +32,7 @@ from pySim.profile import match_sim from pySim.profile import CardProfile from pySim.filesystem import * -from pySim.ts_31_102_telecom import DF_PHONEBOOK, DF_MULTIMEDIA +from pySim.ts_31_102_telecom import DF_PHONEBOOK, DF_MULTIMEDIA, DF_MCS import enum from pySim.construct import * from construct import Optional as COptional @@ -500,8 +500,8 @@ EF_CMI(), # not really part of 51.011 but something that TS 31.102 specifies may exist here. DF_PHONEBOOK(), - # not really part of 51.011 but something that TS 31.102 specifies may exist here. DF_MULTIMEDIA(), + DF_MCS(), ] self.add_files(files) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0485a14c7820f7b345eeba6109a93b6d4bc639bf Gerrit-Change-Number: 28633 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_102: Support for files of DF.V2X (Vehicle 2 X)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28634 ) Change subject: ts_31_102: Support for files of DF.V2X (Vehicle 2 X) ...................................................................... ts_31_102: Support for files of DF.V2X (Vehicle 2 X) Change-Id: I7246f165aebbc42a685f36a7a6f973498b23b614 --- M pySim/ts_31_102_telecom.py M pySim/ts_51_011.py 2 files changed, 44 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102_telecom.py b/pySim/ts_31_102_telecom.py index d0f33b1..c020a07 100644 --- a/pySim/ts_31_102_telecom.py +++ b/pySim/ts_31_102_telecom.py @@ -246,3 +246,45 @@ EF_MCS_CONFIG(), ] self.add_files(files) + + +# TS 31.102 Section 4.6.5.2 +EF_VST_map = { + 1: 'MCPTT UE configuration data', + 2: 'MCPTT User profile data', + 3: 'MCS Group configuration data', + 4: 'MCPTT Service configuration data', + 5: 'MCS UE initial configuration data', + 6: 'MCData UE configuration data', + 7: 'MCData user profile data', + 8: 'MCData service configuration data', + 9: 'MCVideo UE configuration data', + 10: 'MCVideo user profile data', + 11: 'MCVideo service configuration data', + } + +# TS 31.102 Section 4.6.5.2 +class EF_VST(EF_UServiceTable): + def __init__(self, fid='4F01', sfid=0x01, name='EF.VST', desc='V2X Service Table', size={2,2}, + table=EF_VST_map, **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, table=table) + +# TS 31.102 Section 4.6.5.3 +class EF_V2X_CONFIG(BerTlvEF): + class V2xConfigurationData(BER_TLV_IE, tag=0x80): + pass + class V2xConfigDataCollection(TLV_IE_Collection, nested=[V2xConfigurationData]): + pass + def __init__(self, fid='4F02', sfid=0x02, name='EF.V2X_CONFIG', desc='V2X configuration data', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_V2X_CONFIG.V2xConfigDataCollection + +# TS 31.102 Section 4.6.5 +class DF_V2X(CardDF): + def __init__(self, fid='5F3E', name='DF.V2X', desc='Vehicle to X', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_VST(), + EF_V2X_CONFIG(), + ] + self.add_files(files) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 362d484..0a481e1 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -32,7 +32,7 @@ from pySim.profile import match_sim from pySim.profile import CardProfile from pySim.filesystem import * -from pySim.ts_31_102_telecom import DF_PHONEBOOK, DF_MULTIMEDIA, DF_MCS +from pySim.ts_31_102_telecom import DF_PHONEBOOK, DF_MULTIMEDIA, DF_MCS, DF_V2X import enum from pySim.construct import * from construct import Optional as COptional @@ -502,6 +502,7 @@ DF_PHONEBOOK(), DF_MULTIMEDIA(), DF_MCS(), + DF_V2X(), ] self.add_files(files) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7246f165aebbc42a685f36a7a6f973498b23b614 Gerrit-Change-Number: 28634 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add support for DF.GSM-ACCESS

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28635 ) Change subject: ts_31_102: Add support for DF.GSM-ACCESS ...................................................................... ts_31_102: Add support for DF.GSM-ACCESS Change-Id: I244c3eea13587e6213062d9a58e821697614a86a --- M pySim/ts_31_102.py M pySim/ts_51_011.py 2 files changed, 25 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 786bd64..a4f3532 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -33,6 +33,7 @@ from pySim.ts_51_011 import EF_SMSR, EF_DCK, EF_EXT, EF_CNL, EF_OPL, EF_MBI, EF_MWIS from pySim.ts_51_011 import EF_CBMID, EF_CBMIR, EF_ADN, EF_SMS, EF_MSISDN, EF_SMSP, EF_SMSS from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel +from pySim.ts_51_011 import EF_Kc, EF_CPBCCH, EF_InvScan from pySim.ts_102_221 import EF_ARR from pySim.tlv import * from pySim.filesystem import * @@ -920,6 +921,23 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct('rfu'/BitsRFU(7), 'from_preferred'/Bit) + +###################################################################### +# DF.GSM-ACCESS +###################################################################### + +class DF_GSM_ACCESS(CardDF): + def __init__(self, fid='5F3B', name='DF.GSM-ACCESS', desc='GSM Access', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, service=27, **kwargs) + files = [ + EF_Kc(fid='4f20', sfid=0x01, service=27), + EF_Kc(fid='4f52', sfid=0x02, name='EF.KcGPRS', desc='GPRS Ciphering key KcGPRS', service=27), + EF_CPBCCH(fid='4f63', service=39), + EF_InvScan(fid='4f64', service=40), + ] + self.add_files(files) + + ###################################################################### # DF.5GS ###################################################################### @@ -1196,7 +1214,7 @@ EF_FromPreferred(service=114), # FIXME: DF_SoLSA service=23 DF_PHONEBOOK(), - # FIXME: DF_GSM_ACCESS service=27 + DF_GSM_ACCESS(), DF_WLAN(service=[59, 60, 61, 62, 63, 66, 81, 82, 83, 84, 88]), DF_HNB(service=[86, 90]), DF_ProSe(service=101), diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 0a481e1..0927c9f 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -798,8 +798,8 @@ # TS 51.011 Section 10.3.32 class EF_Kc(TransparentEF): - def __init__(self, fid='6f20', sfid=None, name='EF.Kc', desc='Ciphering key Kc', size={9, 9}): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + def __init__(self, fid='6f20', sfid=None, name='EF.Kc', desc='Ciphering key Kc', size={9, 9}, **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('kc'/HexAdapter(Bytes(8)), 'cksn'/Int8ub) # TS 51.011 Section 10.3.33 @@ -862,15 +862,15 @@ # TS 51.011 Section 10.3.38 class EF_CPBCCH(TransRecEF): def __init__(self, fid='6f63', sfid=None, name='EF.CPBCCH', size={2, 14}, rec_len=2, - desc='CPBCCH Information'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) + desc='CPBCCH Information', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = Struct('cpbcch'/Int16ub) # TS 51.011 Section 10.3.39 class EF_InvScan(TransparentEF): def __init__(self, fid='6f64', sfid=None, name='EF.InvScan', size={1, 1}, - desc='IOnvestigation Scan'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + desc='IOnvestigation Scan', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = FlagsEnum( Byte, in_limited_service_mode=1, after_successful_plmn_selection=2) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I244c3eea13587e6213062d9a58e821697614a86a Gerrit-Change-Number: 28635 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: minimalistic support for DF.MULTIMEDIA

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28631 ) Change subject: minimalistic support for DF.MULTIMEDIA ...................................................................... minimalistic support for DF.MULTIMEDIA No decode of the payload of the files yet, but let's at least name them. Change-Id: I2d9c56bdea08fe6629978b6a1f7c139f487d075a --- M pySim/ts_31_102_telecom.py M pySim/ts_51_011.py 2 files changed, 25 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102_telecom.py b/pySim/ts_31_102_telecom.py index 49f6868..5f695ed 100644 --- a/pySim/ts_31_102_telecom.py +++ b/pySim/ts_31_102_telecom.py @@ -5,7 +5,7 @@ # pylint: disable=undefined-variable """ -DF_PHONEBOOK as specified in 3GPP TS 31.102 V16.6.0 +DF_PHONEBOOK, DF_MULTIMEDIA as specified in 3GPP TS 31.102 V16.6.0 Needs to be a separate python module to avoid cyclic imports """ @@ -69,3 +69,24 @@ # FIXME: Those 4Fxx entries with unspecified FID... ] self.add_files(files) + + + +# TS 31.102 Section 4.6.3.1 +class EF_MML(BerTlvEF): + def __init__(self, fid='4F47', name='EF.MML', desc='Multimedia Messages List', **kwargs): + super().__init__(fid, name=name, desc=desc, **kwargs) + +# TS 31.102 Section 4.6.3.2 +class EF_MMDF(BerTlvEF): + def __init__(self, fid='4F48', name='EF.MMDF', desc='Multimedia Messages Data File', **kwargs): + super().__init__(fid, name=name, desc=desc, **kwargs) + +class DF_MULTIMEDIA(CardDF): + def __init__(self, fid='5F3B', name='DF.MULTIMEDIA', desc='Multimedia', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_MML(), + EF_MMDF(), + ] + self.add_files(files) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 21fd54b..b2a9ca4 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -32,7 +32,7 @@ from pySim.profile import match_sim from pySim.profile import CardProfile from pySim.filesystem import * -from pySim.ts_31_102_telecom import DF_PHONEBOOK +from pySim.ts_31_102_telecom import DF_PHONEBOOK, DF_MULTIMEDIA import enum from pySim.construct import * from construct import Optional as COptional @@ -500,6 +500,8 @@ EF_CMI(), # not really part of 51.011 but something that TS 31.102 specifies may exist here. DF_PHONEBOOK(), + # not really part of 51.011 but something that TS 31.102 specifies may exist here. + DF_MULTIMEDIA(), ] self.add_files(files) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2d9c56bdea08fe6629978b6a1f7c139f487d075a Gerrit-Change-Number: 28631 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022