August 2024 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: erab_fsm: include Network Instance IE in PDRs and FARs

by laforge

Attention is currently required from: fixeria, neels. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?usp=email ) Change subject: erab_fsm: include Network Instance IE in PDRs and FARs ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4dbe8e0b1d14eed5fdb3f9f3f2543c44fd543d22 Gerrit-Change-Number: 37795 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Aug 2024 11:28:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement handling of GTP-U address

by laforge

Attention is currently required from: fixeria, neels. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?usp=email ) Change subject: erab_fsm: implement handling of GTP-U address ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b Gerrit-Change-Number: 37804 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Aug 2024 11:28:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year

1
0
0 0

[NoOp] Change in libosmocore[osmith/wip]: (Do not merge) CI test

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/37816?usp=email ) Change subject: (Do not merge) CI test ...................................................................... (Do not merge) CI test Change-Id: Idd0d5b64644f98a8c195bcafb6ff2aed9109eb11 --- A test 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/37816/1 diff --git a/test b/test new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37816?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: osmith/wip Gerrit-Change-Id: Idd0d5b64644f98a8c195bcafb6ff2aed9109eb11 Gerrit-Change-Number: 37816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 year

1
0
0 0

[XS] Change in pysim[master]: pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_...

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37815?usp=email ) Change subject: pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_type ...................................................................... pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_type before this change, structure == 'ber_tlv' was missing the file_type == working_ef attribute. So for linear_fixed, transparent and cyclic, the file_type attribute was present, but for ber_tlv it was missing. This is illogical from a user point of vie and makes downstream code potentially more complex, as it cannot match on working_ef for all EF types. Change-Id: If0076cc6dd35a818c08309885f6ef1c1704052c6 --- M pySim/ts_102_221.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/37815/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index c326ad1..9e0db68 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -19,7 +19,7 @@ from bidict import bidict from construct import Select, Const, Bit, Struct, Int16ub, FlagsEnum, GreedyString, ValidationError -from construct import Optional as COptional +from construct import Optional as COptional, Computed from pySim.construct import * from pySim.utils import * @@ -95,7 +95,7 @@ # ETSI TS 102 221 11.1.1.4.3 class FileDescriptor(BER_TLV_IE, tag=0x82): _test_de_encode = [ - ( '82027921', { "file_descriptor_byte": { "shareable": True, "structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ), + ( '82027921', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ), ( '82027821', { "file_descriptor_byte": { "shareable": True, "file_type": "df", "structure": "no_info_given" }, "record_len": None, "num_of_rec": None }), ( '82024121', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "transparent" }, "record_len": None, "num_of_rec": None } ), ( '82054221006e05', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "linear_fixed" }, "record_len": 110, "num_of_rec": 5 } ), @@ -110,7 +110,7 @@ return 0x39 raise ValidationError - FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag, 'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6)))), + FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag, 'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6))), 'file_type'/Computed('working_ef')), BitStruct(Const(0, Bit), 'shareable'/Flag, 'file_type'/Enum(BitsInteger(3), working_ef=0, internal_ef=1, df=7), 'structure'/Enum(BitsInteger(3), no_info_given=0, transparent=1, linear_fixed=2, cyclic=6)) ) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If0076cc6dd35a818c08309885f6ef1c1704052c6 Gerrit-Change-Number: 37815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 year

1
0
0 0

