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

[S] Change in osmo-ttcn3-hacks[master]: bts: TC_pcu_interf_ind: check reporting interval instead of absolute FN
by fixeria 06 Jul '26

06 Jul '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42916?usp=email ) Change subject: bts: TC_pcu_interf_ind: check reporting interval instead of absolute FN ...................................................................... bts: TC_pcu_interf_ind: check reporting interval instead of absolute FN Recent osmo-bts commit 53f0ec29 broke TC_pcu_interf_ind: Verdict: fail reason: Odd TDMA frame number := 935 There's no requirement that periodic interference reports must land on a TDMA frame number satisfying 'fn mod 104 == 0' - only that they keep arriving every configured averaging period. Instead, verify that the interval between consecutive reports equals 104 TDMA frames (1 SACCH period), using the new f_gsm_fn_sub() helper. Change-Id: Ia96f2926400bae8c0a6fb8f81eb56b48ca5f2de9 Related: 53f0ec29 ("l1sap: fix duplicate RF RESOURCE INDICATION on clock bootstrap") --- M bts/BTS_Tests.ttcn 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 2830973..3f3614f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6663,6 +6663,7 @@ var template PCUIF_Message tr_interf_ind; var integer interf_ind_num := 0; var boolean first := true; + var integer prev_fn := -1; var PCUIF_Message msg; timer T; @@ -6690,6 +6691,7 @@ alt { /* The first interference report may contain unreliable values, so we ignore it */ [first] as_pcuif_msg(msg, tr_PCUIF_INTERF_IND(0, 0)) { + prev_fn := msg.u.interf_ind.fn; /* 4 SACCH periods => 4 reports (plus some guard time) */ T.start(0.480 * 4.0 + 0.480 / 2.0); first := false; @@ -6697,11 +6699,16 @@ } /* Subsequent interference reports shall match our expectations */ [not first] as_pcuif_msg(msg, tr_interf_ind) { - /* Check TDMA frame number period */ - if (msg.u.interf_ind.fn mod 104 != 0) { - setverdict(fail, "Odd TDMA frame number := ", - msg.u.interf_ind.fn); + /* Check the reporting interval: there is no requirement on the absolute + * TDMA frame number a report arrives at, only that reports keep arriving + * every 'avg-period' (here: 1) SACCH period(s), i.e. every 104 frames. */ + var integer fn_diff := f_gsm_fn_sub(msg.u.interf_ind.fn, prev_fn); + if (fn_diff != 104) { + setverdict(fail, "Unexpected TDMA frame number interval := ", + fn_diff, " (fn := ", msg.u.interf_ind.fn, + ", prev_fn := ", prev_fn, ")"); } + prev_fn := msg.u.interf_ind.fn; interf_ind_num := interf_ind_num + 1; if (interf_ind_num < 4) { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42916?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia96f2926400bae8c0a6fb8f81eb56b48ca5f2de9 Gerrit-Change-Number: 42916 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in pysim[master]: saip/personalization: add MncLen configurable parameter
by laforge 06 Jul '26

06 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/42672?usp=email ) Change subject: saip/personalization: add MncLen configurable parameter ...................................................................... saip/personalization: add MncLen configurable parameter Add a new ConfigurableParameter that represents the MNC length (2 or 3 digits) in EF.AD (Administrative Data). Change-Id: I6c600faeab00ffb072acbe94c9a8b2d1397c07d3 Co-authored-by: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Jenkins: skip-card-test --- M pySim/esim/saip/personalization.py M tests/unittests/test_configurable_parameters.py M tests/unittests/xo/test_configurable_parameters 3 files changed, 109 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index efde37a..a73678f 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -21,9 +21,11 @@ import re from typing import List, Tuple, Generator, Optional +from construct.core import StreamError from osmocom.tlv import camel_to_snake from osmocom.utils import hexstr from pySim.utils import enc_iccid, dec_iccid, enc_imsi, dec_imsi, h2b, b2h, rpad, sanitize_iccid +from pySim.ts_31_102 import EF_AD from pySim.ts_51_011 import EF_SMSP from pySim.esim.saip import param_source from pySim.esim.saip import ProfileElement, ProfileElementSD, ProfileElementSequence @@ -660,6 +662,72 @@ yield { cls.name: cls.tuple_to_str((international, digits)) } +class MncLen(EnumParam): + """MNC length. Sets only the MNC length field in EF.AD (Administrative Data). + Accepted values: integer 2 or 3, digit strings '2' or '3', or enum names 'MNC2'/'MNC3'. + """ + name = 'MNC-LEN' + example_input = '2' + default_source = param_source.ConstantSource + + class Values(enum.IntEnum): + MNC2 = 2 + MNC3 = 3 + + @classmethod + def validate_val(cls, val): + if isinstance(val, str) and val.isdigit(): + val = int(val) + return super().validate_val(val) + + @classmethod + def _get_f_ad(cls, pe: ProfileElement): + if not hasattr(pe, 'files'): + return None + f_ad = pe.files.get('ef-ad', None) + if f_ad and f_ad.body: + return f_ad + return None + + @classmethod + def _decode_f_ad(cls, f_ad): + try: + ef_ad_dec = EF_AD().decode_bin(f_ad.body) + except StreamError: + return None + if 'mnc_len' not in ef_ad_dec: + return None + return ef_ad_dec + + @classmethod + def apply_val(cls, pes: ProfileElementSequence, val: int): + for pe in pes.get_pes_for_type('usim'): + f_ad = cls._get_f_ad(pe) + if f_ad is None: + continue + # decode existing values + ef_ad_dec = cls._decode_f_ad(f_ad) + if ef_ad_dec is None: + continue + # change mnc_len + ef_ad_dec['mnc_len'] = val + # re-encode into the File body + f_ad.body = EF_AD().encode_bin(ef_ad_dec) + pe.file2pe(f_ad) + + @classmethod + def get_values_from_pes(cls, pes: ProfileElementSequence): + for pe in pes.get_pes_for_type('usim'): + f_ad = cls._get_f_ad(pe) + if f_ad is None: + continue + ef_ad_dec = cls._decode_f_ad(f_ad) + if ef_ad_dec is None: + continue + mnc_len = ef_ad_dec.get('mnc_len') + yield { cls.name: str(mnc_len) } + + class SdKey(BinaryParam): """Configurable Security Domain (SD) Key. Value is presented as bytes. Non-abstract implementations are generated in SdKey.generate_sd_key_classes""" diff --git a/tests/unittests/test_configurable_parameters.py b/tests/unittests/test_configurable_parameters.py index 7f9c8b0..0ffc4b4 100755 --- a/tests/unittests/test_configurable_parameters.py +++ b/tests/unittests/test_configurable_parameters.py @@ -267,6 +267,15 @@ '11111111111111111111111111111111' '22222222222222222222222222222222'), + Paramtest(param_cls=p13n.MncLen, + val='2', + expect_clean_val=2, + expect_val='2'), + Paramtest(param_cls=p13n.MncLen, + val=3, + expect_clean_val=3, + expect_val='3'), + ] for sdkey_cls in ( diff --git a/tests/unittests/xo/test_configurable_parameters b/tests/unittests/xo/test_configurable_parameters index d64e7ba..9ab6073 100644 --- a/tests/unittests/xo/test_configurable_parameters +++ b/tests/unittests/xo/test_configurable_parameters @@ -163,6 +163,14 @@ clean_val= b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11""""""""""""""""':bytes read_back_val= {'MilenageXOR': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc1111111111111111111111111111111122222222222222222222222222222222'}:{hexstr} +ok: TS48v5_SAIP2.1A_NoBERTLV.der MncLen(val= '2':str) + clean_val= 2:int + read_back_val= {'MNC-LEN': '2'}:{str} + +ok: TS48v5_SAIP2.1A_NoBERTLV.der MncLen(val= 3:int) + clean_val= 3:int + read_back_val= {'MNC-LEN': '3'}:{str} + ok: TS48v5_SAIP2.1A_NoBERTLV.der SdKeyScp02Kvn20AesDek(val= '01020304050607080910111213141516':str) clean_val= b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes read_back_val= {'SCP02-KVN20-AES-DEK': '01020304050607080910111213141516'}:{hexstr} @@ -855,6 +863,14 @@ clean_val= b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11""""""""""""""""':bytes read_back_val= {'MilenageXOR': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc1111111111111111111111111111111122222222222222222222222222222222'}:{hexstr} +ok: TS48v5_SAIP2.3_BERTLV_SUCI.der MncLen(val= '2':str) + clean_val= 2:int + read_back_val= {'MNC-LEN': '2'}:{str} + +ok: TS48v5_SAIP2.3_BERTLV_SUCI.der MncLen(val= 3:int) + clean_val= 3:int + read_back_val= {'MNC-LEN': '3'}:{str} + ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SdKeyScp02Kvn20AesDek(val= '01020304050607080910111213141516':str) clean_val= b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes read_back_val= {'SCP02-KVN20-AES-DEK': '01020304050607080910111213141516'}:{hexstr} @@ -1547,6 +1563,14 @@ clean_val= b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11""""""""""""""""':bytes read_back_val= {'MilenageXOR': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc1111111111111111111111111111111122222222222222222222222222222222'}:{hexstr} +ok: TS48v5_SAIP2.1B_NoBERTLV.der MncLen(val= '2':str) + clean_val= 2:int + read_back_val= {'MNC-LEN': '2'}:{str} + +ok: TS48v5_SAIP2.1B_NoBERTLV.der MncLen(val= 3:int) + clean_val= 3:int + read_back_val= {'MNC-LEN': '3'}:{str} + ok: TS48v5_SAIP2.1B_NoBERTLV.der SdKeyScp02Kvn20AesDek(val= '01020304050607080910111213141516':str) clean_val= b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes read_back_val= {'SCP02-KVN20-AES-DEK': '01020304050607080910111213141516'}:{hexstr} @@ -2239,6 +2263,14 @@ clean_val= b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11""""""""""""""""':bytes read_back_val= {'MilenageXOR': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc1111111111111111111111111111111122222222222222222222222222222222'}:{hexstr} +ok: TS48v5_SAIP2.3_NoBERTLV.der MncLen(val= '2':str) + clean_val= 2:int + read_back_val= {'MNC-LEN': '2'}:{str} + +ok: TS48v5_SAIP2.3_NoBERTLV.der MncLen(val= 3:int) + clean_val= 3:int + read_back_val= {'MNC-LEN': '3'}:{str} + ok: TS48v5_SAIP2.3_NoBERTLV.der SdKeyScp02Kvn20AesDek(val= '01020304050607080910111213141516':str) clean_val= b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes read_back_val= {'SCP02-KVN20-AES-DEK': '01020304050607080910111213141516'}:{hexstr} -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6c600faeab00ffb072acbe94c9a8b2d1397c07d3 Gerrit-Change-Number: 42672 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>

1 0

[M] Change in pysim[master]: saip/personalization: add MncLen configurable parameter
by laforge 06 Jul '26

06 Jul '26

Attention is currently required from: fixeria, neels. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/pysim/+/42672?usp=email ) Change subject: saip/personalization: add MncLen configurable parameter ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6c600faeab00ffb072acbe94c9a8b2d1397c07d3 Gerrit-Change-Number: 42672 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Jul 2026 17:24:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in dahdi-linux[master]: compatibility with kernel >= 7.2 which removed strncpy
by laforge 06 Jul '26

06 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42898?usp=email ) Change subject: compatibility with kernel >= 7.2 which removed strncpy ...................................................................... compatibility with kernel >= 7.2 which removed strncpy In commit 079a028d6327e68cfa5d38b36123637b321c19a7 the kernel removed strncpy. Let's use strscpy instead. Change-Id: I11a16ffed90223cbeae456a26834c0342146eb88 --- M include/dahdi/kernel.h 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 47d92f5..bddf768 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1722,4 +1722,9 @@ #define UEVENT_CONST #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 2, 0) +#include <linux/string.h> +#define strncpy strscpy +#endif + #endif /* _DAHDI_KERNEL_H */ -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I11a16ffed90223cbeae456a26834c0342146eb88 Gerrit-Change-Number: 42898 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in dahdi-linux[master]: Revert "Adjust to strncpy removal in linux 7.2-rc1"
by laforge 06 Jul '26

06 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42913?usp=email ) Change subject: Revert "Adjust to strncpy removal in linux 7.2-rc1" ...................................................................... Revert "Adjust to strncpy removal in linux 7.2-rc1" There is another repository at https://github.com/asterisk/dahdi-linux that appears to be compatible to linux >= 2.6 and we want to in theory merge everything from our repo into that at some point. strscpy isn't available in such early linux versions yet, so revert commit b1bc81f8077c5cb52eae7fbd4021bf180159aed7 and add a different fix for building with 7.2-rc1 as next patch. Related: https://gerrit.osmocom.org/c/dahdi-linux/+/42906/comments/c06cfbe4_fbd94c6e Change-Id: I71ad66d33b4a19e4cf9b431bcc3d3cd02cad5e2f --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/xpp/mmapbus.c M drivers/dahdi/xpp/mmapdrv.c 3 files changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 5067c02..657eb34 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -5449,7 +5449,7 @@ */ continue; } - strscpy(vi.echo_canceller, ec_name, sizeof(vi.echo_canceller)); + strncpy(vi.echo_canceller, ec_name, space); space -= strlen(ec_name); if (space < 1) break; diff --git a/drivers/dahdi/xpp/mmapbus.c b/drivers/dahdi/xpp/mmapbus.c index 72c402e..ddf083f 100644 --- a/drivers/dahdi/xpp/mmapbus.c +++ b/drivers/dahdi/xpp/mmapbus.c @@ -40,7 +40,7 @@ dev->dev.bus = &mmap_bus_type; dev->dev.parent = &mmap_bus; dev->dev.release = mmap_dev_release; - strscpy(dev->dev.bus_id, dev->name, sizeof(dev->dev.bus_id)); + strncpy(dev->dev.bus_id, dev->name, BUS_ID_SIZE); return device_register(&dev->dev); } EXPORT_SYMBOL(register_mmap_device); diff --git a/drivers/dahdi/xpp/mmapdrv.c b/drivers/dahdi/xpp/mmapdrv.c index 0124b92..2e0e298 100644 --- a/drivers/dahdi/xpp/mmapdrv.c +++ b/drivers/dahdi/xpp/mmapdrv.c @@ -572,8 +572,8 @@ ret = -ENOMEM; goto fail_xbus; } - strscpy(global_xbus->connector, "mmap", sizeof(global_xbus->connector)); - strscpy(global_xbus->label, "mmap:0", sizeof(global_xbus->label)); + strncpy(global_xbus->connector, "mmap", XBUS_DESCLEN); + strncpy(global_xbus->label, "mmap:0", LABEL_SIZE); xframe_queue_init(&txpool, 10, 200, "mmap_txpool", global_xbus); if (! -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42913?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I71ad66d33b4a19e4cf9b431bcc3d3cd02cad5e2f Gerrit-Change-Number: 42913 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in dahdi-linux[master]: compatibility with kernel >= 7.2 which removed strncpy
by laforge 06 Jul '26

