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

[S] Change in pysim[master]: osmo-smdpp: Make sure to return empty HTTP response in handleNotifica...
by laforge 17 Jul '24

17 Jul '24

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37497?usp=email ) Change subject: osmo-smdpp: Make sure to return empty HTTP response in handleNotification ...................................................................... Patch Set 3: Code-Review+2 (1 comment) File osmo-smdpp.py: https://gerrit.osmocom.org/c/pysim/+/37497/comment/351c2979_03c5b4a4 PS2, Line 191: return '' > May it makes sens to print something like "Tx (empty response)" for consistency? mh, I'm not convinced, sorry. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37497?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1cad539accbc3e7222bfd4780955b3b1ff694c5b Gerrit-Change-Number: 37497 Gerrit-PatchSet: 3 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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 Jul 2024 13:23:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim.ts_31_103: update to spec v18.1.0 Release 18
by laforge 17 Jul '24

17 Jul '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37523?usp=email ) Change subject: pySim.ts_31_103: update to spec v18.1.0 Release 18 ...................................................................... pySim.ts_31_103: update to spec v18.1.0 Release 18 This adds two new EFs and one new IST service. Change-Id: Iced1700046b459399a3e8305e1387ec65eeb3536 --- M pySim/ts_31_103.py 1 file changed, 39 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/37523/1 diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 81de13c..2a71449 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- """ -Various constants from 3GPP TS 31.103 V16.1.0 +Various constants from 3GPP TS 31.103 V18.1.0 """ # # Copyright (C) 2020 Supreeth Herle <herlesupreeth(a)gmail.com> -# Copyright (C) 2021 Harald Welte <laforge(a)osmocom.org> +# Copyright (C) 2021-2024 Harald Welte <laforge(a)osmocom.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -56,6 +56,7 @@ 19: 'XCAP Configuration Data', 20: 'WebRTC URI', 21: 'MuD and MiD configuration data', + 22: 'IMS Data Channel indication', } # TS 31.103 Section 4.2.2 @@ -279,6 +280,29 @@ super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_MuDMiDConfigData.MudMidConfigDataCollection +# TS 31.103 Section 4.2.22 +class EF_AC_GBAUAPI(LinFixedEF): + """The use of this EF is eescribed in 3GPP TS 31.130""" + class AppletNafAccessControl(BER_TLV_IE, tag=0x80): + # the use of Int8ub as length field in Prefixed is strictly speaking incorrect, as it is a BER-TLV + # length field whihc will consume two bytes from length > 127 bytes. However, AIDs and NAF IDs can + # safely be assumed shorter than that + _construct = Struct('aid'/Prefixed(Int8ub, GreedyBytes), + 'naf_id'/Prefixed(Int8ub, GreedyBytes)) + def __init__(self, fid='6f0a', sfid=None, name='EF.GBAUAPI', + desc='Access Control to GBA_U_API', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_AC_GBAUAPI.AppletNafAccessControl + +# TS 31.103 Section 4.2.23 +class EF_IMSDCI(TransparentEF): + """See Management object as defined in 3GPP TS 24.275.""" + def __init__(self, fid='6f0b', sfid=None, name='EF.IMSDCI', desc='IMS Data Channel Indication', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Enum(Byte, ims_dc_not_allowed=0x00, + ims_dc_allowed_after_ims_session=0x01, + ims_dc_allowed_simultaneous_ims_session=0x02) + class ADF_ISIM(CardADF): def __init__(self, aid='a0000000871004', has_fs=True, name='ADF.ISIM', fid=None, sfid=None, @@ -306,6 +330,8 @@ EF_XCAPConfigData(service=19), EF_WebRTCURI(service=20), EF_MuDMiDConfigData(service=21), + EF_AC_GBAUAPI(service=2), + EF_IMSDCI(service=22), ] self.add_files(files) # add those commands to the general commands of a TransparentEF -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37523?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iced1700046b459399a3e8305e1387ec65eeb3536 Gerrit-Change-Number: 37523 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: osmo-smdpp + es9p_client: HTTP status 204 is used for handleNotification
by laforge 17 Jul '24

17 Jul '24

Attention is currently required from: laforge. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/37511?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: osmo-smdpp + es9p_client: HTTP status 204 is used for handleNotification ...................................................................... osmo-smdpp + es9p_client: HTTP status 204 is used for handleNotification As SGP.22 states, the handleNotification endpoint uses HTTP status 204, not 200 (due to its empty body). Change-Id: I890bdbd3e1c4578d2d5f0367958fdce26e338cac --- M osmo-smdpp.py M pySim/esim/es9p.py 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/11/37511/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37511?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I890bdbd3e1c4578d2d5f0367958fdce26e338cac Gerrit-Change-Number: 37511 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: [cosmetic] ts_31_102: Note in comment which release introdcued recent...
by laforge 17 Jul '24

