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

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
by jolly 27 Nov '23

27 Nov '23

Attention is currently required from: daniel, jolly, laforge, neels. Hello Jenkins Builder, daniel, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email to look at the new patch set (#16). The following approvals got outdated and were removed: Code-Review+1 by daniel, Verified+1 by Jenkins Builder Change subject: LAPDm: Add support for RTS based polling ...................................................................... LAPDm: Add support for RTS based polling The lower layer must set the 'POLLING_ONLY' flag and provide frame number when polling a frame. If T200 is pending, it is started with a timeout frame number in advance to given frame number. The lower layer must call lapdm_t200_fn() after a frame has been received or if a frame has not been received. Also it must be called after a TCH frame has been received. LAPDm uses this to check the T200 timeout condition. A new function is used to set the frame number based timeout values. Related: OS#4074 Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c M src/gsm/libosmogsm.map 4 files changed, 178 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/34986/16 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 16 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI
by jolly 27 Nov '23

27 Nov '23

Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, falconia, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35131?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI ...................................................................... coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI Similar to Change ID Iade3310e16b906efb6892d28f474a0d15204e861, add BFI support to TCH AFS and TCH AHS encoder. Every BTS needs to have some graceful handling for the scenario where it is time to send out a speech frame on TCH DL, but there is no frame to be sent. One possible solution is to transmit dummy FACCH, but this option is unattractive for TCH/AHS where FACCH displaces two speech frames rather than one. A more elegant solution is to emit a speech frame with inverted CRC6, causing the MS receiver to declare a BFI condition to trigger substitution and muting procedure. Setting all u(k) bits to 0 is one way to produce such an inverted-CRC speech frame (normal TCH FR/HR CRC6 for an all-zeros frame would be 111111). This patch adds the abiliy to gsm0503_tch_{afs,ahs}_encode() functions, indicated by payload length of 0. See §6.2 of 3GPP TS 26.191 for substitution and muting procedure. Related: OS#6049 Change-Id: I82ce2adf995a4b42d1f378c5819f88d773b9104a --- M src/coding/gsm0503_coding.c 1 file changed, 171 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/35131/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35131?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I82ce2adf995a4b42d1f378c5819f88d773b9104a Gerrit-Change-Number: 35131 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bts[master]: Transmit invalid AMR speech blocks instead of dummy FACCH
by Jenkins Builder 27 Nov '23

27 Nov '23

Attention is currently required from: falconia, jolly. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email ) Change subject: Transmit invalid AMR speech blocks instead of dummy FACCH ...................................................................... Patch Set 2: (2 comments) File src/osmo-bts-trx/sched_lchan_tchf.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12633): https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/bcb9be40_93fb0737 PS2, Line 578: dummy_facch: labels should not be indented File src/osmo-bts-trx/sched_lchan_tchh.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12633): https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/82b9b031_4a52c898 PS2, Line 490: dummy_facch: labels should not be indented -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3 Gerrit-Change-Number: 35132 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 27 Nov 2023 11:40:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Transmit invalid AMR speech blocks instead of dummy FACCH
by jolly 27 Nov '23

27 Nov '23

Attention is currently required from: falconia, jolly. Hello Jenkins Builder, falconia, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Transmit invalid AMR speech blocks instead of dummy FACCH ...................................................................... Transmit invalid AMR speech blocks instead of dummy FACCH Every BTS needs to have some graceful handling for the scenario where it is time to send out a speech frame on TCH DL, but there is no frame to be sent. One possible solution is to transmit dummy FACCH, but this option is unattractive for TCH/HS where FACCH displaces two speech frames rather than one. A more elegant solution is to emit a speech frame that is bad, causing the MS receiver to declare a BFI condition to trigger substitution and muting procedure. A bad frame is generated by gsm0503_tch_{afs,ahs}_encode() by setting the playload length to 0. Depends: libosmocore.git I82ce2adf995a4b42d1f378c5819f88d773b9104a Related: OS#6049 Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 60 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/35132/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3 Gerrit-Change-Number: 35132 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
by jolly 27 Nov '23

27 Nov '23