[M] Change in pysim[master]: pySim.esim.saip.templates: Introduce dependency/hierarchy information

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37814?usp=email ) Change subject: pySim.esim.saip.templates: Introduce dependency/hierarchy information ...................................................................... pySim.esim.saip.templates: Introduce dependency/hierarchy information The SAIP specification is very weird in a way that it treats the DF and EF descriptions as some kind of flat structure without describing the hierarchy. So when creating a DF, sometimes it should be created below the current DF, and sometimes it should be adjacent next to the current DF. Let's introduce * a 'ppath' property of FileTemplate to indicate if a file is anything but a direct sibling of the 'base DF' of the PE * an 'extends' property of ProfileTemplate to indicate that a given template does not have its own 'base DF', but that its contents merely extends that of another ProfileTemplate * a 'parent' property of ProfileTemplate to indicate a parent ProfileTemplate below whose 'base DF' our files should be placed. Change-Id: Ieab4835cd21008b289713784c0eb7170af2ccfb9 --- M pySim/esim/saip/templates.py 1 file changed, 99 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/14/37814/1 diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index eff28c2..453e2b3 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -22,11 +22,31 @@ import pySim.esim.saip.oid as OID class FileTemplate: - """Representation of a single file in a SimAlliance/TCA Profile Template.""" + """Representation of a single file in a SimAlliance/TCA Profile Template. The argument order + is done to match that of the tables in Section 9 of the SAIP specification.""" def __init__(self, fid:int, name:str, ftype, nb_rec: Optional[int], size:Optional[int], arr:int, sfi:Optional[int] = None, default_val:Optional[str] = None, content_rqd:bool = True, params:Optional[List] = None, ass_serv:Optional[List[int]]=None, high_update:bool = False, - pe_name:Optional[str] = None, repeat:bool = False): + pe_name:Optional[str] = None, repeat:bool = False, ppath: List[int] = []): + """ + Args: + fid: The 16bit file-identifier of the file + name: The name of the file in human-readable "EF.FOO", "DF.BAR" notation + ftype: The type of the file; can be 'MF', 'ADF', 'DF', 'TR', 'LF', 'CY', 'BT' + nb_rec: Then number of records (only valid for 'LF' and 'CY') + size: The size of the file ('TR', 'BT'); size of each record ('LF, 'CY') + arr: The record number of EF.ARR for referenced access rules + sfi: The short file identifier, if any + default_val: The default value [pattern] of the file + content_rqd: Whether an instance of template *must* specify file contents + params: A list of parameters that an instance of the template *must* specify + ass_serv: The associated service[s] of the service table + high_update: Is this file of "high update frequency" type? + pe_name: The name of this file in the ASN.1 type of the PE. Auto-generated for most. + repeat: Whether the default_val pattern is a repeating pattern. + ppath: The intermediate path between the base_df of the ProfileTemplate and this file. If not + specified, the file will be created immediately underneath the base_df. + """ # initialize from arguments self.fid = fid self.name = name @@ -48,6 +68,7 @@ self.params = params self.ass_serv = ass_serv self.high_update = high_update + self.ppath = ppath # parent path, if this FileTemplate is not immediately below the base_df # initialize empty self.parent = None self.children = [] @@ -63,8 +84,7 @@ s_fid = "%04x" % self.fid if self.fid is not None else 'None' s_arr = self.arr if self.arr is not None else 'None' s_sfi = "%02x" % self.sfi if self.sfi is not None else 'None' - return "FileTemplate(%s/%s, %s, %s, arr=%s, sfi=%s)" % (self.name, self.pe_name, s_fid, - self.file_type, s_arr, s_sfi) + return "FileTemplate(%s/%s, %s, %s, arr=%s, sfi=%s, ppath=%s)" % (self.name, self.pe_name, s_fid, self.file_type, s_arr, s_sfi, self.ppath) def print_tree(self, indent:str = ""): """recursive printing of FileTemplate tree structure.""" @@ -126,6 +146,13 @@ oid: Optional[OID.eOID] = None files: List[FileTemplate] = [] + # indicates that a given template does not have its own 'base DF', but that its contents merely + # extends that of the 'base DF' of another template + extends: Optional['ProfileTemplate'] = None + + # indicates a parent ProfileTemplate below whose 'base DF' our files should be placed. + parent: Optional['ProfileTemplate'] = None + def __init_subclass__(cls, **kwargs): """This classmethod is called automatically after executing the subclass body. We use it to initialize the cls.files_by_pename from the cls.files""" @@ -165,6 +192,14 @@ for c in cls.tree: c.print_tree() + @classmethod + def base_df(cls) -> FileTemplate: + """Return the FileTemplate for the base DF of the given template. This may be a DF or ADF + within this template, or refer to another template (e.g. mandatory USIM if we are optional USIM.""" + if cls.extends: + return cls.extends.base_df + return cls.files[0] + class ProfileTemplateRegistry: """A registry of profile templates. Exists as a singleton class with no instances and only classmethods.""" @@ -218,39 +253,39 @@ # Section 9.4: Do this separately, so we can use them also from 9.5.3 df_pb_files = [ FileTemplate(0x5f3a, 'DF.PHONEBOOK', 'DF', None, None, 14, None, None, True, ['pinStatusTemplateDO']), - FileTemplate(0x4f30, 'EF.PBR', 'LF', None, None, 2, None, None, True, ['nb_rec', 'size']), + FileTemplate(0x4f30, 'EF.PBR', 'LF', None, None, 2, None, None, True, ['nb_rec', 'size'], ppath=[0x5f3a]), ] for i in range(0x38, 0x40): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EXT1', 'LF', None, 13, 5, None, '00FF...FF', False, ['size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EXT1', 'LF', None, 13, 5, None, '00FF...FF', False, ['size','sfi'], ppath=[0x5f3a])) for i in range(0x40, 0x48): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.AAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.AAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'], ppath=[0x5f3a])) for i in range(0x48, 0x50): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'], ppath=[0x5f3a])) df_pb_files += [ - FileTemplate(0x4f22, 'EF.PSC', 'TR', None, 4, 5, None, '00000000', False, ['sfi']), - FileTemplate(0x4f23, 'EF.CC', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True), - FileTemplate(0x4f24, 'EF.PUID', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True), + FileTemplate(0x4f22, 'EF.PSC', 'TR', None, 4, 5, None, '00000000', False, ['sfi'], ppath=[0x5f3a]), + FileTemplate(0x4f23, 'EF.CC', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True, ppath=[0x5f3a]), + FileTemplate(0x4f24, 'EF.PUID', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True, ppath=[0x5f3a]), ] for i in range(0x50, 0x58): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.IAP', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.IAP', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x58, 0x60): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x60, 0x68): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, 2, 5, None, '00...00', False, ['nb_rec','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, 2, 5, None, '00...00', False, ['nb_rec','sfi'], ppath=[0x5f3a])) for i in range(0x68, 0x70): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ANR', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ANR', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x70, 0x78): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.PURI', 'LF', None, None, 5, None, None, True, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.PURI', 'LF', None, None, 5, None, None, True, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x78, 0x80): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EMAIL', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EMAIL', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x80, 0x88): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.SNE', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.SNE', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x88, 0x90): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.UID', 'LF', None, 2, 5, None, '0000', False, ['nb_rec','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.UID', 'LF', None, 2, 5, None, '0000', False, ['nb_rec','sfi'], ppath=[0x5f3a])) for i in range(0x90, 0x98): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GRP', 'LF', None, None, 5, None, '00...00', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GRP', 'LF', None, None, 5, None, '00...00', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x98, 0xa0): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.CCP1', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.CCP1', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) # Section 9.4 v2.3.1 class FilesTelecom(ProfileTemplate): @@ -266,29 +301,30 @@ FileTemplate(0x6fe1, 'EF.ICE_FF', 'LF', None, None, 9, None, 'FF...FF', False, ['nb_rec', 'size']), FileTemplate(0x6fe5, 'EF.PSISMSC', 'LF', None, None, 5, None, None, True, ['nb_rec', 'size'], ass_serv=[12,91]), FileTemplate(0x5f50, 'DF.GRAPHICS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size']), + FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size'], ppath=[0x5f50]), # EF.IIDF below - FileTemplate(0x4f21, 'EF.ICE_GRAPHICS','BT',None,None, 9, None, None, False, ['size']), - FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size']), + FileTemplate(0x4f21, 'EF.ICE_GRAPHICS','BT',None,None, 9, None, None, False, ['size'], ppath=[0x5f50]), + FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size'], ppath=[0x5f50]), # EF.ICON below ] for i in range(0x40, 0x80): - files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'], ppath=[0x5f50])) for i in range(0x80, 0xC0): - files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'], ppath=[0x5f50])) # we copy the objects (instances) here as we also use them below from FilesUsimDfPhonebook - files += [deepcopy(x) for x in df_pb_files] + df_pb = deepcopy(df_pb_files) + files += df_pb files += [ FileTemplate(0x5f3b, 'DF.MULTIMEDIA','DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[67]), - FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), - FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), + FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), + FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), FileTemplate(0x5f3c, 'DF.MMSS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True), + FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True, ppath=[0x5f3c]), ] @@ -306,40 +342,40 @@ FileTemplate(0x6fe1, 'EF.ICE_FF', 'LF', None, None, 9, None, 'FF...FF', False, ['nb_rec', 'size']), FileTemplate(0x6fe5, 'EF.PSISMSC', 'LF', None, None, 5, None, None, True, ['nb_rec', 'size'], ass_serv=[12,91]), FileTemplate(0x5f50, 'DF.GRAPHICS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size']), + FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size'], ppath=[0x5f50]), # EF.IIDF below - FileTemplate(0x4f21, 'EF.ICE_GRRAPHICS','BT',None,None, 9, None, None, False, ['size']), - FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size']), + FileTemplate(0x4f21, 'EF.ICE_GRRAPHICS','BT',None,None, 9, None, None, False, ['size'], ppath=[0x5f50]), + FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size'], ppath=[0x5f50]), # EF.ICON below ] for i in range(0x40, 0x80): - files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'], ppath=[0x5f50])) for i in range(0x80, 0xC0): - files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'],ppath=[0x5f50])) # we copy the objects (instances) here as we also use them below from FilesUsimDfPhonebook - files += [deepcopy(x) for x in df_pb_files] + df_pb = deepcopy(df_pb_files) + files += df_pb files += [ FileTemplate(0x5f3b, 'DF.MULTIMEDIA','DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[67]), - FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), - FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), + FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), + FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), FileTemplate(0x5f3c, 'DF.MMSS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True), - + FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True, ppath=[0x5f3c]), FileTemplate(0x5f3d, 'DF.MCS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv={'usim':109, 'isim': 15}), - FileTemplate(0x4f01, 'EF.MST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}), - FileTemplate(0x4f02, 'EF.MCSCONFIG', 'BT', None, None, 2, 0x02, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}), + FileTemplate(0x4f01, 'EF.MST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}, ppath=[0x5f3d]), + FileTemplate(0x4f02, 'EF.MCSCONFIG', 'BT', None, None, 2, 0x02, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}, ppath=[0x5f3d]), FileTemplate(0x5f3e, 'DF.V2X', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[119]), - FileTemplate(0x4f01, 'EF.VST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv=[119]), - FileTemplate(0x4f02, 'EF.V2X_CONFIG','BT', None, None, 2, 0x02, None, True, ['size'], ass_serv=[119]), - FileTemplate(0x4f03, 'EF.V2XP_PC5', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119]), # VST: 2 - FileTemplate(0x4f04, 'EF.V2XP_Uu', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119]), # VST: 3 + FileTemplate(0x4f01, 'EF.VST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), + FileTemplate(0x4f02, 'EF.V2X_CONFIG','BT', None, None, 2, 0x02, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), + FileTemplate(0x4f03, 'EF.V2XP_PC5', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), # VST: 2 + FileTemplate(0x4f04, 'EF.V2XP_Uu', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), # VST: 3 ] @@ -412,6 +448,7 @@ optional = True oid = OID.ADF_USIMopt_not_by_default base_path = Path('ADF.USIM') + extends = FilesUsimMandatory files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13], pe_name='ef-acmax'), @@ -496,6 +533,7 @@ optional = True oid = OID.ADF_USIMopt_not_by_default_v2 base_path = Path('ADF.USIM') + extends = FilesUsimMandatoryV2 files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13]), @@ -590,6 +628,7 @@ optional = True oid = OID.ADF_USIMopt_not_by_default_v3 base_path = Path('ADF.USIM') + extends = FilesUsimMandatoryV2 files = FilesUsimOptionalV2.files + [ FileTemplate(0x6f01, 'EF.eAKA', 'TR', None, 1, 3, None, None, True, ['size'], ass_serv=[134]), ] @@ -607,6 +646,7 @@ created_by_default = False oid = OID.DF_GSM_ACCESS_ADF_USIM base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x5f3b, 'DF.GSM-ACCESS','DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[27]), FileTemplate(0x4f20, 'EF.Kc', 'TR', None, 9, 5, 0x01, 'FF...FF07', False, ass_serv=[27], high_update=True), @@ -621,6 +661,7 @@ created_by_default = False oid = OID.DF_5GS base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -641,6 +682,7 @@ created_by_default = False oid = OID.DF_5GS_v2 base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -663,6 +705,7 @@ created_by_default = False oid = OID.DF_5GS_v3 base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -686,6 +729,7 @@ created_by_default = False oid = OID.DF_5GS_v4 base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -717,6 +761,7 @@ created_by_default = False oid = OID.DF_SAIP base_path = Path('ADF.USIM') + parent = FilesUsimDf5GS files = [ FileTemplate(0x6fd0, 'DF.SAIP', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[(124, 125)], pe_name='df-df-saip'), FileTemplate(0x4f01, 'EF.SUCICalcInfo','TR', None, None, 3, None, 'FF...FF', False, ['size'], ass_serv=[125], pe_name='ef-suci-calc-info-usim'), @@ -727,6 +772,7 @@ created_by_default = False oid = OID.DF_SNPN base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x5fe0, 'DF.SNPN', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[143], pe_name='df-df-snpn'), FileTemplate(0x4f01, 'EF.PWS_SNPN', 'TR', None, 1, 10, None, None, True, ass_serv=[143]), @@ -737,6 +783,7 @@ created_by_default = False oid = OID.DF_5GProSe base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x5ff0, 'DF.5G_ProSe', 'DF', None, None, 14, None, None, False, ['pinStatusTeimplateDO'], ass_serv=[139], pe_name='df-df-5g-prose'), FileTemplate(0x4f01, 'EF.5G_PROSE_ST', 'TR', None, 1, 2, 0x01, None, True, ass_serv=[139]), @@ -768,6 +815,7 @@ optional = True oid = OID.ADF_ISIMopt_not_by_default base_path = Path('ADF.ISIM') + extends = FilesIsimMandatory files = [ FileTemplate(0x6f09, 'EF.P-CSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), @@ -787,6 +835,7 @@ optional = True oid = OID.ADF_ISIMopt_not_by_default_v2 base_path = Path('ADF.ISIM') + extends = FilesIsimMandatory files = [ FileTemplate(0x6f09, 'EF.PCSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ieab4835cd21008b289713784c0eb7170af2ccfb9 Gerrit-Change-Number: 37814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: fix message flow misconceptions

by fixeria

Attention is currently required from: laforge, neels. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37803?usp=email ) Change subject: erab_fsm: fix message flow misconceptions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37803?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie6f65516fd5621acf002de97eeeb2b9b0b4fae4a Gerrit-Change-Number: 37803 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 14 Aug 2024 06:56:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 year

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: include Network Instance IE in PDRs and FARs

by fixeria

Attention is currently required from: fixeria, laforge, neels. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by neels, Verified+1 by Jenkins Builder Change subject: erab_fsm: include Network Instance IE in PDRs and FARs ...................................................................... erab_fsm: include Network Instance IE in PDRs and FARs Change-Id: I4dbe8e0b1d14eed5fdb3f9f3f2543c44fd543d22 --- M config/sys.config M src/erab_fsm.erl 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/95/37795/5 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4dbe8e0b1d14eed5fdb3f9f3f2543c44fd543d22 Gerrit-Change-Number: 37795 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 year

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement handling of GTP-U address

by fixeria

Attention is currently required from: neels. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by neels, Verified+1 by Jenkins Builder Change subject: erab_fsm: implement handling of GTP-U address ...................................................................... erab_fsm: implement handling of GTP-U address Change-Id: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.erl M test/pfcp_mock.hrl 4 files changed, 87 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/04/37804/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ifdc492c41266d07d0e951dcdcc1e4ba74da0b13b Gerrit-Change-Number: 37804 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>

1 year

1
0
0 0

[S] Change in osmo-hlr[master]: subscriber-create-on-demand: add mode for MSISDN=IMSI

by neels

Attention is currently required from: fixeria, laforge. neels has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-hlr/+/37780?usp=email ) Change subject: subscriber-create-on-demand: add mode for MSISDN=IMSI ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: i think it's cool for lab devel, removing one layer of indirection of keeping track which phone has what uSIM. (Also reminds me of reports where Keith told us about how hard it can be in practice to find out the actual IMSI of a device someone holds in your face. So in that particular context it seems silly to use the IMSI.) It's so simple, I'm +1 File include/osmocom/hlr/hlr.h: https://gerrit.osmocom.org/c/osmo-hlr/+/37780/comment/a091ab76_135b12e3?usp… : PS1, Line 46: SUBSCR_COD_MODE_IMSI, just "mode IMSI" wasn't clear to me until I read the code below that copies the IMSI to the MSISDN. Maybe more specific naming based on "mode IMSI-is-MSISDN" or "mode MSISDN-from-IMSI"? (The other mode names have "MSISDN" in the name, so at first reading I thought "what, a randomly generated IMSI??") -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/37780?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3470492f5e46de7246d9a74e80c37f80f455d851 Gerrit-Change-Number: 37780 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Aug 2024 01:47:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 year

1
0
0 0

[M] Change in osmo-hlr[master]: subscriber-create-on-demand: rework configuration

by neels

Attention is currently required from: fixeria, laforge, osmith. neels has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-hlr/+/37779?usp=email ) Change subject: subscriber-create-on-demand: rework configuration ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: this makes the code a lot nicer. File src/hlr_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/37779/comment/679d6922_90e79794?usp… : PS1, Line 300: vty_out(vty, " no subscriber-create-on-demand%s", VTY_NEWLINE); > the point IMHO is less what each of us feel at this point, but more "what is consistent with the exi […] my perception is we have not much consistency in that regard. Some values we deem important to print defaults for, others we omit. (Also for some we use 'foo delete' and for others 'no foo'... etc) Contrary to my favorite, it seems to me that later osmocom does tend towards omitting defaults, while earlier osmocom used to write defaults more. When I see new software I find it very useful to have a config file with all the options listed explicitly; often all the defaults are listed, but commented out, that's nice. That would be my personal favorite, but that would also be a totally new first for osmocom. It is less code complexity to just write everything. Is create-on-demand a fringe feature that needs no visibility? Depends on the corporate vs communal POV... I'm afraid this is an endless discussion topic, I'd just let fixeria make a choice and be fine with that. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/37779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib553172655f83dad1ac0e0254615c8c207d79ca9 Gerrit-Change-Number: 37779 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Aug 2024 01:38:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024