17 Jul '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37525?usp=email ) Change subject: [cosmetic] ts_31_102: Note in comment which release introdcued recent files ...................................................................... [cosmetic] ts_31_102: Note in comment which release introdcued recent files Change-Id: I0c1250b532992ae954b1d8ab20993cb9fa947695 --- M pySim/ts_31_102.py 1 file changed, 20 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/37525/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 2536603..f160d8e 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -850,7 +850,7 @@ self._construct = Struct('status'/PaddedString(2, 'ascii'), 'link_to_ef_ipd'/Int8ub, 'rfu'/Byte) -# TS 31.102 Section 4.2.103 +# TS 31.102 Section 4.2.103 (Rel 13) class EF_ePDGId(TransparentEF): _test_de_encode = [ ( '801100657064672e6f736d6f636f6d2e6f7267', {'e_pdg_id': {"type_of_ePDG_address": "FQDN", "ePDG_address" : "epdg.osmocom.org" } } ), @@ -868,7 +868,7 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_ePDGId.ePDGId -# TS 31.102 Section 4.2.104 +# TS 31.102 Section 4.2.104 (Rel 13) class EF_ePDGSelection(TransparentEF): _test_de_encode = [ ( '800600f110000100', {'e_pdg_selection': [{'plmn': '001-01', 'epdg_priority': 1, 'epdg_fqdn_format': 'operator_identified' }] }), @@ -883,14 +883,14 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_ePDGSelection.ePDGSelection -# TS 31.102 Section 4.2.106 +# TS 31.102 Section 4.2.106 (Rel 14) class EF_FromPreferred(TransparentEF): def __init__(self, fid='6ff7', sfid=None, name='EF.FromPreferred', size=(1, 1), desc='From Preferred', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct('rfu'/BitsRFU(7), 'from_preferred'/Flag) -# TS 31.102 Section 4.2.114 +# TS 31.102 Section 4.2.114 (Rel 18) class EF_eAKA(TransparentEF): def __init__(self, fid='6f01', sfid=None, name='EF.eAKA', size=(1, 1), desc='enhanced AKA support', **kwargs): @@ -992,10 +992,10 @@ ###################################################################### -# DF.5GS +# DF.5GS (Rel 15) ###################################################################### -# TS 31.102 Section 4.4.11.2 +# TS 31.102 Section 4.4.11.2 (Rel 15) class EF_5GS3GPPLOCI(TransparentEF): def __init__(self, fid='4f01', sfid=0x01, name='EF.5GS3GPPLOCI', size=(20, 20), desc='5S 3GP location information', **kwargs): @@ -1006,7 +1006,7 @@ 'last_visited_registered_tai_in_5gs'/HexAdapter(Bytes(6)), '5gs_update_status'/upd_status_constr) -# TS 31.102 Section 4.4.11.7 +# TS 31.102 Section 4.4.11.7 (Rel 15) class EF_UAC_AIC(TransparentEF): _test_de_encode = [ ( '03', { "uac_access_id_config": { "multimedia_priority_service": True, @@ -1019,7 +1019,7 @@ mission_critical_service=2) self._construct = Struct('uac_access_id_config'/cfg_constr) -# TS 31.102 Section 4.4.11.9 +# TS 31.102 Section 4.4.11.9 (Rel 15) class EF_OPL5G(LinFixedEF): def __init__(self, fid='4f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(10, None), **kwargs) @@ -1027,7 +1027,7 @@ 'tac_max'/HexAdapter(Bytes(3))) self._construct = Struct('tai'/Tai, 'pnn_record_id'/Int8ub) -# TS 31.102 Section 4.4.11.10 +# TS 31.102 Section 4.4.11.10 (Rel 15) class EF_SUPI_NAI(TransparentEF): class NetworkSpecificIdentifier(TLV_IE, tag=0x80): # RFC 7542 encoded as UTF-8 string @@ -1049,7 +1049,7 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_SUPI_NAI.NAI_TLV_Collection -# TS 31.102 Section 4.4.11.11 +# TS 31.102 Section 4.4.11.11 (Rel 15) class EF_Routing_Indicator(TransparentEF): def __init__(self, fid='4f0a', sfid=0x0a, name='EF.Routing_Indicator', desc='Routing Indicator', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) @@ -1061,7 +1061,7 @@ self._construct = Struct('routing_indicator'/Rpad(BcdAdapter(Bytes(2)), 'f', 2), 'rfu'/HexAdapter(Bytes(2))) -# TS 31.102 Section 4.4.11.13 +# TS 31.102 Section 4.4.11.13 (Rel 16) class EF_TN3GPPSNN(TransparentEF): class ServingNetworkName(BER_TLV_IE, tag=0x80): _construct = Utf8Adapter(GreedyBytes) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37525?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0c1250b532992ae954b1d8ab20993cb9fa947695 Gerrit-Change-Number: 37525 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[L] Change in pysim[master]: move parts of pySim.ts_31_103 to pySim.ts_31_103_shared
by laforge 17 Jul '24