Attention is currently required from: daniel, neels. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email ) Change subject: LAPD: Add support for RTS based polling and T200 ...................................................................... Patch Set 9: (1 comment) File src/isdn/lapd_core.c: https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/5214f616_13aa8ff8 PS9, Line 1939: if ((dl->lapd_flags & LAPD_F_RTS) && !llist_empty(&dl->tx_queue)) { > This looks a bit weird. […] This function is called not only from lapd_ph_rts_ind, but from various locations of the LAPD process. The !llist_empty() checks if there is already some message in the queue. (RTS mode can only handle one message at a time.) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Nov 2023 09:35:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810
by jolly 27 Nov '23

27 Nov '23

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33532?usp=email ) Change subject: mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810 ...................................................................... Patch Set 3: (1 comment) File src/host/layer23/src/common/sysinfo.c: https://gerrit.osmocom.org/c/osmocom-bb/+/33532/comment/a4d829a1_03ba1e69 PS2, Line 65: (arfcn >= 512 && arfcn <= 810) > Yes this makes it simpler. Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id99c8534bf853f4f24f99364790c1ac1df6cc007 Gerrit-Change-Number: 33532 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 27 Nov 2023 08:28:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: rlp: Add support for 576bit RLP frames
by osmith 27 Nov '23

27 Nov '23

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email ) Change subject: rlp: Add support for 576bit RLP frames ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: maybe add a new test for 576bit RLP frames? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c Gerrit-Change-Number: 35134 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 27 Nov 2023 08:19:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
by osmith 27 Nov '23

27 Nov '23

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/gsm/rlp.c: https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/ef360127_38010364 PS5, Line 85: //out->fcs = (data[240/8-3] << 16) | (data[240/8-2]) << 8 | (data[240/8-1] << 0); do you want to keep this? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 27 Nov 2023 08:12:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-ci[master]: repo-install-test: update package filtering logic
by osmith 27 Nov '23

