May 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: libosmocoding.map: export gsm0503_tch_hr_decode2()

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32967 ) Change subject: libosmocoding.map: export gsm0503_tch_hr_decode2() ...................................................................... libosmocoding.map: export gsm0503_tch_hr_decode2() In commit 57a3b3a51fff I added new function gsm0503_tch_hr_decode2(), but I forgot to add it to libosmocoding.map - and without the latter, osmo-bts-trx and other applications can't use the new function. Fix that omission. Related: OS#5688 Change-Id: I6e75ca95409b5c368e8e04d0e0aba41e0331d9e6 --- M src/coding/libosmocoding.map 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/32967/1 diff --git a/src/coding/libosmocoding.map b/src/coding/libosmocoding.map index ff6ea80..a78da27 100644 --- a/src/coding/libosmocoding.map +++ b/src/coding/libosmocoding.map @@ -107,6 +107,7 @@ gsm0503_tch_fr_decode; gsm0503_tch_hr_encode; gsm0503_tch_hr_decode; +gsm0503_tch_hr_decode2; gsm0503_tch_afs_encode; gsm0503_tch_afs_decode; gsm0503_tch_afs_decode_dtx; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e75ca95409b5c368e8e04d0e0aba41e0331d9e6 Gerrit-Change-Number: 32967 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: ts_51_011: Add sst_service_[de]{activate,allocate} shell commands

by laforge

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32963 ) Change subject: ts_51_011: Add sst_service_[de]{activate,allocate} shell commands ...................................................................... Patch Set 1: (2 comments) File pySim/ts_51_011.py: https://gerrit.osmocom.org/c/pysim/+/32963/comment/57d682a0_2cf27d77 PS1, Line 696: != > Not critical, but it's recommended to use `is`/`is not` when comparing to `None`. […] Done https://gerrit.osmocom.org/c/pysim/+/32963/comment/f6eba4bf_b3bac348 PS1, Line 701: != > Same here. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If959d06248cb1a9d2c0a21cdd40d438726cbc5f0 Gerrit-Change-Number: 32963 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 18:59:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: ts_51_011: Add sst_service_[de]{activate,allocate} shell commands