17 Jul '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37524?usp=email ) Change subject: move parts of pySim.ts_31_103 to pySim.ts_31_103_shared ...................................................................... move parts of pySim.ts_31_103 to pySim.ts_31_103_shared This is requird to make some definitions available to USIM / ts_31_102 without introducing circular dependencies. Change-Id: I32e29f400d2da047e821bf732316b21805b5a1e2 --- M pySim/ts_31_103.py A pySim/ts_31_103_shared.py 2 files changed, 151 insertions(+), 113 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/37524/1 diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 2a71449..0de0d62 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -29,6 +29,7 @@ from pySim.ts_51_011 import EF_AD, EF_SMS, EF_SMSS, EF_SMSR, EF_SMSP from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred from pySim.ts_31_102_telecom import EF_UServiceTable +from pySim.ts_31_103_shared import * import pySim.ts_102_221 from pySim.ts_102_221 import EF_ARR from pySim.construct import * @@ -190,119 +191,6 @@ super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_NAFKCA.NafKeyCentreAddress -# TS 31.103 Section 4.2.16 -class EF_UICCIARI(LinFixedEF): - class iari(BER_TLV_IE, tag=0x80): - _construct = Utf8Adapter(GreedyBytes) - - def __init__(self, fid='6fe7', sfid=None, name='EF.UICCIARI', desc='UICC IARI', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._tlv = EF_UICCIARI.iari - -# TS 31.103 Section 4.2.18 -class EF_IMSConfigData(BerTlvEF): - class ImsConfigDataEncoding(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(Bytes(1)) - class ImsConfigData(BER_TLV_IE, tag=0x81): - _construct = GreedyString - # pylint: disable=undefined-variable - class ImsConfigDataCollection(TLV_IE_Collection, nested=[ImsConfigDataEncoding, ImsConfigData]): - pass - def __init__(self, fid='6ff8', sfid=None, name='EF.IMSConfigData', desc='IMS Configuration Data', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._tlv = EF_IMSConfigData.ImsConfigDataCollection - -# TS 31.103 Section 4.2.19 -class EF_XCAPConfigData(BerTlvEF): - class Access(BER_TLV_IE, tag=0x81): - pass - class ApplicationName(BER_TLV_IE, tag=0x82): - pass - class ProviderID(BER_TLV_IE, tag=0x83): - pass - class URI(BER_TLV_IE, tag=0x84): - pass - class XcapAuthenticationUserName(BER_TLV_IE, tag=0x85): - pass - class XcapAuthenticationPassword(BER_TLV_IE, tag=0x86): - pass - class XcapAuthenticationType(BER_TLV_IE, tag=0x87): - pass - class AddressType(BER_TLV_IE, tag=0x88): - pass - class Address(BER_TLV_IE, tag=0x89): - pass - class PDPAuthenticationType(BER_TLV_IE, tag=0x8a): - pass - class PDPAuthenticationName(BER_TLV_IE, tag=0x8b): - pass - class PDPAuthenticationSecret(BER_TLV_IE, tag=0x8c): - pass - - class AccessForXCAP(BER_TLV_IE, tag=0x81): - pass - class NumberOfXcapConnParPolicy(BER_TLV_IE, tag=0x82): - _construct = Int8ub - # pylint: disable=undefined-variable - class XcapConnParamsPolicyPart(BER_TLV_IE, tag=0xa1, nested=[Access, ApplicationName, ProviderID, URI, - XcapAuthenticationUserName, XcapAuthenticationPassword, - XcapAuthenticationType, AddressType, Address, PDPAuthenticationType, - PDPAuthenticationName, PDPAuthenticationSecret]): - pass - class XcapConnParamsPolicy(BER_TLV_IE, tag=0xa0, nested=[AccessForXCAP, NumberOfXcapConnParPolicy, XcapConnParamsPolicyPart]): - pass - class XcapConnParamsPolicyDO(BER_TLV_IE, tag=0x80, nested=[XcapConnParamsPolicy]): - pass - def __init__(self, fid='6ffc', sfid=None, name='EF.XCAPConfigData', desc='XCAP Configuration Data', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._tlv = EF_XCAPConfigData.XcapConnParamsPolicy - -# TS 31.103 Section 4.2.20 -class EF_WebRTCURI(TransparentEF): - class uri(BER_TLV_IE, tag=0x80): - _construct = Utf8Adapter(GreedyBytes) - - def __init__(self, fid='6ffa', sfid=None, name='EF.WebRTCURI', desc='WebRTC URI', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._tlv = EF_WebRTCURI.uri - -# TS 31.103 Section 4.2.21 -class EF_MuDMiDConfigData(BerTlvEF): - class MudMidConfigDataEncoding(BER_TLV_IE, tag=0x80): - _construct = HexAdapter(Bytes(1)) - class MudMidConfigData(BER_TLV_IE, tag=0x81): - _construct = GreedyString - # pylint: disable=undefined-variable - class MudMidConfigDataCollection(TLV_IE_Collection, nested=[MudMidConfigDataEncoding, MudMidConfigData]): - pass - def __init__(self, fid='6ffe', sfid=None, name='EF.MuDMiDConfigData', - desc='MuD and MiD Configuration Data', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._tlv = EF_MuDMiDConfigData.MudMidConfigDataCollection - -# TS 31.103 Section 4.2.22 -class EF_AC_GBAUAPI(LinFixedEF): - """The use of this EF is eescribed in 3GPP TS 31.130""" - class AppletNafAccessControl(BER_TLV_IE, tag=0x80): - # the use of Int8ub as length field in Prefixed is strictly speaking incorrect, as it is a BER-TLV - # length field whihc will consume two bytes from length > 127 bytes. However, AIDs and NAF IDs can - # safely be assumed shorter than that - _construct = Struct('aid'/Prefixed(Int8ub, GreedyBytes), - 'naf_id'/Prefixed(Int8ub, GreedyBytes)) - def __init__(self, fid='6f0a', sfid=None, name='EF.GBAUAPI', - desc='Access Control to GBA_U_API', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._tlv = EF_AC_GBAUAPI.AppletNafAccessControl - -# TS 31.103 Section 4.2.23 -class EF_IMSDCI(TransparentEF): - """See Management object as defined in 3GPP TS 24.275.""" - def __init__(self, fid='6f0b', sfid=None, name='EF.IMSDCI', desc='IMS Data Channel Indication', **kwargs): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) - self._construct = Enum(Byte, ims_dc_not_allowed=0x00, - ims_dc_allowed_after_ims_session=0x01, - ims_dc_allowed_simultaneous_ims_session=0x02) - class ADF_ISIM(CardADF): def __init__(self, aid='a0000000871004', has_fs=True, name='ADF.ISIM', fid=None, sfid=None, diff --git a/pySim/ts_31_103_shared.py b/pySim/ts_31_103_shared.py new file mode 100644 index 0000000..98b5954 --- /dev/null +++ b/pySim/ts_31_103_shared.py @@ -0,0 +1,138 @@ +""" +Definitions from 3GPP TS 31.103 V18.1.0 which are shared by both USIM (31.102) and ISIM (31.103) and +hence need to be in a separate python module to avoid circular dependencies. +""" + +# Copyright (C) 2021-2024 Harald Welte <laforge(a)osmocom.org> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +from construct import Struct, Switch, Bytes, GreedyString, GreedyBytes, Int8ub, Prefixed, Enum, Byte +from pySim.construct import HexAdapter, Utf8Adapter +from pySim.filesystem import * +from pySim.tlv import BER_TLV_IE, TLV_IE_Collection + +# TS 31.103 Section 4.2.16 +class EF_UICCIARI(LinFixedEF): + class iari(BER_TLV_IE, tag=0x80): + _construct = Utf8Adapter(GreedyBytes) + + def __init__(self, fid='6fe7', sfid=None, name='EF.UICCIARI', desc='UICC IARI', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_UICCIARI.iari + +# TS 31.103 Section 4.2.18 +class EF_IMSConfigData(BerTlvEF): + class ImsConfigDataEncoding(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(Bytes(1)) + class ImsConfigData(BER_TLV_IE, tag=0x81): + _construct = GreedyString + # pylint: disable=undefined-variable + class ImsConfigDataCollection(TLV_IE_Collection, nested=[ImsConfigDataEncoding, ImsConfigData]): + pass + def __init__(self, fid='6ff8', sfid=None, name='EF.IMSConfigData', desc='IMS Configuration Data', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_IMSConfigData.ImsConfigDataCollection + +# TS 31.103 Section 4.2.19 +class EF_XCAPConfigData(BerTlvEF): + class Access(BER_TLV_IE, tag=0x81): + pass + class ApplicationName(BER_TLV_IE, tag=0x82): + pass + class ProviderID(BER_TLV_IE, tag=0x83): + pass + class URI(BER_TLV_IE, tag=0x84): + pass + class XcapAuthenticationUserName(BER_TLV_IE, tag=0x85): + pass + class XcapAuthenticationPassword(BER_TLV_IE, tag=0x86): + pass + class XcapAuthenticationType(BER_TLV_IE, tag=0x87): + pass + class AddressType(BER_TLV_IE, tag=0x88): + pass + class Address(BER_TLV_IE, tag=0x89): + pass + class PDPAuthenticationType(BER_TLV_IE, tag=0x8a): + pass + class PDPAuthenticationName(BER_TLV_IE, tag=0x8b): + pass + class PDPAuthenticationSecret(BER_TLV_IE, tag=0x8c): + pass + + class AccessForXCAP(BER_TLV_IE, tag=0x81): + pass + class NumberOfXcapConnParPolicy(BER_TLV_IE, tag=0x82): + _construct = Int8ub + # pylint: disable=undefined-variable + class XcapConnParamsPolicyPart(BER_TLV_IE, tag=0xa1, nested=[Access, ApplicationName, ProviderID, URI, + XcapAuthenticationUserName, XcapAuthenticationPassword, + XcapAuthenticationType, AddressType, Address, PDPAuthenticationType, + PDPAuthenticationName, PDPAuthenticationSecret]): + pass + class XcapConnParamsPolicy(BER_TLV_IE, tag=0xa0, nested=[AccessForXCAP, NumberOfXcapConnParPolicy, XcapConnParamsPolicyPart]): + pass + class XcapConnParamsPolicyDO(BER_TLV_IE, tag=0x80, nested=[XcapConnParamsPolicy]): + pass + def __init__(self, fid='6ffc', sfid=None, name='EF.XCAPConfigData', desc='XCAP Configuration Data', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_XCAPConfigData.XcapConnParamsPolicy + +# TS 31.103 Section 4.2.20 +class EF_WebRTCURI(TransparentEF): + class uri(BER_TLV_IE, tag=0x80): + _construct = Utf8Adapter(GreedyBytes) + + def __init__(self, fid='6ffa', sfid=None, name='EF.WebRTCURI', desc='WebRTC URI', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_WebRTCURI.uri + +# TS 31.103 Section 4.2.21 +class EF_MuDMiDConfigData(BerTlvEF): + class MudMidConfigDataEncoding(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(Bytes(1)) + class MudMidConfigData(BER_TLV_IE, tag=0x81): + _construct = GreedyString + # pylint: disable=undefined-variable + class MudMidConfigDataCollection(TLV_IE_Collection, nested=[MudMidConfigDataEncoding, MudMidConfigData]): + pass + def __init__(self, fid='6ffe', sfid=None, name='EF.MuDMiDConfigData', + desc='MuD and MiD Configuration Data', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_MuDMiDConfigData.MudMidConfigDataCollection + +# TS 31.103 Section 4.2.22 +class EF_AC_GBAUAPI(LinFixedEF): + """The use of this EF is eescribed in 3GPP TS 31.130""" + class AppletNafAccessControl(BER_TLV_IE, tag=0x80): + # the use of Int8ub as length field in Prefixed is strictly speaking incorrect, as it is a BER-TLV + # length field whihc will consume two bytes from length > 127 bytes. However, AIDs and NAF IDs can + # safely be assumed shorter than that + _construct = Struct('aid'/Prefixed(Int8ub, GreedyBytes), + 'naf_id'/Prefixed(Int8ub, GreedyBytes)) + def __init__(self, fid='6f0a', sfid=None, name='EF.GBAUAPI', + desc='Access Control to GBA_U_API', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_AC_GBAUAPI.AppletNafAccessControl + +# TS 31.103 Section 4.2.23 +class EF_IMSDCI(TransparentEF): + """See Management object as defined in 3GPP TS 24.275.""" + def __init__(self, fid='6f0b', sfid=None, name='EF.IMSDCI', desc='IMS Data Channel Indication', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Enum(Byte, ims_dc_not_allowed=0x00, + ims_dc_allowed_after_ims_session=0x01, + ims_dc_allowed_simultaneous_ims_session=0x02) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I32e29f400d2da047e821bf732316b21805b5a1e2 Gerrit-Change-Number: 37524 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: ts_31_102: Make use of ts_31_103_shared and add Rel 18 files
by laforge 17 Jul '24