27 Nov '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35128?usp=email ) Change subject: repo-install-test: update package filtering logic ...................................................................... repo-install-test: update package filtering logic Instead of filtering with several blacklist_* files that must contain the exact names of packages to be filtered, add a shell function that uses fnmatch for filtering. Combine all lists into one. This fixes the error we get with each limesuite release, without the need to increase the version in the txt files every time. Currently the repo-install-tests are failing for all debian versions because of this. Change-Id: I6745b10804685119d68b089f129ec9b0cde8cdf5 --- D scripts/repo-install-test/blacklist_centos8.txt D scripts/repo-install-test/blacklist_debian10.txt D scripts/repo-install-test/blacklist_debian11.txt D scripts/repo-install-test/blacklist_debian12.txt M scripts/repo-install-test/run-inside.sh 5 files changed, 68 insertions(+), 251 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/repo-install-test/blacklist_centos8.txt b/scripts/repo-install-test/blacklist_centos8.txt deleted file mode 100644 index 3e5381d..0000000 --- a/scripts/repo-install-test/blacklist_centos8.txt +++ /dev/null @@ -1,15 +0,0 @@ -# These packages will not get explicitly installed in this test. -# Package lines must have nothing but the package (no comment, -# no additional space etc). - -# The ulfius package in network:osmocom:* is linked to the opensuse version, -# which has dependencies that exist under another name in centos -# (libgnutls-devel, libjansson-devel). Linking to the opensuse version has the -# advantage that we don't need to worry about updating the package. However, -# the dependency problem means that we can't simply install the package in -# centos. In OBS we work around this in the project config. -ulfius-devel - -# Also linked to opensuse versions -nftables-devel -python3-nftables diff --git a/scripts/repo-install-test/blacklist_debian10.txt b/scripts/repo-install-test/blacklist_debian10.txt deleted file mode 100644 index 93dac75..0000000 --- a/scripts/repo-install-test/blacklist_debian10.txt +++ /dev/null @@ -1,67 +0,0 @@ -# These packages will not get explicitly installed in this test. -# Package lines must have nothing but the package (no comment, -# no additional space etc). - -# OpenBSC -# This is legacy, we aren't really interested in testing openbsc.git -# derived packages. Packages are found in openbsc/debian/control. -openbsc-dev -osmo-bsc-mgcp -osmo-bsc-mgcp-dbg -osmocom-bs11-utils -osmocom-bs11-utils-dbg -osmocom-bsc-nat -osmocom-bsc-nat-dbg -osmocom-bsc-sccplite -osmocom-bsc-sccplite-dbg -osmocom-ipaccess-utils -osmocom-ipaccess-utils-dbg -osmocom-nitb -osmocom-nitb-dbg - -# Not relevant for the test -limesuite-images -limesuite-images23.10 - -# SoapySDR is not used anymore (see OS#3542) -soapysdr-module-lms7 -soapysdr0.6-module-lms7 -soapysdr0.6-module-lms7-dbgsym -soapysdr0.7-module-lms7 -soapysdr0.7-module-lms7-dbgsym - -# Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install -librtlsdr0-dbgsym -rtl-sdr-dbgsym - -# Depends on mongodb, which was droppend from debian 10 onwards -open5gs -open5gs-amf -open5gs-amf-dbgsym -open5gs-ausf -open5gs-ausf-dbgsym -open5gs-common -open5gs-common-dbgsym -open5gs-dbg -open5gs-hss -open5gs-hss-dbgsym -open5gs-mme -open5gs-mme-dbgsym -open5gs-nrf -open5gs-nrf-dbgsym -open5gs-pcf -open5gs-pcf-dbgsym -open5gs-pcrf -open5gs-pcrf-dbgsym -open5gs-sgwc -open5gs-sgwc-dbgsym -open5gs-sgwu -open5gs-sgwu-dbgsym -open5gs-smf -open5gs-smf-dbgsym -open5gs-udm -open5gs-udm-dbgsym -open5gs-udr -open5gs-udr-dbgsym -open5gs-upf -open5gs-upf-dbgsym diff --git a/scripts/repo-install-test/blacklist_debian11.txt b/scripts/repo-install-test/blacklist_debian11.txt deleted file mode 100644 index c962ffc..0000000 --- a/scripts/repo-install-test/blacklist_debian11.txt +++ /dev/null @@ -1,72 +0,0 @@ -# These packages will not get explicitly installed in this test. -# Package lines must have nothing but the package (no comment, -# no additional space etc). - -# OpenBSC -# This is legacy, we aren't really interested in testing openbsc.git -# derived packages. Packages are found in openbsc/debian/control. -openbsc-dev -osmo-bsc-mgcp -osmo-bsc-mgcp-dbg -osmocom-bs11-utils -osmocom-bs11-utils-dbg -osmocom-bsc-nat -osmocom-bsc-nat-dbg -osmocom-bsc-sccplite -osmocom-bsc-sccplite-dbg -osmocom-ipaccess-utils -osmocom-ipaccess-utils-dbg -osmocom-nitb -osmocom-nitb-dbg - -# Causing conflicts, not relevant for the test -liblimesuite20.10-1-dbgsym -liborcania1.2 -liborcania1.2-dbgsym -liborcania2.1 -liborcania2.1-dbgsym -libulfius2.5 -libulfius2.5-dbgsym -libulfius2.7 -libulfius2.7-dbgsym -libyder2.0-dbgsym -limesuite-dbgsym -limesuite-images -limesuite-images23.10 -soapysdr0.7-module-lms7-dbgsym - -# Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install -librtlsdr0-dbgsym -rtl-sdr-dbgsym - -# Depends on mongodb, which was droppend from debian 10 onwards -open5gs -open5gs-amf -open5gs-amf-dbgsym -open5gs-ausf -open5gs-ausf-dbgsym -open5gs-common -open5gs-common-dbgsym -open5gs-dbg -open5gs-hss -open5gs-hss-dbgsym -open5gs-mme -open5gs-mme-dbgsym -open5gs-nrf -open5gs-nrf-dbgsym -open5gs-pcf -open5gs-pcf-dbgsym -open5gs-pcrf -open5gs-pcrf-dbgsym -open5gs-sgwc -open5gs-sgwc-dbgsym -open5gs-sgwu -open5gs-sgwu-dbgsym -open5gs-smf -open5gs-smf-dbgsym -open5gs-udm -open5gs-udm-dbgsym -open5gs-udr -open5gs-udr-dbgsym -open5gs-upf -open5gs-upf-dbgsym diff --git a/scripts/repo-install-test/blacklist_debian12.txt b/scripts/repo-install-test/blacklist_debian12.txt deleted file mode 100644 index 9b5f5e7..0000000 --- a/scripts/repo-install-test/blacklist_debian12.txt +++ /dev/null @@ -1,75 +0,0 @@ -# These packages will not get explicitly installed in this test. -# Package lines must have nothing but the package (no comment, -# no additional space etc). - -# OpenBSC -# This is legacy, we aren't really interested in testing openbsc.git -# derived packages. Packages are found in openbsc/debian/control. -openbsc-dev -osmo-bsc-mgcp -osmo-bsc-mgcp-dbg -osmocom-bs11-utils -osmocom-bs11-utils-dbg -osmocom-bsc-nat -osmocom-bsc-nat-dbg -osmocom-bsc-sccplite -osmocom-bsc-sccplite-dbg -osmocom-ipaccess-utils -osmocom-ipaccess-utils-dbg -osmocom-nitb -osmocom-nitb-dbg - -# Causing conflicts, not relevant for the test -liblimesuite20.10-1-dbgsym -liblimesuite22.09-1-dbgsym -liborcania1.2 -liborcania1.2-dbgsym -liborcania2.1 -liborcania2.1-dbgsym -libulfius2.5 -libulfius2.5-dbgsym -libulfius2.7 -libulfius2.7-dbgsym -libyder2.0-dbgsym -limesuite-dbgsym -limesuite-images -limesuite-images23.10 -soapysdr0.7-module-lms7 -soapysdr0.7-module-lms7-dbgsym -soapysdr-module-lms7 - -# Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install -librtlsdr0-dbgsym -rtl-sdr-dbgsym - -# Depends on mongodb, which was droppend from debian 10 onwards -open5gs -open5gs-amf -open5gs-amf-dbgsym -open5gs-ausf -open5gs-ausf-dbgsym -open5gs-common -open5gs-common-dbgsym -open5gs-dbg -open5gs-hss -open5gs-hss-dbgsym -open5gs-mme -open5gs-mme-dbgsym -open5gs-nrf -open5gs-nrf-dbgsym -open5gs-pcf -open5gs-pcf-dbgsym -open5gs-pcrf -open5gs-pcrf-dbgsym -open5gs-sgwc -open5gs-sgwc-dbgsym -open5gs-sgwu -open5gs-sgwu-dbgsym -open5gs-smf -open5gs-smf-dbgsym -open5gs-udm -open5gs-udm-dbgsym -open5gs-udr -open5gs-udr-dbgsym -open5gs-upf -open5gs-upf-dbgsym diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index d7730ff..425e49e 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -306,48 +306,77 @@ esac } -# Filter $PWD/osmocom_packages_all.txt through a blacklist_$DISTRO.txt and store the result in -# $PWD/osmocom_packages.txt. -filter_packages_txt() { - # Copy distro specific blacklist file, remove comments and sort it - grep -v "^#" /repo-install-test/blacklist_$DISTRO.txt | sort -u > blacklist.txt +filter_packages() { + for i in "$@"; do + case "$i" in + # OpenBSC + # This is legacy, we aren't really interested in testing + # openbsc.git derived packages. Packages are found in + # openbsc/debian/control. + osmo-bsc-dev) ;; + osmo-bsc-mgcp*) ;; + osmocom-bs11-utils*) ;; + osmocom-bsc-nat*) ;; + osmocom-bsc-sccplite*) ;; + osmocom-ipaccess-utils*) ;; + osmocom-nitb*) ;; - # Generate list of pkgs to be installed from available pkgs minus the ones blacklisted - comm -23 osmocom_packages_all.txt \ - blacklist.txt > osmocom_packages.txt + # Causing conflicts, not relevant for the test + liblimesuite*) ;; + liborcania*) ;; + libulfius*) ;; + libhyder*) ;; + limesuite*) ;; + soapysdr*-module-lms7*) ;; + + # Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which + # we won't install + librtlsdr0-dbgsym) ;; + rtl-sdr-dbgsym) ;; + + # Depends on mongodb, which was droppend from debian 10 onwards + open5gs*) ;; + + # Dependencies that have a different name in centos8/almalinux8 + # but are pulled in by linking to opensuse packages. In OBS we + # work around this in the project config. + ulfius-devel) ;; + nftables-devel) ;; + python3-nftables) ;; + + # All other packages are not filtered + *) echo "$i" ;; + esac + done } install_repo_packages_debian() { + local packages echo "Installing all repository packages" # Get a list of all packages from the repository. Reference: # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html - aptitude search -F%p \ - "?origin(.*$PROJ.*) ?architecture(native)" | sort \ - > osmocom_packages_all.txt + packages="$(aptitude search -F%p \ + "?origin(.*$PROJ.*) ?architecture(native)" | sort)" + packages="$(filter_packages $packages)" - cat osmocom_packages_all.txt - - filter_packages_txt - apt-get install -y --no-install-recommends $(cat osmocom_packages.txt) + apt-get install -y --no-install-recommends -- $packages } install_repo_packages_centos() { + local packages echo "Installing all repository packages" # Get a list of all packages from the repository - LANG=C.UTF-8 repoquery \ + packages=$(LANG=C.UTF-8 repoquery \ --quiet \ --repoid="$(proj_with_underscore "$PROJ")" \ --archlist="x86_64,noarch" \ --qf="%{name}" \ - | sort \ - > osmocom_packages_all.txt + | sort) - cat osmocom_packages_all.txt - - filter_packages_txt - dnf install -y $(cat osmocom_packages.txt) + packages="$(filter_packages $packages)" + dnf install -y -- $packages } install_repo_packages() { -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35128?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6745b10804685119d68b089f129ec9b0cde8cdf5 Gerrit-Change-Number: 35128 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: rlp: Add support for 576bit RLP frames
by laforge 26 Nov '23