06 Jul '26

Attention is currently required from: osmith. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42898?usp=email ) Change subject: compatibility with kernel >= 7.2 which removed strncpy ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I11a16ffed90223cbeae456a26834c0342146eb88 Gerrit-Change-Number: 42898 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Jul 2026 17:24:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in dahdi-linux[master]: Revert "Adjust to strncpy removal in linux 7.2-rc1"
by laforge 06 Jul '26

06 Jul '26

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42913?usp=email ) Change subject: Revert "Adjust to strncpy removal in linux 7.2-rc1" ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42913?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I71ad66d33b4a19e4cf9b431bcc3d3cd02cad5e2f Gerrit-Change-Number: 42913 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Jul 2026 17:24:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: library: add f_gsm_fn_{sum,sub,diff}()
by laforge 06 Jul '26

06 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42915?usp=email ) Change subject: library: add f_gsm_fn_{sum,sub,diff}() ...................................................................... library: add f_gsm_fn_{sum,sub,diff}() Change-Id: Ie91ccef5d3f170f4a341a6cf9d3323a896b299e6 --- M bts/BTS_Tests.ttcn M library/GSM_Types.ttcn M library/RLCMAC_Templates.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 31 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 54238f5..2830973 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6063,9 +6063,8 @@ private function f_next_pcuif_time_ind_block(GsmFrameNumber fn) return GsmFrameNumber { var uint32_t bn := ((fn mod 13) / 4) + 1; - fn := fn - (fn mod 13); - fn := fn + bn * 4 + bn / 3; - return fn mod GsmMaxFrameNumber; + return f_gsm_fn_sum(fn - (fn mod 13), + bn * 4 + bn / 3); } testcase TC_pcu_time_ind() runs on test_CT { var integer num_time_ind := 0; diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index b3b6dc9..7caca43 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -434,6 +434,28 @@ return (fn / 51) mod 8; } +/* 45.002 4.3.3: TDMA frame number modular arithmetic */ + +/* Return the sum of two given TDMA frame numbers, wrapping around the hyperframe */ +function f_gsm_fn_sum(GsmFrameNumber a, GsmFrameNumber b) return GsmFrameNumber { + return (a + b) mod GsmMaxFrameNumber; +} + +/* Return the difference of two given TDMA frame numbers, wrapping around the hyperframe */ +function f_gsm_fn_sub(GsmFrameNumber a, GsmFrameNumber b) return GsmFrameNumber { + return (a - b + GsmMaxFrameNumber) mod GsmMaxFrameNumber; +} + +/* Return the *minimum* distance between two given TDMA frame numbers */ +function f_gsm_fn_diff(GsmFrameNumber a, GsmFrameNumber b) return GsmFrameNumber { + var GsmFrameNumber d1 := f_gsm_fn_sub(a, b); + var GsmFrameNumber d2 := f_gsm_fn_sub(b, a); + if (d1 < d2) { + return d1; + } + return d2; +} + type hexstring GsmBcdString with { variant "HEXORDER(low)" }; type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" }; @@ -542,9 +564,8 @@ function f_next_pdtch_block(GsmFrameNumber fn) return GsmFrameNumber { var uint32_t bn := fn2bn(fn) + 1; - fn := fn - (fn mod 52); - fn := fn + bn * 4 + bn / 3; - return fn mod GsmMaxFrameNumber; + return f_gsm_fn_sum(fn - (fn mod 52), + bn * 4 + bn / 3); } private function ptcch_fn2bn(GsmFrameNumber fn) return uint32_t { @@ -553,9 +574,8 @@ function f_next_ptcch_dl_block(GsmFrameNumber fn) return GsmFrameNumber { var uint32_t bn := ptcch_fn2bn(fn) + 1; - fn := fn - (fn mod 416); - fn := fn + bn * 104 + 12; - return fn mod GsmMaxFrameNumber; + return f_gsm_fn_sum(fn - (fn mod 416), + bn * 104 + 12); } diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 5e27341..08de136 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -35,7 +35,7 @@ function f_rrbp_ack_fn(uint32_t current_fn, MacRrbp rrbp) return uint32_t { - return (current_fn + f_rrbp_fn_delay(rrbp)) mod 2715648; + return f_gsm_fn_sum(current_fn, f_rrbp_fn_delay(rrbp)); } function f_rlcmac_cs_mcs_is_mcs(CodingScheme cs_mcs) return boolean { diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 75e7a35..2f75a6b 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -21,6 +21,7 @@ import from Osmocom_Types all; import from General_Types all; +import from GSM_Types all; import from RLCMAC_Types all; import from GSM_RR_Types all; @@ -249,7 +250,7 @@ } /* TDMA hyperframe period is (2048 * 51 * 26) frames */ - fn := (fn + 1) mod (2048 * 51 * 26); + fn := f_gsm_fn_sum(fn, 1); /* (Re)start TDMA clock timer and wait */ T_TDMAClock.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42915?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie91ccef5d3f170f4a341a6cf9d3323a896b299e6 Gerrit-Change-Number: 42915 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: library: add f_gsm_fn_{sum,sub,diff}()
by laforge 06 Jul '26

06 Jul '26

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42915?usp=email ) Change subject: library: add f_gsm_fn_{sum,sub,diff}() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42915?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie91ccef5d3f170f4a341a6cf9d3323a896b299e6 Gerrit-Change-Number: 42915 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Jul 2026 17:23:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: TC_pcu_interf_ind: check reporting interval instead of absolute FN
by laforge 06 Jul '26

06 Jul '26

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42916?usp=email ) Change subject: bts: TC_pcu_interf_ind: check reporting interval instead of absolute FN ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42916?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia96f2926400bae8c0a6fb8f81eb56b48ca5f2de9 Gerrit-Change-Number: 42916 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Jul 2026 17:23:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log July 2026