17 Jul '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37526?usp=email ) Change subject: ts_31_102: Make use of ts_31_103_shared and add Rel 18 files ...................................................................... ts_31_102: Make use of ts_31_103_shared and add Rel 18 files Change-Id: I68ca15084f9654468bd37526c02a66322085b25b --- M pySim/ts_31_102.py 1 file changed, 133 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/26/37526/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f160d8e..be53558 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -30,7 +30,7 @@ from construct import Optional as COptional from construct import Int32ub, Nibble, GreedyRange, Struct, FlagsEnum, Switch, this, Int16ub, Padding -from construct import Bytewise, Int24ub, PaddedString +from construct import Bytewise, Int24ub, PaddedString, PrefixedArray, If import pySim.ts_102_221 from pySim.ts_51_011 import EF_ACMmax, EF_AAeM, EF_eMLPP, EF_CMI, EF_PNN @@ -43,6 +43,8 @@ from pySim.tlv import * from pySim.filesystem import * from pySim.ts_31_102_telecom import DF_PHONEBOOK, EF_UServiceTable +from pySim.ts_31_103_shared import EF_IMSConfigData, EF_XCAPConfigData, EF_MuDMiDConfigData +from pySim.ts_31_103_shared import EF_AC_GBAUAPI, EF_IMSDCI from pySim.construct import * from pySim.utils import is_hexstr from pySim.cat import SMS_TPDU, DeviceIdentities, SMSPPDownload @@ -897,6 +899,14 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct('rfu'/BitsRFU(7), 'enhanced_sqn_calculation_supported'/Flag) +# TS 31.102 Section 4.2.115 (Rel 18) +class EF_OCST(TransparentEF): + def __init__(self, fid='6f02', sfid=None, name='EF.OCST', size=(2, 100), + desc='Operator controlled signal threshold per access technology', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) + self._construct = Struct('sense'/FlagsEnum(Byte, sense_enabled=1), + 'ocst_tlv'/GreedyBytes) + ###################################################################### # DF.GSM-ACCESS @@ -1278,6 +1288,56 @@ # contains TLV structure despite being TransparentEF, not BER-TLV ?!? self._tlv = EF_5G_PROSE_UIR.ProSeConfigDataForUeToNetworkRelayUE +# TS 31.102 Section 4.4.13.8 (Rel 18) +class EF_5G_PROSE_U2URU(TransparentEF): + class ValidityTimer(BER_TLV_IE, tag=0x85): + _construct = Bytes(5) + class ServedByNGRAN(BER_TLV_IE, tag=0x80): + _construct = GreedyBytes + class NotServedByNGRAN(BER_TLV_IE, tag=0x81): + _construct = GreedyBytes + class DefaultDstL2IdsForRxDisc(BER_TLV_IE, tag=0x99): + _construct = GreedyBytes + class UserInforIdForDiscovery(BER_TLV_IE, tag=0x8e): + _construct = GreedyBytes + class RSCInfoList(BER_TLV_IE, tag=0x8b): + _construct = GreedyBytes + class DefaultDstL2IdsForTxRxDirect(BER_TLV_IE, tag=0x9a): + _construct = GreedyBytes + class ProSeConfigDataForU2URelayUE(BER_TLV_IE, tag=0xa0, + nested=[ValidityTimer, ServedByNGRAN, NotServedByNGRAN, + DefaultDstL2IdsForRxDisc, UserInforIdForDiscovery, + RSCInfoList, DefaultDstL2IdsForTxRxDirect]): + pass + def __init__(self, fid='4f07', sfid=0x07, name='EF.5G_PROSE_U2URU', + desc='5G ProSe configuration data for UE-to-UE relay UE', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_5G_PROSE_U2URU.ProSeConfigDataForU2URelayUE + +# TS 31.102 Section 4.4.13.9 (Rel 18) +class EF_5G_PROSE_EU(TransparentEF): + class PKMFAddressInformation(BER_TLV_IE, tag=0x93): + Ipv4AddrList = PrefixedArray(Int8ub, Int32ub) + Ipv6AddrList = PrefixedArray(Int8ub, Bytes(16)) + _construct = Struct('flags'/FlagsEnum(Byte, ipv4=1, ipv6=2, fqdn=4), + 'ipv4_addr_list'/If(this.flags.ipv4, Ipv4AddrList), + 'ipv6_addr_list'/If(this.flags.ipv6, Ipv6AddrList), + 'fqdn'/Prefixed(Int8ub, Utf8Adapter(GreedyBytes))) + class ProSeConfigDataForEndUE(BER_TLV_IE, tag=0xa0, + nested=[EF_5G_PROSE_U2URU.ValidityTimer, + EF_5G_PROSE_U2URU.ServedByNGRAN, + EF_5G_PROSE_U2URU.NotServedByNGRAN, + EF_5G_PROSE_U2URU.DefaultDstL2IdsForRxDisc, + EF_5G_PROSE_U2URU.UserInforIdForDiscovery, + EF_5G_PROSE_U2URU.RSCInfoList, + EF_5G_PROSE_U2URU.DefaultDstL2IdsForTxRxDirect, + PKMFAddressInformation]): + pass + def __init__(self, fid='4f08', sfid=0x08, name='EF.5G_PROSE_EU', + desc='5G ProSe configuration data for end UE', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_5G_PROSE_EU.ProSeConfigDataForEndUE + # TS 31.102 Section 4.4.13 (Rel 17) class DF_5G_ProSe(CardDF): def __init__(self, fid='5ff0', name='DF.5G_ProSe', desc='Files for 5G ProSe purpose', **kwargs): @@ -1289,9 +1349,62 @@ EF_5G_PROSE_U2NRU(service=3), EF_5G_PROSE_RU(service=4), EF_5G_PROSE_UIR(service=5), + # Rel 18 additions + EF_5G_PROSE_U2URU(service=6), + EF_5G_PROSE_EU(service=7), ] self.add_files(files) +# TS 31.102 Section 4.4.14.2 (Rel 18) +class EF_5MBSUECONFIG(TransparentEF): + + class Plmn(BER_TLV_IE, tag=0x80): + _construct = Struct('plmn'/PlmnAdapter(Bytes(3)), + 'nid'/COptional(Bytes(6))) + class Tmgi(BER_TLV_IE, tag=0x81): + TmgiEntry = Struct('tmgi'/Bytes(6), + 'usd_fid'/HexAdapter(Bytes(2)), + 'service_type'/FlagsEnum(Byte, mbs_service_announcement=1, mbs_user_service=2)) + _construct = GreedyRange(TmgiEntry) + class NrArfcnList(BER_TLV_IE, tag=0x82): + _construct = GreedyRange(Bytes(4)) + class DNN(BER_TLV_IE, tag=0x83): + _construct = GreedyBytes + class SNSSAI(BER_TLV_IE, tag=0x84): + _construct = GreedyBytes + class PduInfoList(BER_TLV_IE, tag=0xa1, nested=[DNN, SNSSAI]): + pass + class Plmn5mbsPreconfiguration(BER_TLV_IE, tag=0xa0, + nested=[Plmn, Tmgi, NrArfcnList, PduInfoList]): + pass + def __init__(self, fid='4f01', sfid=None, name='EF.5MBSUECONFIG', + desc='5MBS UE pre-configuration', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_5MBSUECONFIG.Plmn5mbsPreconfiguration + +# TS 31.102 Section 4.4.14.3 (Rel 18) +class EF_5MBSUSD(TransparentEF): + """There can be any number of these files with undefined FID; the FIDs are contained + in EF.5BMSUECONFIG. FID range is 4f08...4fff""" + class USD(BER_TLV_IE, tag=0x80): + _construct = GreedyBytes + def __init__(self, fid, sfid=None, name='EF.5MBSUSD', + desc='5MBS User Service Description', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = USD + + +# TS 31.102 Section 4.4.14 (Rel 18) +class DF_5G_ProSe(CardDF): + def __init__(self, fid='5ff1', name='DF.5MBSUECONFIG', desc='', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_5MBSUECONFIG(), + # EF_5MBSUSD() wouild have to be dynamically registered based on EF_5MBSUECONFIG content + ] + self.add_files(files) + + # TS 31.102 Section 4.4.11.18 (Rel 17) class EF_5GSEDRX(TransparentEF): def __init__(self, fid='4f10', sfid=0x10, name='EF.5GSEDRX', @@ -1556,7 +1669,17 @@ EF_ePDGSelection('6ff6', None, 'EF.ePDGSelectionEm', desc='ePDG Selection Information for Emergency Services', service=(110, 111)), EF_FromPreferred(service=114), + EF_IMSConfigData(service=115), + # TODO: EF.TVCONFIG + # TODO: EF.3GPPPSDATAOFF + # TODO: EF.3GPPPSDATAOFFservicelist + EF_XCAPConfigData(service=120), + # TODO: EF.EARFCNList + EF_MuDMiDConfigData(service=134), EF_eAKA(), + EF_OCST(service=148), + EF_AC_GBAUAPI(service=68), + EF_IMSDCI(service=150), # FIXME: DF_SoLSA service=23 DF_PHONEBOOK(), DF_GSM_ACCESS(), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37526?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I68ca15084f9654468bd37526c02a66322085b25b Gerrit-Change-Number: 37526 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: osmo-smdpp: Make sure to return empty HTTP response in handleNotifica...
by dexter 17 Jul '24