26 Nov '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email ) Change subject: rlp: Add support for 576bit RLP frames ...................................................................... rlp: Add support for 576bit RLP frames The code so far only supported 240bit RLP frames; Add support for 576bit in this patch. We still only support versions 0+1 and not version 2. Change-Id: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c --- M src/gsm/rlp.c 1 file changed, 39 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/35134/1 diff --git a/src/gsm/rlp.c b/src/gsm/rlp.c index 9ef0c85..a9903f8 100644 --- a/src/gsm/rlp.c +++ b/src/gsm/rlp.c @@ -57,19 +57,22 @@ { 0, NULL } }; +/* number of bytes used up by FCS */ +#define FCS_SIZE_BYTES 3 /*! decode a RLP frame into its abstract representation. Doesn't check FCS correctness. * \param[out] out caller-allocated memory for output of decoded frame * \param[in] version RLP version number to use when decoding * \param[in] data raw RLP frame input data - * \param[in] data_len length of data (in octets) + * \param[in] data_len length of data (in octets); must be 30 (240bit) or 72 (576bit) * \returns 0 in case of success; negative on error */ int osmo_rlp_decode(struct osmo_rlp_frame_decoded *out, uint8_t version, const uint8_t *data, size_t data_len) { + const uint8_t hdr_len = 2; /* will become a variable when we introduce v2 support */ uint8_t n_s, n_r; /* we only support 240 bit so far */ - if (data_len != 240/8) + if (data_len != 240/8 && data_len != 576/8) return -EINVAL; /* we only support version 0+1 so far */ @@ -82,16 +85,15 @@ out->c_r = data[0] & 1; n_s = (data[0] >> 3) | (data[1] & 1) << 5; n_r = (data[1] >> 2); - //out->fcs = (data[240/8-3] << 16) | (data[240/8-2]) << 8 | (data[240/8-1] << 0); - out->fcs = (data[240/8-1] << 16) | (data[240/8-2]) << 8 | (data[240/8-3] << 0); + out->fcs = (data[data_len-1] << 16) | (data[data_len-2]) << 8 | (data[data_len-3] << 0); out->p_f = (data[1] >> 1) & 1; if (n_s == 0x3f) { out->ftype = OSMO_RLP_FT_U; out->u_ftype = n_r & 0x1f; if (out->u_ftype == OSMO_RLP_U_FT_XID) { - memcpy(out->info, data+2, 240/8 - 5); - out->info_len = 240/8 - 5; + memcpy(out->info, data + hdr_len, data_len - (hdr_len + FCS_SIZE_BYTES)); + out->info_len = data_len - (hdr_len + FCS_SIZE_BYTES); } } else if (n_s == 0x3e) { out->ftype = OSMO_RLP_FT_S; @@ -102,8 +104,8 @@ out->s_ftype = (data[0] >> 1) & 3; out->n_s = n_s; out->n_r = n_r; - memcpy(out->info, data+2, 240/8 - 5); - out->info_len = 240/8 - 5; + memcpy(out->info, data + hdr_len, data_len - (hdr_len + FCS_SIZE_BYTES)); + out->info_len = data_len - (2 + 3); } return 0; @@ -111,12 +113,12 @@ /*! encode a RLP frame from its abstract representation. Generates FCS. * \param[out] out caller-allocated output buffer - * \param[in] out_size size of output buffer (in octets) + * \param[in] out_size size of output buffer (in octets); must be 30 (240bit) or 72 (576bit) * \param[in] in decoded RLP frame which is to be encoded * \returns number of output bytes used; negative on error */ int osmo_rlp_encode(uint8_t *out, size_t out_size, const struct osmo_rlp_frame_decoded *in) { - uint8_t out_len = 240/8; + const uint8_t hdr_len = 2; /* will become a variable when we introduce v2 support */ uint8_t n_s, n_r, s_bits; uint32_t fcs; @@ -124,10 +126,10 @@ if (in->version >= 2) return -ENOTSUP; - if (out_size < out_len) + if (out_size != 240/8 && out_size != 576/8) return -EINVAL; - memset(out, 0, out_len); + memset(out, 0, out_size); if (in->c_r) out[0] |= 0x01; @@ -139,8 +141,11 @@ n_s = 0x3f; n_r = in->u_ftype; s_bits = 0; - if (in->u_ftype == OSMO_RLP_U_FT_XID) - memcpy(out+2, in->info, in->info_len); + if (in->u_ftype == OSMO_RLP_U_FT_XID) { + if (in->info_len > out_size - (hdr_len + FCS_SIZE_BYTES)) + return -EINVAL; + memcpy(out+hdr_len, in->info, in->info_len); + } break; case OSMO_RLP_FT_S: n_s = 0x3e; @@ -149,12 +154,12 @@ break; case OSMO_RLP_FT_IS: /* we only support 240 bit so far */ - if (in->info_len != 240/8 - 5) + if (in->info_len > out_size - (hdr_len + FCS_SIZE_BYTES)) return -EINVAL; n_s = in->n_s; n_r = in->n_r; s_bits = in->s_ftype; - memcpy(out+2, in->info, in->info_len); + memcpy(out+hdr_len, in->info, in->info_len); break; default: return -EINVAL; @@ -171,12 +176,12 @@ out[0] |= (s_bits & 3) << 1; /* compute FCS + add it to end of frame */ - fcs = osmo_rlp_fcs_compute(out, out_len - 3); - out[out_len - 3] = (fcs >> 0) & 0xff; - out[out_len - 2] = (fcs >> 8) & 0xff; - out[out_len - 1] = (fcs >> 16) & 0xff; + fcs = osmo_rlp_fcs_compute(out, out_size - FCS_SIZE_BYTES); + out[out_size - 3] = (fcs >> 0) & 0xff; + out[out_size - 2] = (fcs >> 8) & 0xff; + out[out_size - 1] = (fcs >> 16) & 0xff; - return out_len; + return out_size; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c Gerrit-Change-Number: 35134 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0