by laforge

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/32963 to look at the new patch set (#2). Change subject: ts_51_011: Add sst_service_[de]{activate,allocate} shell commands ...................................................................... ts_51_011: Add sst_service_[de]{activate,allocate} shell commands Just like the existing commands for UST/IST: Allow the user to activate/deactivate individual services. As EF.SST also contains information about "allocation" of a service, let's have commands for allocation and activation. Change-Id: If959d06248cb1a9d2c0a21cdd40d438726cbc5f0 --- M docs/shell.rst M pySim/ts_51_011.py 2 files changed, 67 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/32963/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If959d06248cb1a9d2c0a21cdd40d438726cbc5f0 Gerrit-Change-Number: 32963 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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[L] Change in pysim[master]: ts_31_102: Extend from Rel16 to Rel17

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/32966 ) Change subject: ts_31_102: Extend from Rel16 to Rel17 ...................................................................... ts_31_102: Extend from Rel16 to Rel17 This adds definitions for a variety of files which were added in Release 17 of 3GPP TS 31.102. Change-Id: I61badc1988b006a1065bdfdcc8a93b758e31f79b --- M pySim/ts_31_102.py 1 file changed, 305 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/66/32966/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index dc2a4d8..a54d600 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -5,12 +5,12 @@ # pylint: disable=undefined-variable """ -Various constants from 3GPP TS 31.102 V16.6.0 +Various constants from 3GPP TS 31.102 V17.9.0 """ # # Copyright (C) 2020 Supreeth Herle <herlesupreeth(a)gmail.com> -# Copyright (C) 2021-2022 Harald Welte <laforge(a)osmocom.org> +# Copyright (C) 2021-2023 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 @@ -180,7 +180,26 @@ 132: 'Support for URSP by USIM', 133: '5G Security Parameters extended', 134: 'MuD and MiD configuration data', - 135: 'Support for Trusted non-3GPP access networks by USIM' + 135: 'Support for Trusted non-3GPP access networks by USIM', + 136: 'Support for multiple records of NAS security context storage for multiple registration', + 137: 'Pre-configured CAG information list', + 138: 'SOR-CMCI storage in USIM', + 139: '5G ProSe', + 140: 'Storage of disaster roaming information in USIM', + 141: 'Pre-configured eDRX parameters', + 142: '5G NSWO support', + 143: 'PWS configuration for SNPN in USIM', + 144: 'Multiplier Coefficient for Higher Priority PLMN search via NG-RAN satellite access', + 145: 'K_AUSF derivation configuration', + 146: 'Network Identifier for SNPN (NID)', +} + +EF_5G_PROSE_ST_map = { + 1: '5G ProSe configuration data for direct discovery', + 2: '5G ProSe configuration data for direct communication', + 3: '5G ProSe configuration data for UE-to-network relay UE', + 4: '5G ProSe configuration data for remote UE', + 5: '5G ProSe configuration data for usage information reporting', } # Mapping between USIM Enbled Service Number and its description @@ -979,6 +998,13 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct('rfu'/BitsRFU(7), 'from_preferred'/Bit) +# TS 31.102 Section 4.2.114 +class EF_eAKA(TransparentEF): + def __init__(self, fid='6f01', sfid=None, name='EF.eAKA', size=(1, 1), + desc='enhanced AKA support', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) + self._construct = BitStruct('rfu'/BitsRFU(7), 'enhanced_sqn_calculation_supported'/Bit) + ###################################################################### # DF.GSM-ACCESS @@ -1055,6 +1081,7 @@ self._tlv = EF_SUPI_NAI.NAI_TLV_Collection +# TS 31.102 Section 4.4.11.13 class EF_TN3GPPSNN(TransparentEF): class ServingNetworkName(BER_TLV_IE, tag=0x80): _construct = GreedyString("utf8") @@ -1063,6 +1090,258 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_TN3GPPSNN.ServingNetworkName +# TS 31.102 Section 4.4.11.14 (Rel 17) +class EF_CAG(TransparentEF): + def __init__(self, fid='4f0d', sfid=0x0d, name='EF.CAG', + desc='Pre-configured CAG information list EF', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = HexAdapter(GreedyBytes) + +# TS 31.102 Section 4.4.11.15 (Rel 17) +class EF_SOR_CMCI(TransparentEF): + def __init__(self, fid='4f0e', sfid=0x0e, name='EF.SOR-CMCI', + desc='Steering Of Roaming - Connected Mode Control Information', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = HexAdapter(GreedyBytes) + +# TS 31.102 Section 4.4.11.17 (Rel 17) +class EF_DRI(TransparentEF): + def __init__(self, fid='4f0f', sfid=0x0f, name='EF.DRI', + desc='Disaster roaming information EF', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('disaster_roaming_enabled'/Byte, + 'parameters_indicator_status'/FlagsEnum(Byte, roaming_wait_range=1, + return_wait_range=2, + applicability_indicator=3), + 'roaming_wait_range'/HexAdapter(Bytes(2)), + 'return_wait_range'/HexAdapter(Bytes(2)), + 'applicability_indicator'/HexAdapter(Byte)) + +# TS 31.102 Section 4.4.12.2 (Rel 17) +class EF_PWS_SNPN(TransparentEF): + def __init__(self, fid='4f01', sfid=0x01, name='EF.PWS_SNPN', + desc='Public Warning System in SNPNs', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('pws_config_in_snpns'/FlagsEnum(Byte, ignore_all_pws_in_subscribed=1, + ignore_all_pws_in_non_subscribed=2)) + +# TS 31.102 Section 4.4.12.2 (Rel 17) +class EF_NID(LinFixedEF): + def __init__(self, fid='4f02', sfid=0x02, name='EF.NID', + desc='Network Identifier for SNPN', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(6,6), **kwargs) + self._construct = Struct('assignment_mode'/Enum(Byte, coordinated_ass_opt1=0, + self_ass=1, + coordinated_ass_opt2=2), + 'network_identifier'/HexAdapter(Bytes(5))) + +# TS 31.102 Section 4.4.12 (Rel 17) +class DF_SNPN(CardDF): + def __init__(self, fid='5fe0', name='DF.SNPN', desc='Files for SNPN purpose', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_PWS_SNPN(service=143), + EF_NID(service=146), + ] + self.add_files(files) + +# TS 31.102 Section 4.4.13.2 (Rel 17) +class EF_5G_PROSE_ST(EF_UServiceTable): + def __init__(self, **kwargs): + super().__init__(fid='4f01', sfid=0x01, name='EF.5G_PROSE_ST', + desc='5G ProSe Service Table', size=(1,2), table=EF_5G_PROSE_ST_map, **kwargs) + # add those commands to the general commands of a TransparentEF + self.shell_commands += [self.AddlShellCommands()] + + @with_default_category('File-Specific Commands') + class AddlShellCommands(CommandSet): + def __init__(self): + super().__init__() + + def do_prose_service_activate(self, arg): + """Activate a service within EF.5G_PROSE_ST""" + self._cmd.card.update_ust(int(arg), 1) + + def do_prose_service_deactivate(self, arg): + """Deactivate a service within EF.5G_PROSE_ST""" + self._cmd.card.update_ust(int(arg), 0) + +# TS 31.102 Section 4.4.13.3 (Rel 17) +class EF_5G_PROSE_DD(TransparentEF): + class ServedByNgRan(BER_TLV_IE, tag=0x80): + pass + class NotServedByNgran(BER_TLV_IE, tag=0x81): + pass + class ProSeIdentifiers(BER_TLV_IE, tag=0x82): + pass + class ProSeIdToDefaultDestL2Id(BER_TLV_IE, tag=0x83): + pass + class GroupMemberDiscoveryParameters(BER_TLV_IE, tag=0x84): + pass + class ValidityTimer(BER_TLV_IE, tag=0x85): + pass + class ProSeDirectDiscoveryUeId(BER_TLV_IE, tag=0x86): + pass + class Hplmn5GDdnmfAddressInformation(BER_TLV_IE, tag=0x87): + pass + class ProSeConfigForDirectDiscovery(BER_TLV_IE, tag=0xA0, + nested=[ServedByNgRan, NotServedByNgran, ProSeIdentifiers, + ProSeIdToDefaultDestL2Id, GroupMemberDiscoveryParameters, + ValidityTimer, ProSeDirectDiscoveryUeId, + Hplmn5GDdnmfAddressInformation]): + pass + def __init__(self, fid='4f02', sfid=0x02, name='EF.5G_PROSE_DD', + desc='5G ProSe configuration data for direct discovery', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + # contains TLV structure despite being TransparentEF, not BER-TLV ?!? + self._tlv = EF_5G_PROSE_DD.ProSeConfigForDirectDiscovery + +# TS 31.102 Section 4.4.13.4 (Rel 17) +class EF_5G_PROSE_DC(TransparentEF): + class PrivacyConfig(BER_TLV_IE, tag=0x87): + pass + class DirectCommInNrPc5(BER_TLV_IE, tag=0x88): + pass + class ApplicationToPathPreferenceMappingRules(BER_TLV_IE, tag=0x89): + pass + class ProSeIdToNrTxProfileForBroadcastAndGroupcastMappingRules(BER_TLV_IE, tag=0x91): + pass + class ProSeConfigForDirectCommunication(BER_TLV_IE, tag=0xA0, + nested=[EF_5G_PROSE_DD.ServedByNgRan, + EF_5G_PROSE_DD.NotServedByNgran, + PrivacyConfig, DirectCommInNrPc5, + ApplicationToPathPreferenceMappingRules, + EF_5G_PROSE_DD.ValidityTimer, + ProSeIdToNrTxProfileForBroadcastAndGroupcastMappingRules]): + pass + def __init__(self, fid='4f03', sfid=0x03, name='EF.5G_PROSE_DC', + desc='5G ProSe configuration data for direct communication', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + # contains TLV structure despite being TransparentEF, not BER-TLV ?!? + self._tlv = EF_5G_PROSE_DC.ProSeConfigForDirectCommunication + +# TS 31.102 Section 4.4.13.5 (Rel 17) +class EF_5G_PROSE_U2NRU(TransparentEF): + class ProSeIdToDefaultDestL2Id(BER_TLV_IE, tag=0x8a): + pass + class RxcInfoList(BER_TLV_IE, tag=0x8b): + pass + class FiveQiToPc65QosParametersMappingRules(BER_TLV_IE, tag=0x8c): + pass + class ProSeIdToAppSrvAddrMappingRules(BER_TLV_IE, tag=0x8d): + pass + class UserInfoIdForDiscovery(BER_TLV_IE, tag=0x8e): + pass + class PrivacyTimer(BER_TLV_IE, tag=0x92): + pass + class FiveGPkkmfAddressInformation(BER_TLV_IE, tag=0x93): + pass + class ProSeConfigDataForUeToNetworkRelayUe(BER_TLV_IE, tag=0xA0, + nested=[EF_5G_PROSE_DD.ServedByNgRan, + EF_5G_PROSE_DD.NotServedByNgran, + ProSeIdToDefaultDestL2Id, + RxcInfoList, + FiveQiToPc65QosParametersMappingRules, + ProSeIdToAppSrvAddrMappingRules, + EF_5G_PROSE_DD.ValidityTimer, + UserInfoIdForDiscovery, + PrivacyTimer, + FiveGPkkmfAddressInformation]): + pass + def __init__(self, fid='4f04', sfid=0x04, name='EF.5G_PROSE_U2NRU', + desc='5G ProSe configuration data for UE-to-network relay UE', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + # contains TLV structure despite being TransparentEF, not BER-TLV ?!? + self._tlv = EF_5G_PROSE_U2NRU.ProSeConfigDataForUeToNetworkRelayUe + +# TS 31.102 Section 4.4.13.6 (Rel 17) +class EF_5G_PROSE_RU(TransparentEF): + class DefaultDestL2Ids(BER_TLV_IE, tag=0x8f): + pass + class N3IwfSelectionInfoFor5GProSeL3RemoteUE(BER_TLV_IE, tag=0x90): + pass + class ProSeConfigDataForRemoteUe(BER_TLV_IE, tag=0xa0, + nested=[EF_5G_PROSE_DD.ServedByNgRan, + EF_5G_PROSE_DD.NotServedByNgran, + DefaultDestL2Ids, + EF_5G_PROSE_U2NRU.RxcInfoList, + N3IwfSelectionInfoFor5GProSeL3RemoteUE, + EF_5G_PROSE_DD.ValidityTimer, + EF_5G_PROSE_U2NRU.UserInfoIdForDiscovery, + EF_5G_PROSE_U2NRU.PrivacyTimer, + EF_5G_PROSE_U2NRU.FiveGPkkmfAddressInformation]): + pass + def __init__(self, fid='4f05', sfid=0x05, name='EF.5G_PROSE_RU', + desc='5G ProSe configuration data for remote UE', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + # contains TLV structure despite being TransparentEF, not BER-TLV ?!? + self._tlv = EF_5G_PROSE_RU.ProSeConfigDataForRemoteUe + +# TS 31.102 Section 4.4.13.7 (Rel 17) +class EF_5G_PROSE_UIR(TransparentEF): + class CollectionPeriod(BER_TLV_IE, tag=0x94): + pass + class ReportingWindow(BER_TLV_IE, tag=0x95): + pass + class ReportingIndicators(BER_TLV_IE, tag=0x96): + pass + class FiveGDdnmfCtfAddrForUploading(BER_TLV_IE, tag=0x97): + pass + class ProSeConfigDataForUeToNetworkRelayUE(BER_TLV_IE, tag=0xa0, + nested=[EF_5G_PROSE_DD.ValidityTimer, + CollectionPeriod, ReportingWindow, + ReportingIndicators, + FiveGDdnmfCtfAddrForUploading]): + pass + def __init__(self, fid='4f06', sfid=0x06, name='EF.5G_PROSE_UIR', + desc='5G ProSe configuration data for usage information reporting', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + # contains TLV structure despite being TransparentEF, not BER-TLV ?!? + self._tlv = EF_5G_PROSE_UIR.ProSeConfigDataForUeToNetworkRelayUE + +# 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): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_5G_PROSE_ST(), + EF_5G_PROSE_DD(service=1), + EF_5G_PROSE_DC(service=2), + EF_5G_PROSE_U2NRU(service=3), + EF_5G_PROSE_RU(service=4), + EF_5G_PROSE_UIR(service=5), + ] + 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', + desc='5GS eDRX Parameters', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('5gs_rat_type'/FlagsEnum(Byte, ng_ran=1, sat_ng_ran=2), + 'edrx_cycle_length'/Int8ub) + +# TS 31.102 Section 4.4.11.19 (Rel 17) +class EF_5GNSWO_CONF(TransparentEF): + def __init__(self, fid='4f11', sfid=0x11, name='EF.5GNSWO_CONF', + desc='5G Non-Seamless WLAN Offload configuration', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('5g_nswo_usage_ind'/Enum(Byte, disabled=0, enabled=1)) + +# TS 31.102 Section 4.4.11.20 (Rel 17) +class EF_MCHPPLMN(TransparentEF): + def __init__(self, fid='4f12', sfid=0x12, name='EF.MCHPPLMN', + desc='Multiplier Coefficient for Higher Priority PLMN search', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('multiplier_coefficient'/Int8ub) + +# TS 31.102 Section 4.4.11.21 (Rel 17) +class EF_KAUSF_DERIVATION(TransparentEF): + def __init__(self, fid='4f16', sfid=0x16, name='EF.KAUSF_DERIVATION', + desc='K_AUSF derivation configuration', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('k_ausf_deriv_cfg'/FlagsEnum(Byte, use_msk=1), 'rfu'/HexAdapter(GreedyBytes)) + # TS 31.102 Section 4.4.5 class DF_WLAN(CardDF): def __init__(self, fid='5f40', name='DF.WLAN', desc='Files for WLAN purpose', **kwargs): @@ -1160,6 +1439,14 @@ TransparentEF('4F0B', 0x0b, 'EF.URSP', 'UE Route Selector Policies per PLMN', service=132), EF_TN3GPPSNN(service=133), + # Rel-17 additions below + EF_CAG(service=137), + EF_SOR_CMCI(service=138), + EF_DRI(service=140), + EF_5GSEDRX(service=141), + EF_5GNSWO_CONF(service=142), + EF_MCHPPLMN(service=144), + EF_KAUSF_DERIVATION(service=145), ] self.add_files(files) @@ -1277,6 +1564,7 @@ EF_ePDGId(service=(106, 107)), # FIXME: from EF_ePDGSelection onwards EF_FromPreferred(service=114), + EF_eAKA(), # FIXME: DF_SoLSA service=23 DF_PHONEBOOK(), DF_GSM_ACCESS(), @@ -1286,6 +1574,8 @@ # FIXME: DF_ACDC service=108 # FIXME: DF_TV service=116 DF_USIM_5GS(service=[122, 123, 124, 125, 126, 127, 129, 130]), + DF_SNPN(service=[143,146]), + DF_5G_ProSe(service=139), ] self.add_files(files) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I61badc1988b006a1065bdfdcc8a93b758e31f79b Gerrit-Change-Number: 32966 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: coding: fix API doc: TCH/AFS vs TCH/AHS

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32965 ) Change subject: coding: fix API doc: TCH/AFS vs TCH/AHS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaed1653c6001545f69ec6b466760f30d42bc4386 Gerrit-Change-Number: 32965 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 18:36:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: coding: fix API doc: TCH/H needs 6 bursts, not 8

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32964 ) Change subject: coding: fix API doc: TCH/H needs 6 bursts, not 8 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iea787ec4c3b15a74f59d45825eae03740c5d28fa Gerrit-Change-Number: 32964 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 18:35:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: coding: fix API doc: TCH/AFS vs TCH/AHS

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32965 ) Change subject: coding: fix API doc: TCH/AFS vs TCH/AHS ...................................................................... coding: fix API doc: TCH/AFS vs TCH/AHS Change-Id: Iaed1653c6001545f69ec6b466760f30d42bc4386 --- M src/coding/gsm0503_coding.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/32965/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index f27b13d..f42deb2 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -2633,7 +2633,7 @@ return id; } -/*! Perform channel decoding of a TCH/AFS channel according TS 05.03 +/*! Perform channel decoding of a TCH/AHS channel according TS 05.03 * \param[out] tch_data Codec frame in RTP payload format * \param[in] bursts buffer containing the symbols of 6 bursts * \param[in] odd Is this an odd (1) or even (0) frame number? @@ -2656,7 +2656,7 @@ n_bits_total, NULL); } -/*! Perform channel decoding of a TCH/AFS channel according TS 05.03 +/*! Perform channel decoding of a TCH/AHS channel according TS 05.03 * \param[out] tch_data Codec frame in RTP payload format * \param[in] bursts buffer containing the symbols of 6 bursts * \param[in] odd Is this an odd (1) or even (0) frame number? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaed1653c6001545f69ec6b466760f30d42bc4386 Gerrit-Change-Number: 32965 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: coding: fix API doc: TCH/H needs 6 bursts, not 8

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32964 ) Change subject: coding: fix API doc: TCH/H needs 6 bursts, not 8 ...................................................................... coding: fix API doc: TCH/H needs 6 bursts, not 8 Change-Id: Iea787ec4c3b15a74f59d45825eae03740c5d28fa --- M src/coding/gsm0503_coding.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/32964/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 6f76824..f27b13d 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -1976,7 +1976,7 @@ /*! Perform channel decoding of a HR(v1) channel according TS 05.03 * \param[out] tch_data Codec frame in TS 101 318 canonical format - * \param[in] bursts buffer containing the symbols of 8 bursts + * \param[in] bursts buffer containing the symbols of 6 bursts * \param[in] odd Odd (1) or even (0) frame number * \param[out] n_errors Number of detected bit errors * \param[out] n_bits_total Total number of bits @@ -2054,7 +2054,7 @@ /*! Perform channel decoding of a HR(v1) channel according TS 05.03, * deprecated legacy API. * \param[out] tch_data Codec frame in pseudo-RFC5993 format - * \param[in] bursts buffer containing the symbols of 8 bursts + * \param[in] bursts buffer containing the symbols of 6 bursts * \param[in] odd Odd (1) or even (0) frame number * \param[out] n_errors Number of detected bit errors * \param[out] n_bits_total Total number of bits @@ -2635,7 +2635,7 @@ /*! Perform channel decoding of a TCH/AFS channel according TS 05.03 * \param[out] tch_data Codec frame in RTP payload format - * \param[in] bursts buffer containing the symbols of 8 bursts + * \param[in] bursts buffer containing the symbols of 6 bursts * \param[in] odd Is this an odd (1) or even (0) frame number? * \param[in] codec_mode_req is this CMR (1) or CMC (0) * \param[in] codec array of active codecs (active codec set) @@ -2658,7 +2658,7 @@ /*! Perform channel decoding of a TCH/AFS channel according TS 05.03 * \param[out] tch_data Codec frame in RTP payload format - * \param[in] bursts buffer containing the symbols of 8 bursts + * \param[in] bursts buffer containing the symbols of 6 bursts * \param[in] odd Is this an odd (1) or even (0) frame number? * \param[in] codec_mode_req is this CMR (1) or CMC (0) * \param[in] codec array of active codecs (active codec set) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iea787ec4c3b15a74f59d45825eae03740c5d28fa Gerrit-Change-Number: 32964 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in libosmocore[master]: gsm0503_tch_hr_decode2(): new function, emits TS101318 format

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32962 ) Change subject: gsm0503_tch_hr_decode2(): new function, emits TS101318 format ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > osmo-bts-trx: yes, as detailed in my "blueprint" comment in the OS#5688 ticket. […] @falconia you're always welcome to send patches for trxcon, I'll be happy to review them. I generally agree with the ideas you outlined in OS#5688 and will migrate trxcon, ttcn3-bts-test, and the mobile app (audio I/O) to the TS 101.318 format once this patch is merged. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If28ddb20789e8993b7558ca08020478615b4c708 Gerrit-Change-Number: 32962 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 18:12:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: gsm0503_tch_hr_encode(): accept both TS101318 and RFC5993 payloads

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32961 ) Change subject: gsm0503_tch_hr_encode(): accept both TS101318 and RFC5993 payloads ...................................................................... gsm0503_tch_hr_encode(): accept both TS101318 and RFC5993 payloads The original design of gsm0503_tch_hr_{en,de}code() functions contains a mistake in that a pseudo-RFC5993 format was chosen for HR codec frame input and output, instead of "pure" (agnostic to outer RTP encoding) form of 14 bytes. We would like to change this design so that we can feed pure 14-byte HR codec frames to the channel coding function and get such frames back from the channel decoding function - however, we cannot break libosmocoding API for existing users. In the encoding direction, make the new format our preferred one, but support the extra-octet format for backward compatibility. Related: OS#5688 Change-Id: I13eaad366f9f68615b9e9e4a5f87396a0e9dea0f --- M src/coding/gsm0503_coding.c 1 file changed, 27 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index ce24650..4f1ac79 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -1586,10 +1586,10 @@ static void tch_hr_disassemble(ubit_t *b_bits, const uint8_t *tch_data) { - int i, j; + int i; - for (i = 0, j = 8; i < 112; i++, j++) - b_bits[i] = (tch_data[j >> 3] >> (7 - (j & 7))) & 1; + for (i = 0; i < 112; i++) + b_bits[i] = (tch_data[i >> 3] >> (7 - (i & 7))) & 1; } /* assemble a EFR codec frame in format as used inside RTP */ @@ -2065,7 +2065,10 @@ int i; switch (len) { - case 15: /* TCH HR */ + case GSM_HR_BYTES_RTP_RFC5993: /* TCH HR with RFC 5993 prefix */ + tch_data++; + /* fall-through */ + case GSM_HR_BYTES: /* TCH HR in "pure" form */ tch_hr_disassemble(b, tch_data); tch_hr_b_to_d(d, b); @@ -2086,7 +2089,6 @@ gsm0503_tch_burst_map(&iB[i * 114], &bursts[i * 116], &h, i >> 1); } - break; case GSM_MACBLOCK_LEN: /* FACCH */ _xcch_encode_cB(cB, tch_data); @@ -2104,7 +2106,6 @@ gsm0503_tch_burst_map(&iB[i * 114 + 456], &bursts[i * 116], &h, 1); } - break; default: return -1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13eaad366f9f68615b9e9e4a5f87396a0e9dea0f Gerrit-Change-Number: 32961 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023