17 Jul '24

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37497?usp=email ) Change subject: osmo-smdpp: Make sure to return empty HTTP response in handleNotification ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File osmo-smdpp.py: https://gerrit.osmocom.org/c/pysim/+/37497/comment/cbce0dad_421d1a0f PS2, Line 191: return '' May it makes sens to print something like "Tx (empty response)" for consistency? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37497?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1cad539accbc3e7222bfd4780955b3b1ff694c5b Gerrit-Change-Number: 37497 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 17 Jul 2024 13:20:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: all: add strongswan-epdg
by osmith 17 Jul '24

17 Jul '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/37522?usp=email ) Change subject: all: add strongswan-epdg ...................................................................... all: add strongswan-epdg Change-Id: I95a5a86e141eac5ee6c2ecdf26ad6c473a0677f3 --- M all.deps M all.urls M default.opts 3 files changed, 13 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/all.deps b/all.deps index 4cc0d57..96f1826 100644 --- a/all.deps +++ b/all.deps @@ -56,3 +56,5 @@ simtrace2_host libosmocore osmo-gsm-shark libosmo-pfcp osmo-mgw libosmo-sccp osmo-iuh + +strongswan-epdg libosmocore diff --git a/all.urls b/all.urls index dfc8ae7..60b653d 100644 --- a/all.urls +++ b/all.urls @@ -3,3 +3,4 @@ libnftnl https://git.netfilter.org/libnftnl/ nftables https://git.netfilter.org/nftables/ open5gs https://github.com/open5gs/open5gs +strongswan-epdg https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg diff --git a/default.opts b/default.opts index ba2be3d..68a8c23 100644 --- a/default.opts +++ b/default.opts @@ -1,3 +1,4 @@ osmo-msc --enable-smpp openbsc --enable-smpp --enable-osmo-bsc --enable-nat nftables --with-json +strongswan-epdg --enable-osmo-epdg --enable-save-keys --enable-eap-aka-3gpp --enable-eap-aka-3gpp2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37522?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I95a5a86e141eac5ee6c2ecdf26ad6c473a0677f3 Gerrit-Change-Number: 37522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-dev[master]: all: add strongswan-epdg
by osmith 17 Jul '24

17 Jul '24

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/37522?usp=email ) Change subject: all: add strongswan-epdg ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: as discussed with Neels, merging osmo-dev patches directly -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37522?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I95a5a86e141eac5ee6c2ecdf26ad6c473a0677f3 Gerrit-Change-Number: 37522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 Jul 2024 11:40:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: all: add strongswan-epdg
by osmith 17 Jul '24

17 Jul '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/37522?usp=email ) Change subject: all: add strongswan-epdg ...................................................................... all: add strongswan-epdg Change-Id: I95a5a86e141eac5ee6c2ecdf26ad6c473a0677f3 --- M all.deps M all.urls M default.opts 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/22/37522/1 diff --git a/all.deps b/all.deps index 4cc0d57..96f1826 100644 --- a/all.deps +++ b/all.deps @@ -56,3 +56,5 @@ simtrace2_host libosmocore osmo-gsm-shark libosmo-pfcp osmo-mgw libosmo-sccp osmo-iuh + +strongswan-epdg libosmocore diff --git a/all.urls b/all.urls index dfc8ae7..60b653d 100644 --- a/all.urls +++ b/all.urls @@ -3,3 +3,4 @@ libnftnl https://git.netfilter.org/libnftnl/ nftables https://git.netfilter.org/nftables/ open5gs https://github.com/open5gs/open5gs +strongswan-epdg https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg diff --git a/default.opts b/default.opts index ba2be3d..68a8c23 100644 --- a/default.opts +++ b/default.opts @@ -1,3 +1,4 @@ osmo-msc --enable-smpp openbsc --enable-smpp --enable-osmo-bsc --enable-nat nftables --with-json +strongswan-epdg --enable-osmo-epdg --enable-save-keys --enable-eap-aka-3gpp --enable-eap-aka-3gpp2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37522?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I95a5a86e141eac5ee6c2ecdf26ad6c473a0677f3 Gerrit-Change-Number: 37522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log July 2024