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

[M] Change in osmo-tetra[master]: Added functions that prepare for decryption functionality

by wbokslag

Attention is currently required from: wbokslag. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 to look at the new patch set (#3). Change subject: Added functions that prepare for decryption functionality ...................................................................... Added functions that prepare for decryption functionality Added functions that will eventually allow for mac resource decryption, voice/traffic decryption and identity decryption. Calls to the true TEA keystream generator functions and TA61 identity decryption function will need to be added in a later patch. Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 --- M src/crypto/tetra_crypto.c M src/crypto/tetra_crypto.h 2 files changed, 131 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/01/34001/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 Gerrit-Change-Number: 34001 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixups and clarifying comments for msgb tail modifications

by wbokslag

Attention is currently required from: laforge. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34000 ) Change subject: Fixups and clarifying comments for msgb tail modifications ...................................................................... Patch Set 2: (2 comments) Patchset: PS2: After further inspection, I find the msgb_trim function uses msgb->data as a reference, which is a problem, due to the multiple-resources-per-timeslot scenario. It would work if l1h were used as a reference, since I move that pointer forward in tetra_lower_mac.c. I'm not against refactoring all the manual field manipulation to an osmocom buffer manipulation function but can you suggest a way to do it properly? What's the semantically correct way to deal with multiple upper mac messages in a buffer? File src/lower_mac/tetra_lower_mac.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/173bdf49_1109459c PS2, Line 347: msg->len = msg > Okay, I appreciate the comments and effort to maintain good code quality. […] After further inspection, I find the msgb_trim function uses msgb->data as a reference, which is a problem, due to the multiple-resources-per-timeslot scenario. It would work if l1h were used as a reference, since I move that pointer forward in tetra_lower_mac.c. I'm not against refactoring all the manual field manipulation to an osmocom buffer manipulation function but can you suggest a way to do it properly? What's the semantically correct way to deal with multiple upper mac messages in a buffer? -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db Gerrit-Change-Number: 34000 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 29 Jul 2023 10:02:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: wbokslag <w.bokslag(a)midnightblue.nl> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixups and clarifying comments for msgb tail modifications

by wbokslag

Attention is currently required from: laforge. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34000 ) Change subject: Fixups and clarifying comments for msgb tail modifications ...................................................................... Patch Set 2: (7 comments) Patchset: PS2: Hi, thanks again for the extensive comments. I elaborated the issue in a reply on your comment on tetra_lower_mac, and I believe indeed trim / l3trim may be suited for use in tetra_upper_mac and the LLC code File src/lower_mac/tetra_lower_mac.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/c0575652_18ca0744 PS2, Line 347: msg->len = msg > in general we don't ever manually manipulate msgb's this way in other osmocom software. […] Okay, I appreciate the comments and effort to maintain good code quality. I am not deeply familiar with the osmocom primitives, so maybe I'm overlooking something. The essence of the problem is this. Suppose we have a timeslot on the signalling channel, which will contain MAC-RESOURCE pdus and the like. According to the standard, multiple PDUs may be contained in a single timeslot. So the MAC layer parsing code needs to have an accurate l1h, l2h, l3h start marker for the different layers of the protocol, BUT ALSO need to know how long the payload for their respective layer is. During parsing in tetra_upper_mac, the tail pointer is moved closer to the start, based on MAC-RESOURCE len field. Also, the tail pointer is moved closer to the start in the LLC layer (layer 2) if a 32-bit FCS is present AFTER the layer 3 MLE data. This is needed, because layer 3 parsing requires accurate start (l3h) and end/length markers. However, once the upper mac parsing is done and we return to the lower mac, we need to parse any further resources that may be present in the timeslot. That's why I advance the head, put the tail at the end of the slot again and then fix the end field. msgb_get seemed unsuitable for the purpose since its description states "removes data from the end", as such, I felt I have no guarantee the data there will remain intact and/or allocated. Also semantically it seems like we definitively discard this data. In your next comment you bring msgb_trim (for l2) and msgb_l3trim to my attention, that indeed looks suitable, I'll refactor. File src/tetra_llc.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/b443b21b_ab95c3cf PS2, Line 124: msg->tail = msg->l3h + lpp.tl_sdu_len; // Strips off FCS (if present) : msg->len = msg->tail - msg->head; > this looks a bit like openn-coding a msgb_get(), or probably even more a msgb_l3trim() ? Done File src/tetra_upper_mac.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/9bdada54_cca44860 PS2, Line 178: msg->len = m > same here. […] Done https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/e5e44e08_c7971e2a PS2, Line 185: msg->len = m > same here. […] Done https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/1b2939f2_78548fbe PS2, Line 306: msg->len = m > yet another msgb_trim? Also, the entire get_num_fill_bits + following operations happens several ti […] Ack https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/c818c925_1fb1ed55 PS2, Line 359: msg->len = m > again another fill-bits-stripping situation. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db Gerrit-Change-Number: 34000 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 29 Jul 2023 09:47:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: README.md: Add note about pySim-trace.py dependencies

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33994 ) Change subject: README.md: Add note about pySim-trace.py dependencies ...................................................................... README.md: Add note about pySim-trace.py dependencies Related: OS#6094 Change-Id: I2e03f9c827bd6ee73891bba34bd2f2efe3ded7e6 --- M README.md 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index 2a89c9a..c3c5a25 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,9 @@ After installing all dependencies, the pySim applications ``pySim-read.py``, ``pySim-prog.py`` and ``pySim-shell.py`` may be started directly from the cloned repository. +In addition to the dependencies above ``pySim-trace.py`` requires ``tshark`` and the python package ``pyshark`` to be installed. It is known that the ``tshark`` package +in Debian versions before 11 may not work with pyshark. + ### Archlinux Package Archlinux users may install the package ``python-pysim-git`` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2e03f9c827bd6ee73891bba34bd2f2efe3ded7e6 Gerrit-Change-Number: 33994 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: pysim-test: rename pysim-test.sh to pySim-prog_test.sh

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33964 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pysim-test: rename pysim-test.sh to pySim-prog_test.sh ...................................................................... pysim-test: rename pysim-test.sh to pySim-prog_test.sh We now have pySim-shell and pySim-trace. Let's give pysim-test.sh a more distinctive name so that it is clear to which program it refers. Related: OS#6094 Change-Id: I438f63f9580ebd3c7cc78cc5dab13c9937ac6e3a --- M contrib/jenkins.sh R tests/pySim-prog_test.sh 2 files changed, 16 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3e02546..e75ac40 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -29,7 +29,7 @@ # Run the test with physical cards cd pysim-testdata - ../tests/pysim-test.sh + ../tests/pySim-prog_test.sh ../tests/pySim-trace_test.sh ;; "pylint") diff --git a/tests/pysim-test.sh b/tests/pySim-prog_test.sh similarity index 97% rename from tests/pysim-test.sh rename to tests/pySim-prog_test.sh index 4004c18..f248768 100755 --- a/tests/pysim-test.sh +++ b/tests/pySim-prog_test.sh @@ -27,8 +27,8 @@ set -e -echo "pysim-test - a test program to test pysim-prog.py" -echo "=================================================" +echo "pySim-prog_test - a test program to test pysim-prog.py" +echo "======================================================" # Generate a list of the cards we expect to see by checking which .ok files # are present -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I438f63f9580ebd3c7cc78cc5dab13c9937ac6e3a Gerrit-Change-Number: 33964 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: tests: add test script for pySim-trace

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33963 ) Change subject: tests: add test script for pySim-trace ...................................................................... tests: add test script for pySim-trace pySim-trace has no test coverage yet. Let's use a script to run a GSAMTAP pcacp through it and check that no exceptions are raised. Related: OS#6094 Change-Id: Icfabfa7c59968021eef0399991bd05b92467d8d2 --- M contrib/jenkins.sh A pysim-testdata/pySim-trace_test_gsmtap.pcapng A tests/pySim-trace_test.sh 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0309877..3e02546 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -22,6 +22,7 @@ . venv/bin/activate pip install -r requirements.txt + pip install pyshark # Execute automatically discovered unit tests first python -m unittest discover -v -s tests/ @@ -29,6 +30,7 @@ # Run the test with physical cards cd pysim-testdata ../tests/pysim-test.sh + ../tests/pySim-trace_test.sh ;; "pylint") # Print pylint version diff --git a/pysim-testdata/pySim-trace_test_gsmtap.pcapng b/pysim-testdata/pySim-trace_test_gsmtap.pcapng new file mode 100644 index 0000000..35c3003 --- /dev/null +++ b/pysim-testdata/pySim-trace_test_gsmtap.pcapng Binary files differ diff --git a/tests/pySim-trace_test.sh b/tests/pySim-trace_test.sh new file mode 100755 index 0000000..0ec5e0f --- /dev/null +++ b/tests/pySim-trace_test.sh @@ -0,0 +1,20 @@ +#/bin/bash + +PYSIM_TRACE=../pySim-trace.py +GSMTAP_TRACE=pySim-trace_test_gsmtap.pcapng + +echo "pySim-trace_test - a test program to test pySim-trace.py" +echo "========================================================" + +$PYSIM_TRACE gsmtap-pyshark-pcap -f $GSMTAP_TRACE +if [ $? -ne 0 ]; then + echo "" + echo "========================================================" + echo "Testrun with $GSMTAP_TRACE failed." + exit 1 +fi + +echo "" +echo "========================================================" +echo "trace parsed without problems -- everything ok!" + -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icfabfa7c59968021eef0399991bd05b92467d8d2 Gerrit-Change-Number: 33963 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: tests: add test script for pySim-trace

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33963 ) Change subject: tests: add test script for pySim-trace ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icfabfa7c59968021eef0399991bd05b92467d8d2 Gerrit-Change-Number: 33963 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:56:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: README.md: Add note about pySim-trace.py dependencies

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33994 ) Change subject: README.md: Add note about pySim-trace.py dependencies ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2e03f9c827bd6ee73891bba34bd2f2efe3ded7e6 Gerrit-Change-Number: 33994 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:55:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master,gerrit: don't use bullseye for python2

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33993 ) Change subject: jobs/master,gerrit: don't use bullseye for python2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 Gerrit-Change-Number: 33993 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:55:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: scripts/jenkins-gerrit: sort jobs list

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33992 ) Change subject: scripts/jenkins-gerrit: sort jobs list ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I795f821783b52a6a9cd1967d33f67b656efccf22 Gerrit-Change-Number: 33992 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:55:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: scripts/jenkins-gerrit: make assert more verbose

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33991 ) Change subject: scripts/jenkins-gerrit: make assert more verbose ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ea40663220f7eb8ee72e43f3f6b776be5835db2 Gerrit-Change-Number: 33991 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:54:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: build for debian 10, 12

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33990 ) Change subject: jobs/gerrit-verifications: build for debian 10, 12 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I959b466865bd327cc72cde4a1763ac13c2c2d797 Gerrit-Change-Number: 33990 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:54:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: fix binpkgs for libusrp

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33989 ) Change subject: jobs/gerrit-verifications: fix binpkgs for libusrp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If61765fe628321cae004307f4845d8927a1c7019 Gerrit-Change-Number: 33989 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:54:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/gerrit-binpkgs: don't hardcode distros

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33988 ) Change subject: jobs/gerrit-binpkgs: don't hardcode distros ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I59487e3dc2f55057de1b6a322f088fff0d18654c Gerrit-Change-Number: 33988 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:54:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/gerrit: refactor pipeline script

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33987 ) Change subject: jobs/gerrit: refactor pipeline script ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I641a5b483721ce2bbf21bd61d8f4e83faf94ac24 Gerrit-Change-Number: 33987 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:53:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: Cosmetic: jobs/gerrit: update pipeline comment

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33986 ) Change subject: Cosmetic: jobs/gerrit: update pipeline comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If06af0e955240e1b9d678f1020767bbfb70b1d96 Gerrit-Change-Number: 33986 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:53:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by laforge

Attention is currently required from: jolly, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/ac0074f9_dc62… PS2, Line 68: inout charstring, CallParameters, ASCI_Event; > imho this makes general handlig of Coord port more difficult, since one needs to check for different […] I would go the other way around: Why are there strings at all, and not more specific types going through the port? And regarding handling other messages: A simple default altstep that ignores all unsupported messages could be used to make old code backwards-compatible. TTCN-3 is a strongly typed language. Sending strings between two parts of our own code looks like it was python or some kind of weakly typed language. There are all the usual problems associated with strings like making a typo on one end would only be discovered at runtime instead of compile time, ... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:52:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Update commit hash of titan.ProtocolModules.BSSMAP

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33972 ) Change subject: ASCI: Update commit hash of titan.ProtocolModules.BSSMAP ...................................................................... ASCI: Update commit hash of titan.ProtocolModules.BSSMAP After fixing "UPLINK SEIZED COMMAND" message type, the new head is: 814c5d786ab633bce384eea99685f0e49a386172 Related: OS#6087 Change-Id: Ifd6cd610fee2041179f8d0fd6450469d25f65576 --- M deps/Makefile 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index c7be960..c9aa1cf 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -89,7 +89,7 @@ titan.ProtocolEmulations.SCCP_commit= 17a894fc6620a0df11d0d98c897fb66168276b16 titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a -titan.ProtocolModules.BSSMAP_commit= e03923ec75e0c31a44b322cb75f6a192aad114a2 +titan.ProtocolModules.BSSMAP_commit= 814c5d786ab633bce384eea99685f0e49a386172 titan.ProtocolModules.DNS_commit= R.7.B titan.ProtocolModules.GRE_commit= R.2.A-5-g654c446 titan.ProtocolModules.GTP_v13.5.0_commit= 54219599037626c675610d3a44433d01af264fbb -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifd6cd610fee2041179f8d0fd6450469d25f65576 Gerrit-Change-Number: 33972 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Add templates to send and receive GCC/BCC call control messages

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 ) Change subject: ASCI: Add templates to send and receive GCC/BCC call control messages ...................................................................... ASCI: Add templates to send and receive GCC/BCC call control messages Related: OS#4854 Change-Id: I9ff5587a9fda1ea756891fc39a20cfd05924f628 --- M library/L3_Templates.ttcn 1 file changed, 64 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 345935c..c31ce1f 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -3596,6 +3596,60 @@ } } +template (value) PDU_ML3_MS_NW ts_ML3_MO_BCC(integer tid, octetstring bcc) := { + discriminator := '0001'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := c_TIF_ORIG, + tIExtension := omit + } + }, + msgs := { + bcc := bcc + } +} +template PDU_ML3_NW_MS tr_ML3_MT_BCC(integer tid, template octetstring bcc := ?) := { + discriminator := '0001'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := c_TIF_REPL, + tIExtension := omit + } + }, + msgs := { + bcc := bcc + } +} + +template (value) PDU_ML3_MS_NW ts_ML3_MO_GCC(integer tid, octetstring gcc) := { + discriminator := '0000'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := c_TIF_ORIG, + tIExtension := omit + } + }, + msgs := { + gcc := gcc + } +} +template PDU_ML3_NW_MS tr_ML3_MT_GCC(integer tid, template octetstring gcc := ?) := { + discriminator := '0000'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := c_TIF_REPL, + tIExtension := omit + } + }, + msgs := { + gcc := gcc + } +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9ff5587a9fda1ea756891fc39a20cfd05924f628 Gerrit-Change-Number: 33973 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Allow incoming VGCS/VBS connections at RAN_Emulation.ttcnpp

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33976 ) Change subject: ASCI: Allow incoming VGCS/VBS connections at RAN_Emulation.ttcnpp ...................................................................... ASCI: Allow incoming VGCS/VBS connections at RAN_Emulation.ttcnpp Similar to Handover Requests the RAN Emulation can accept new SCCP connections with VGCS/VBS Setup message and VGCS/VBS Assignment Request message. The point code for the incoming connection can be registered in the same way as for the Handover Request. In order to allow multiple connections with the same point code, the table entry in the ExpectTable must be released after receiving the message. VGCS/VBS calls have multiple connections to the same BSC. This patch does not break existing MSC handover tests. Related: OS#4854 Change-Id: I3fc0c5efe7d9f270804e7295aeb65cfe7898bd7e --- M library/RAN_Emulation.ttcnpp 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 2fba50a..99753da 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1348,6 +1348,14 @@ handoverRequest := true; handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); log("ExpectedCreateCallback handoverRequest ", handoverRequestPointCode); + } else if (ischosen(conn_ind.userData.pdu.bssmap.vGCS_VBSSetup)) { + handoverRequest := true; + handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback VGCS/VBS Setup ", handoverRequestPointCode); + } else if (ischosen(conn_ind.userData.pdu.bssmap.vGCS_VBSAssignmentRequest)) { + handoverRequest := true; + handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback VGCS/VBS Assignment ", handoverRequestPointCode); } else { setverdict(fail, "N-CONNECT.ind with L3 != COMPLETE L3 nor a Handover Request"); mtc.stop; @@ -1359,6 +1367,9 @@ " ==? ", handoverRequestPointCode); if (ExpectTable[i].handoverRequestPointCode == handoverRequestPointCode) { ret := ExpectTable[i].vc_conn; + /* release this entry to be used again */ + ExpectTable[i].handoverRequestPointCode := omit; + ExpectTable[i].vc_conn := null; log("Found Expect[", i, "] for handoverRequest handled at ", ret); return ret; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3fc0c5efe7d9f270804e7295aeb65cfe7898bd7e Gerrit-Change-Number: 33976 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Fix length indicator in template tr_BSSMAP_IE_GroupCallRef

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33974 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Fix length indicator in template tr_BSSMAP_IE_GroupCallRef ...................................................................... ASCI: Fix length indicator in template tr_BSSMAP_IE_GroupCallRef Any length must match, not just 0. Related: OS#4854 Change-Id: I34546609a80f714438abe985697dabc846c89701 --- M library/BSSMAP_Templates.ttcn 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 89efeb8..03479c1 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -2100,7 +2100,7 @@ template (present) BSSMAP_IE_GroupCallReference tr_BSSMAP_IE_GroupCallRef(template (present) GroupCallRef group_call_ref) :={ elementIdentifier := '37'O, - lengthIndicator := 0, // overwritten + lengthIndicator := ?, descrGroupbroadcastCallRef := group_call_ref } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I34546609a80f714438abe985697dabc846c89701 Gerrit-Change-Number: 33974 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Add missing codec list to *_BSSMAP_VGCS_VBS_AssignmentFail temp...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33975 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Add missing codec list to *_BSSMAP_VGCS_VBS_AssignmentFail templates ...................................................................... ASCI: Add missing codec list to *_BSSMAP_VGCS_VBS_AssignmentFail templates Relates: OS#4854 Change-Id: I5f67c676035eaa9d61f7b123995770fd61eadaff --- M library/BSSMAP_Templates.ttcn 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 03479c1..a93fb02 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -2422,7 +2422,8 @@ cause := ts_BSSMAP_IE_Cause(cause), /* we only implement AoIP for now... */ circuitPool := omit, - circuitPoolList := omit + circuitPoolList := omit, + codecList := omit } } } @@ -2437,7 +2438,8 @@ cause := tr_BSSMAP_IE_Cause(cause), /* we only implement AoIP for now... */ circuitPool := omit, - circuitPoolList := omit + circuitPoolList := omit, + codecList := omit } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5f67c676035eaa9d61f7b123995770fd61eadaff Gerrit-Change-Number: 33975 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 ) Change subject: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp ...................................................................... ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp The expectation table is used to deliver new connections with Handover Request as well as with VGCS/VBS Setup and VGCS/VBS Assignment Request. "handoverRequest" is renamed to "n_connect". Related: OS#4854 Change-Id: I941c5db5235785841f3368ef908a409bbb12150e --- M library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 3 files changed, 51 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 99753da..40929ee 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1266,9 +1266,9 @@ PROC.reply(RAN_register:{l3_info, vc_hdlr}) to vc_hdlr; } - [] PROC.getcall(RAN_register_handoverRequest:{?,?}) -> param(targetPointCode, vc_hdlr) { + [] PROC.getcall(RAN_register_n_connect:{?,?}) -> param(targetPointCode, vc_hdlr) { f_create_expect(omit, vc_hdlr, targetPointCode); - PROC.reply(RAN_register_handoverRequest:{targetPointCode, vc_hdlr}) to vc_hdlr; + PROC.reply(RAN_register_n_connect:{targetPointCode, vc_hdlr}) to vc_hdlr; } [] PROC.getcall(RAN_register_sccp_cr_without_payload:{?}) -> param(vc_hdlr) { @@ -1305,7 +1305,7 @@ type record ExpectData { /* L3 payload based on which we can match it */ octetstring l3_payload optional, - integer handoverRequestPointCode optional, + integer n_connectPointCode optional, boolean sccp_cr_without_payload, /* component reference for this connection */ RAN_ConnHdlr vc_conn @@ -1313,7 +1313,7 @@ /* procedure based port to register for incoming connections */ signature RAN_register(in octetstring l3, in RAN_ConnHdlr hdlr); -signature RAN_register_handoverRequest(in integer targetPointCode, in RAN_ConnHdlr hdlr); +signature RAN_register_n_connect(in integer targetPointCode, in RAN_ConnHdlr hdlr); signature RAN_register_sccp_cr_without_payload(in RAN_ConnHdlr hdlr); /* procedure based port to register for incoming IMSI/TMSI */ @@ -1327,7 +1327,7 @@ signature RAN_continue_after_n_sd(N_Sd_Array last_n_sd, in RAN_ConnHdlr hdlr); type port RAN_PROC_PT procedure { - inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_handoverRequest, + inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_n_connect, RAN_register_sccp_cr_without_payload, RAN_last_n_sd, RAN_continue_after_n_sd; } with { extension "internal" }; @@ -1337,40 +1337,40 @@ runs on RAN_Emulation_CT return RAN_ConnHdlr { var RAN_ConnHdlr ret := null; var octetstring l3_info; - var boolean handoverRequest := false; - var integer handoverRequestPointCode; + var boolean n_connect := false; + var integer n_connectPointCode; var integer i; if (ischosen(conn_ind.userData.pdu.bssmap.completeLayer3Information)) { l3_info := conn_ind.userData.pdu.bssmap.completeLayer3Information.layer3Information.layer3info; log("ExpectedCreateCallback completeLayer3Information"); } else if (ischosen(conn_ind.userData.pdu.bssmap.handoverRequest)) { - handoverRequest := true; - handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); - log("ExpectedCreateCallback handoverRequest ", handoverRequestPointCode); + n_connect := true; + n_connectPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback handoverRequest ", n_connectPointCode); } else if (ischosen(conn_ind.userData.pdu.bssmap.vGCS_VBSSetup)) { - handoverRequest := true; - handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); - log("ExpectedCreateCallback VGCS/VBS Setup ", handoverRequestPointCode); + n_connect := true; + n_connectPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback VGCS/VBS Setup ", n_connectPointCode); } else if (ischosen(conn_ind.userData.pdu.bssmap.vGCS_VBSAssignmentRequest)) { - handoverRequest := true; - handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); - log("ExpectedCreateCallback VGCS/VBS Assignment ", handoverRequestPointCode); + n_connect := true; + n_connectPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback VGCS/VBS Assignment ", n_connectPointCode); } else { - setverdict(fail, "N-CONNECT.ind with L3 != COMPLETE L3 nor a Handover Request"); + setverdict(fail, "N-CONNECT.ind with L3 != COMPLETE L3 nor a new BSS connection"); mtc.stop; } for (i := 0; i < sizeof(ExpectTable); i:= i+1) { - if (handoverRequest) { - log("ExpectTable[", i, "].handoverRequestPointCode = ", ExpectTable[i].handoverRequestPointCode, - " ==? ", handoverRequestPointCode); - if (ExpectTable[i].handoverRequestPointCode == handoverRequestPointCode) { + if (n_connect) { + log("ExpectTable[", i, "].n_connectPointCode = ", ExpectTable[i].n_connectPointCode, + " ==? ", n_connectPointCode); + if (ExpectTable[i].n_connectPointCode == n_connectPointCode) { ret := ExpectTable[i].vc_conn; /* release this entry to be used again */ - ExpectTable[i].handoverRequestPointCode := omit; + ExpectTable[i].n_connectPointCode := omit; ExpectTable[i].vc_conn := null; - log("Found Expect[", i, "] for handoverRequest handled at ", ret); + log("Found Expect[", i, "] for N-CONNECT handled at ", ret); return ret; } else { continue; @@ -1436,25 +1436,25 @@ #endif private function f_create_expect(template octetstring l3, RAN_ConnHdlr hdlr, - template integer handoverRequestPointCode := omit) + template integer n_connectPointCode := omit) runs on RAN_Emulation_CT { var integer i; - log("f_create_expect(l3 := ", l3, ", handoverRequest := ", handoverRequestPointCode); + log("f_create_expect(l3 := ", l3, ", n_connectPointCode := ", n_connectPointCode); for (i := 0; i < sizeof(ExpectTable); i := i+1) { if (not ispresent(ExpectTable[i].l3_payload) and not ExpectTable[i].sccp_cr_without_payload - and not ispresent(ExpectTable[i].handoverRequestPointCode)) { + and not ispresent(ExpectTable[i].n_connectPointCode)) { if (ispresent(l3)) { ExpectTable[i].l3_payload := valueof(l3); } else { ExpectTable[i].sccp_cr_without_payload := true; } - if (ispresent(handoverRequestPointCode)) { - ExpectTable[i].handoverRequestPointCode := valueof(handoverRequestPointCode); + if (ispresent(n_connectPointCode)) { + ExpectTable[i].n_connectPointCode := valueof(n_connectPointCode); } ExpectTable[i].vc_conn := hdlr; - if (ispresent(handoverRequestPointCode)) { - log("Created Expect[", i, "] for handoverRequest to be handled at ", hdlr); + if (ispresent(n_connectPointCode)) { + log("Created Expect[", i, "] for N-CONNECT to be handled at ", hdlr); } else { log("Created Expect[", i, "] for ", l3, " to be handled at ", hdlr); } @@ -1499,7 +1499,7 @@ runs on RAN_Emulation_CT { for (var integer i := 0; i < sizeof(ExpectTable); i := i+1) { ExpectTable[i].l3_payload := omit; - ExpectTable[i].handoverRequestPointCode := omit; + ExpectTable[i].n_connectPointCode := omit; ExpectTable[i].sccp_cr_without_payload := false; } } diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 64e2aff..d4723e5 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1969,9 +1969,9 @@ } } -function f_create_bssmap_exp_handoverRequest(integer targetPointCode) runs on BSC_ConnHdlr { - BSSAP_PROC.call(RAN_register_handoverRequest:{targetPointCode, self}) { - [] BSSAP_PROC.getreply(RAN_register_handoverRequest:{?, ?}) {}; +function f_create_bssmap_exp_n_connect(integer targetPointCode) runs on BSC_ConnHdlr { + BSSAP_PROC.call(RAN_register_n_connect:{targetPointCode, self}) { + [] BSSAP_PROC.getreply(RAN_register_n_connect:{?, ?}) {}; } } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 75b7688..d955f02 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -5819,7 +5819,7 @@ /* Ok, that went well, now the other BSC is handovering back here -- * from now on this here is the new BSS. */ - f_create_bssmap_exp_handoverRequest(193); + f_create_bssmap_exp_n_connect(193); var template BSSMAP_IE_EncryptionInformation encryptionInformation; var template BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm; @@ -5883,7 +5883,7 @@ bss_rtp_ip := "1.2.3.4"; } f_init_handler(pars); - f_create_bssmap_exp_handoverRequest(194); + f_create_bssmap_exp_n_connect(194); var template BSSMAP_IE_EncryptionInformation encryptionInformation; var template BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm; @@ -6218,7 +6218,7 @@ /* inter-MSC handover back to the first MSC */ - f_create_bssmap_exp_handoverRequest(193); + f_create_bssmap_exp_n_connect(193); cil := { cIl_CGI := { ts_BSSMAP_CI_CGI('262'H, '42'H, 23, 42) } }; /* old BSS sends Handover Required, via inter-MSC E link: like -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I941c5db5235785841f3368ef908a409bbb12150e Gerrit-Change-Number: 33999 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Add GCC and BCC service requests to BSC_ConnectionHandler.ttcn

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33978 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Add GCC and BCC service requests to BSC_ConnectionHandler.ttcn ...................................................................... ASCI: Add GCC and BCC service requests to BSC_ConnectionHandler.ttcn Related: OS#4854 Change-Id: Ic4875fde45dfc8d6928a48c0f6edc91d994bfa97 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index d4723e5..170694a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -376,7 +376,9 @@ EST_TYPE_PAG_RESP, EST_TYPE_MO_SMS, EST_TYPE_SS_ACT, - EST_TYPE_MO_CSD + EST_TYPE_MO_CSD, + EST_TYPE_VGCS, + EST_TYPE_VBS }; /* helper function to fully establish a dedicated channel */ @@ -411,6 +413,12 @@ case (EST_TYPE_SS_ACT) { l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_SS_ACT, mi)); } + case (EST_TYPE_VGCS) { + l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_VGCS, mi)); + } + case (EST_TYPE_VBS) { + l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_VBS, mi)); + } } /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic4875fde45dfc8d6928a48c0f6edc91d994bfa97 Gerrit-Change-Number: 33978 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 ) Change subject: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I941c5db5235785841f3368ef908a409bbb12150e Gerrit-Change-Number: 33999 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:48:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Allow incoming VGCS/VBS connections at RAN_Emulation.ttcnpp

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33976 ) Change subject: ASCI: Allow incoming VGCS/VBS connections at RAN_Emulation.ttcnpp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3fc0c5efe7d9f270804e7295aeb65cfe7898bd7e Gerrit-Change-Number: 33976 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:47:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Add templates to send and receive GCC/BCC call control messages

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 ) Change subject: ASCI: Add templates to send and receive GCC/BCC call control messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9ff5587a9fda1ea756891fc39a20cfd05924f628 Gerrit-Change-Number: 33973 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:47:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: ASCI: Add missing transaction ID to SET PARAMETER message

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33966 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Add missing transaction ID to SET PARAMETER message ...................................................................... ASCI: Add missing transaction ID to SET PARAMETER message Change-Id: I1b692cee894826a306885253a53a351f952d52dc Related: OS#4854 --- M src/libmsc/msc_vgcs.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index e713ba5..f3867fe 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -890,7 +890,8 @@ uint8_t pdisc = (trans->type == TRANS_GCC) ? GSM48_PDISC_GROUP_CC : GSM48_PDISC_BCAST_CC; int rc; - rc = gsm44068_tx_set_parameter(trans, pdisc, !trans->gcc.mute_talker, 1, 1, trans->gcc.uplink_originator); + rc = gsm44068_tx_set_parameter(trans, pdisc | (trans->transaction_id << 4), + !trans->gcc.mute_talker, 1, 1, trans->gcc.uplink_originator); if (rc < 0) LOG_GCC(trans, LOGL_ERROR, "Failed to send SET PARAMETER towards MS.\n"); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1b692cee894826a306885253a53a351f952d52dc Gerrit-Change-Number: 33966 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: ASCI: Add debugging and error logging to VGCS/VBS call control

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33965 ) Change subject: ASCI: Add debugging and error logging to VGCS/VBS call control ...................................................................... ASCI: Add debugging and error logging to VGCS/VBS call control Change-Id: I3fbce71e47e9670f58e46e7c2a0f26a1bbc1a46e Related: OS#4854 --- M src/libmsc/msc_vgcs.c 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index f50753b..e713ba5 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -636,6 +636,7 @@ } /* Create BSS list structures. */ + LOG_GCC(trans, LOGL_DEBUG, "Creating BSS list structure with cell list structures.\n"); llist_for_each_entry(b, &gcr->bss_list, list) { LOG_GCC(trans, LOGL_DEBUG, " -> BSS with PC %s.\n", osmo_ss7_pointcode_print(NULL, b->pc)); /* Resolve ran_peer. */ @@ -668,12 +669,14 @@ /* Create ran connection. */ bss->conn = ran_conn_create_outgoing(rp); if (!bss->conn) { + LOG_GCC(trans, LOGL_ERROR, "Failed to create RAN connection.\n"); osmo_fsm_inst_free(bss->fi); continue; } bss->conn->vgcs.bss = bss; /* Create cell list structures. */ llist_for_each_entry(c, &b->cell_list, list) { + LOG_GCC(trans, LOGL_DEBUG, " -> Cell ID %d.\n", c->cell_id); /* Create state machine. */ fi = osmo_fsm_inst_alloc(&vgcs_cell_fsm, net, NULL, LOGL_DEBUG, NULL); if (!fi) { @@ -698,6 +701,7 @@ /* Create ran connection. */ cell->conn = ran_conn_create_outgoing(rp); if (!cell->conn) { + LOG_GCC(trans, LOGL_ERROR, "Failed to create RAN connection.\n"); osmo_fsm_inst_free(cell->fi); continue; } @@ -710,6 +714,7 @@ } /* No cell? */ if (llist_empty(&bss->cell_list)) { + LOG_GCC(trans, LOGL_DEBUG, " -> No Cell in this BSS.\n"); osmo_fsm_inst_free(bss->fi); break; } @@ -721,6 +726,7 @@ /* No BSS? */ if (llist_empty(&trans->gcc.bss_list)) { /* Also destroy MGW, because this list is empty too! */ + LOG_GCC(trans, LOGL_NOTICE, "No BSS found, please check your VTY configuration and add cells.\n"); goto err_mgw; } return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3fbce71e47e9670f58e46e7c2a0f26a1bbc1a46e Gerrit-Change-Number: 33965 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: ASCI: Add debugging and error logging to VGCS/VBS call control

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33965 ) Change subject: ASCI: Add debugging and error logging to VGCS/VBS call control ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3fbce71e47e9670f58e46e7c2a0f26a1bbc1a46e Gerrit-Change-Number: 33965 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:45:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: transceiver: add experimental viterbi equalizer support

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33930 ) Change subject: transceiver: add experimental viterbi equalizer support ...................................................................... Patch Set 14: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d Gerrit-Change-Number: 33930 Gerrit-PatchSet: 14 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:45:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data

by laforge

Attention is currently required from: Hoernchen, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33945 ) Change subject: ms/va: add test tool and data ...................................................................... Patch Set 12: Code-Review+1 (1 comment) Patchset: PS12: source code doesn't appear to contain the suggested comment about what the tool does. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db Gerrit-Change-Number: 33945 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:44:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: restructure the va code to add rach support

by laforge

Attention is currently required from: Hoernchen, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33944 ) Change subject: ms: restructure the va code to add rach support ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 Gerrit-Change-Number: 33944 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:43:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: update osmocom-bb

by laforge

Attention is currently required from: Hoernchen, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33927 ) Change subject: ms: update osmocom-bb ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6f9fca7a4d6a02e82bf406fd136c5bde96bb93af Gerrit-Change-Number: 33927 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:42:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9af8792fe4c44b5dd1aab5a2d4b7d3c2a2366d12 Gerrit-Change-Number: 34004 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:42:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 ) Change subject: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I34b31c292c00b6880311906ce6713a8e3c69a0d2 Gerrit-Change-Number: 34003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:42:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Split f_ms_tx_ul_data_block() into helper functions

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 ) Change subject: pcu: Split f_ms_tx_ul_data_block() into helper functions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81176fa5c7caa2535bcc97eec26833579933ed7a Gerrit-Change-Number: 33995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:41:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Initial selection of packet-access-procedure mode based on or...

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 ) Change subject: rlcmac: Initial selection of packet-access-procedure mode based on originating cause ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I930a1fcf23506f75562a6795f9a6e42b187d2974 Gerrit-Change-Number: 34005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:41:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-gprs[master]: sndcp: Forward QoS params from SM to LLC

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33971 ) Change subject: sndcp: Forward QoS params from SM to LLC ...................................................................... sndcp: Forward QoS params from SM to LLC Change-Id: I70e355ef27d24bdaf00e54f0e7126193f5bbf19f --- M include/osmocom/gprs/sndcp/sndcp_private.h M src/sndcp/Makefile.am M src/sndcp/sndcp.c M src/sndcp/sndcp_prim.c M tests/sndcp/sndcp_prim_test.c 5 files changed, 65 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/sndcp/sndcp_private.h b/include/osmocom/gprs/sndcp/sndcp_private.h index 5630c97..07fbb2b 100644 --- a/include/osmocom/gprs/sndcp/sndcp_private.h +++ b/include/osmocom/gprs/sndcp/sndcp_private.h @@ -151,6 +151,9 @@ /* The NSAPI we shall use on top of LLC */ uint8_t nsapi; + /* Peak Throughput, Reliability Class, from QoS Profile TS 24.008 10.5.6.5 */ + uint8_t peak_throughput; + uint8_t reliability_class; /* Radio Priority (MS only, used by LLC/RLCMAC), TS 24.008 10.5.7.2 */ uint8_t radio_prio; diff --git a/src/sndcp/Makefile.am b/src/sndcp/Makefile.am index ca72ecb..f3ec7b5 100644 --- a/src/sndcp/Makefile.am +++ b/src/sndcp/Makefile.am @@ -37,6 +37,7 @@ $(NULL) libosmo_gprs_sndcp_la_LIBADD = \ + $(top_builddir)/src/common/libosmo-gprs-common.la \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -lm \ diff --git a/src/sndcp/sndcp.c b/src/sndcp/sndcp.c index 7e82b5d..88c4979 100644 --- a/src/sndcp/sndcp.c +++ b/src/sndcp/sndcp.c @@ -229,6 +229,8 @@ llc_prim_tx = osmo_gprs_llc_prim_alloc_ll_unitdata_req(sne->snme->tlli, sne->llc_sapi, data, len); OSMO_ASSERT(llc_prim_tx); + llc_prim_tx->ll.unitdata_req.qos_params.peak_throughput = sne->peak_throughput; + llc_prim_tx->ll.unitdata_req.qos_params.reliability_class = sne->reliability_class; llc_prim_tx->ll.unitdata_req.radio_prio = sne->radio_prio; rc = gprs_sndcp_prim_call_down_cb(llc_prim_tx); return rc; diff --git a/src/sndcp/sndcp_prim.c b/src/sndcp/sndcp_prim.c index 2e2139c..45d6a0f 100644 --- a/src/sndcp/sndcp_prim.c +++ b/src/sndcp/sndcp_prim.c @@ -31,6 +31,8 @@ #include <osmocom/gprs/sndcp/sndcp_prim.h> #include <osmocom/gprs/sndcp/sndcp_private.h> +#include "../common/qos.h" + #define SNDCP_MSGB_HEADROOM 0 const struct value_string osmo_gprs_sndcp_prim_sap_names[] = { @@ -635,6 +637,7 @@ uint8_t nsapi = sndcp_prim->snsm.activate_ind.nsapi; struct gprs_sndcp_mgmt_entity *snme; struct gprs_sndcp_entity *sne; + struct osmo_gprs_sm_qos_profile_decoded decoded; LOGSNDCP(LOGL_INFO, "SNSM-ACTIVATE.ind (TLLI=%08x, SAPI=%u, NSAPI=%u)\n", tlli, sapi, nsapi); @@ -661,6 +664,17 @@ if (g_sndcp_ctx->location != OSMO_GPRS_SNDCP_LOCATION_MS) return 0; + if (gprs_qos_parse_qos_profile(&decoded, + sndcp_prim->snsm.activate_ind.qos_profile, + sndcp_prim->snsm.activate_ind.qos_profile_len) < 0) { + LOGSNE(sne, LOGL_ERROR, "Failed parsing QoS Profile len=%u: %s\n", + sndcp_prim->snsm.activate_ind.qos_profile_len, + osmo_hexdump(sndcp_prim->snsm.activate_ind.qos_profile, + sndcp_prim->snsm.activate_ind.qos_profile_len)); + return -EINVAL; + } + sne->peak_throughput = decoded.qos_profile.data.peak_throughput; + sne->reliability_class = decoded.qos_profile.data.reliability_class; sne->radio_prio = sndcp_prim->snsm.activate_ind.radio_prio; /* TODO: when supporting and using LLC ABM mode, flow should go through diff --git a/tests/sndcp/sndcp_prim_test.c b/tests/sndcp/sndcp_prim_test.c index 9dd1b5e..defaeb7 100644 --- a/tests/sndcp/sndcp_prim_test.c +++ b/tests/sndcp/sndcp_prim_test.c @@ -124,6 +124,39 @@ 0x01, 0x05, 0x00, 0x06, 0x00, 0x07, 0x01, 0x07, 0x00, 0x08, 0x01, 0x08, 0x80, 0x00, 0x04, 0x12, 0x00, 0x40, 0x07 }; + +/* Quality Of Service - Negotiated QoS (taken from PDP Ctx Act msg) + 00.. .... = Spare bit(s): 0 + ..10 0... = Quality of Service Delay class: Delay class 4 (best effort) (4) + .... .011 = Reliability class: Unacknowledged GTP/LLC, Ack RLC, Protected data (3) + 0110 .... = Peak throughput: Up to 32 000 octet/s (6) + .... 0... = Spare bit(s): 0 + .... .010 = Precedence class: Normal priority (2) + 000. .... = Spare bit(s): 0 + ...1 1111 = Mean throughput: Best effort (31) + 011. .... = Traffic class: Interactive class (3) + ...1 0... = Delivery order: Without delivery order ('no') (2) + .... .010 = Delivery of erroneous SDUs: Erroneous SDUs are delivered('yes') (2) + Maximum SDU size: 1520 octets (153) + Maximum bitrate for uplink: 63 kbps (63) + Maximum bitrate for downlink: 63 kbps (63) + 0001 .... = Residual Bit Error Rate (BER): 5*10-2 (1) + .... 0001 = SDU error ratio: 1*10-2 (1) + 0100 00.. = Transfer delay: 200 ms (16) + .... ..11 = Traffic handling priority: Priority level 3 (3) + Guaranteed bitrate for uplink: 0 kbps (255) + Guaranteed bitrate for downlink: 0 kbps (255) + 000. .... = Spare bit(s): 0 + ...0 .... = Signalling indication: Not optimised for signalling traffic + .... 0000 = Source statistics description: unknown (0) + Maximum bitrate for downlink (extended): Use the value indicated by the Maximum bit rate for downlink (0) + Guaranteed bitrate for downlink (extended): Use the value indicated by the Guaranteed bit rate for downlink (0) +*/ +static const uint8_t qos_profile_ie_val[] = { + 0x23, 0x62, 0x1f, 0x72, 0x9, 0x3f, 0x3f, 0x11, + 0x43, 0xff, 0xff, 0x00, 0x00, 0x00 }; + + static void test_sndcp_prim_net(void) { struct osmo_gprs_sndcp_prim *sndcp_prim; @@ -211,6 +244,9 @@ * LL-ESTABLISH.Req in ABM mode if we supported it): */ sndcp_prim = osmo_gprs_sndcp_prim_alloc_snsm_activate_ind(tlli, nsapi, ll_sapi); OSMO_ASSERT(sndcp_prim); + sndcp_prim->snsm.activate_ind.radio_prio = 1; + sndcp_prim->snsm.activate_ind.qos_profile_len = sizeof(qos_profile_ie_val); + memcpy(sndcp_prim->snsm.activate_ind.qos_profile, qos_profile_ie_val, sizeof(qos_profile_ie_val)); rc = osmo_gprs_sndcp_prim_dispatch_snsm(sndcp_prim); OSMO_ASSERT(rc == 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I70e355ef27d24bdaf00e54f0e7126193f5bbf19f Gerrit-Change-Number: 33971 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 ) Change subject: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere ...................................................................... rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere This simplifies the array handling in the LLC queue, and moves param checking to the rx rlcmac_prim path instead of deep in the llc_queue enqueuing code. This commit also fixes the RADIO_PRIORITY field in the Channel Request Description section of PKT DL ACK/NCK, since gprs_rlcmac_llc_queue_highest_radio_prio_pending() now returns the enum normalized 0..3 as expected by the field format (before it was returning 1..4). Change-Id: If2d1946522bc4a1c19d65acb23605f1a3f05ab45 --- M include/osmocom/gprs/rlcmac/gre.h M include/osmocom/gprs/rlcmac/llc_queue.h M src/rlcmac/gre.c M src/rlcmac/llc_queue.c M src/rlcmac/rlcmac_prim.c M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 8 files changed, 78 insertions(+), 40 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/osmocom/gprs/rlcmac/gre.h b/include/osmocom/gprs/rlcmac/gre.h index befcf05..a7317cd 100644 --- a/include/osmocom/gprs/rlcmac/gre.h +++ b/include/osmocom/gprs/rlcmac/gre.h @@ -46,8 +46,10 @@ bool gprs_rlcmac_entity_have_tx_data_queued(const struct gprs_rlcmac_entity *gre); int gprs_rlcmac_entity_start_ul_tbf_pkt_acc_proc_if_needed(struct gprs_rlcmac_entity *gre); -int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, uint8_t *ll_pdu, unsigned int ll_pdu_len, - enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio); +int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, + const uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, + enum gprs_rlcmac_radio_priority radio_prio); struct msgb *gprs_rlcmac_gre_create_pkt_ctrl_ack(const struct gprs_rlcmac_entity *gre); diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h index 331f33b..7149f76 100644 --- a/include/osmocom/gprs/rlcmac/llc_queue.h +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -9,17 +9,14 @@ #include <osmocom/gprs/rlcmac/codel.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> -#include <osmocom/gprs/rlcmac/types.h> +#include <osmocom/gprs/rlcmac/types_private.h> #include <osmocom/gprs/rlcmac/rlcmac.h> struct gprs_rlcmac_entity; /* Highet/Lowest radio priority (biggest number) as per 3GPP TS 24.008 version 16.7.0 Release 16 section 10.5.7.2: * "All other values are interpreted as priority level 4 by this version of the protocol." */ -#define _GPRS_RLCMAC_RADIO_PRIO_HIGHEST 1 -#define _GPRS_RLCMAC_RADIO_PRIO_LOWEST 4 -/* Normalize 0..N-1 (to be used in arrays): */ -#define RADIO_PRIO_NORM(radio_prio) ((radio_prio) - _GPRS_RLCMAC_RADIO_PRIO_HIGHEST) +#define _GPRS_RLCMAC_RADIO_NUM_PRIO 4 enum gprs_rlcmac_llc_queue_sapi_prio { /* lowest value has highest prio */ GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_GMM = 0, /* SAPI 1 */ @@ -29,7 +26,7 @@ }; struct gprs_llc_prio_queue { - uint8_t radio_prio; /* Radio prio of this queue, range (1..4) */ + enum gprs_rlcmac_radio_priority radio_prio; /* Radio prio of this queue, range (1..4) */ struct gprs_codel codel_state; struct llist_head queue; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ }; @@ -40,7 +37,7 @@ size_t queue_size; size_t queue_octets; bool use_codel; - struct gprs_llc_prio_queue pq[RADIO_PRIO_NORM(_GPRS_RLCMAC_RADIO_PRIO_LOWEST) + 1][_GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_SIZE]; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ + struct gprs_llc_prio_queue pq[_GPRS_RLCMAC_RADIO_NUM_PRIO][_GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_SIZE]; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ }; struct gprs_rlcmac_llc_queue *gprs_rlcmac_llc_queue_alloc(struct gprs_rlcmac_entity *gre); @@ -49,10 +46,10 @@ void gprs_rlcmac_llc_queue_set_codel_params(struct gprs_rlcmac_llc_queue *q, bool use, unsigned int interval_msec); -int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, uint8_t *ll_pdu, unsigned int ll_pdu_len, - enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio); +int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, const uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, enum gprs_rlcmac_radio_priority radio_prio); struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q, bool can_discard); -uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q); +enum gprs_rlcmac_radio_priority gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q); void gprs_rlcmac_llc_queue_merge_prepend(struct gprs_rlcmac_llc_queue *q, struct gprs_rlcmac_llc_queue *old_q); diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index 500feed..59cf0f5 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -216,17 +216,19 @@ return gprs_rlcmac_tbf_ul_ass_start(gre->ul_tbf, GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE); } -int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, uint8_t *ll_pdu, unsigned int ll_pdu_len, - enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio) +int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, + const uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, + enum gprs_rlcmac_radio_priority radio_prio) { int rc; LOGGRE(gre, LOGL_DEBUG, "Enqueueing LLC-PDU len=%u SAPI=%s radio_prio=%u\n", - ll_pdu_len, get_value_string(osmo_gprs_rlcmac_llc_sapi_names, sapi), radio_prio); + ll_pdu_len, get_value_string(osmo_gprs_rlcmac_llc_sapi_names, sapi), radio_prio + 1); rc = gprs_rlcmac_llc_queue_enqueue(gre->llc_queue, ll_pdu, ll_pdu_len, sapi, radio_prio); if (rc < 0) { LOGGRE(gre, LOGL_NOTICE, "Enqueueing LLC-PDU len=%u SAPI=%s radio_prio=%u failed!\n", - ll_pdu_len, get_value_string(osmo_gprs_rlcmac_llc_sapi_names, sapi), radio_prio); + ll_pdu_len, get_value_string(osmo_gprs_rlcmac_llc_sapi_names, sapi), radio_prio + 1); return rc; } diff --git a/src/rlcmac/llc_queue.c b/src/rlcmac/llc_queue.c index 066df47..83c926e 100644 --- a/src/rlcmac/llc_queue.c +++ b/src/rlcmac/llc_queue.c @@ -46,7 +46,7 @@ q->avg_queue_delay = 0; for (i = 0; i < ARRAY_SIZE(q->pq); i++) { for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { - q->pq[i][j].radio_prio = i + 1; /* range (1..4) */ + q->pq[i][j].radio_prio = i; /* enum gprs_rlcmac_radio_priority, range (0..3) */ INIT_LLIST_HEAD(&q->pq[i][j].queue); gprs_codel_init(&q->pq[i][j].codel_state); } @@ -89,19 +89,13 @@ } } -int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, uint8_t *ll_pdu, unsigned int ll_pdu_len, - enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio) +int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, const uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, enum gprs_rlcmac_radio_priority radio_prio) { struct llc_queue_entry_hdr *ehdr; enum gprs_rlcmac_llc_queue_sapi_prio sapi_prio; struct msgb *msg; - /* Trim to expected values 1..4, (3GPP TS 24.008) 10.5.7.2 */ - if (radio_prio < _GPRS_RLCMAC_RADIO_PRIO_HIGHEST) - radio_prio = _GPRS_RLCMAC_RADIO_PRIO_HIGHEST; - else if (radio_prio > _GPRS_RLCMAC_RADIO_PRIO_LOWEST) - radio_prio = _GPRS_RLCMAC_RADIO_PRIO_LOWEST; - sapi_prio = gprs_rlcmac_llc_sapi2prio(sapi); msg = msgb_alloc_headroom(sizeof(*ehdr) + ll_pdu_len, 0, "llc_queue_msg"); @@ -117,7 +111,7 @@ msg->l2h = NULL; } - msgb_enqueue(&q->pq[RADIO_PRIO_NORM(radio_prio)][sapi_prio].queue, msg); + msgb_enqueue(&q->pq[radio_prio][sapi_prio].queue, msg); q->queue_size += 1; q->queue_octets += ll_pdu_len; @@ -221,7 +215,7 @@ return msg; } -uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q) +enum gprs_rlcmac_radio_priority gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q) { struct gprs_llc_prio_queue *prioq = gprs_rlcmac_llc_queue_find_msg(q); OSMO_ASSERT(prioq); diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index d3df15f..f13ac3d 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -375,6 +375,7 @@ static int rlcmac_prim_handle_grr_unitdata_req(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { struct gprs_rlcmac_entity *gre; + enum gprs_rlcmac_radio_priority radio_prio; int rc; gre = gprs_rlcmac_find_entity_by_tlli(rlcmac_prim->grr.tlli); @@ -385,11 +386,24 @@ } OSMO_ASSERT(gre); + /* Expected values are integers 1..4, trim to known expected radio priorities (3GPP TS 24.008) 10.5.7.2 */ + if (OSMO_UNLIKELY(rlcmac_prim->grr.unitdata_req.radio_prio < 1)) { + LOGGRE(gre, LOGL_NOTICE, "Rx UNITDATA.req with unexpected radio_prio=%u not in range (1..4)\n", + rlcmac_prim->grr.unitdata_req.radio_prio); + radio_prio = GPRS_RLCMAC_RADIO_PRIORITY_1; + } else if (OSMO_UNLIKELY(rlcmac_prim->grr.unitdata_req.radio_prio > 4)) { + LOGGRE(gre, LOGL_NOTICE, "Rx UNITDATA.req with unexpected radio_prio=%u not in range (1..4)\n", + rlcmac_prim->grr.unitdata_req.radio_prio); + radio_prio = GPRS_RLCMAC_RADIO_PRIORITY_4; + } else { + radio_prio = (enum gprs_rlcmac_radio_priority)(rlcmac_prim->grr.unitdata_req.radio_prio - 1); + } + rc = gprs_rlcmac_entity_llc_enqueue(gre, rlcmac_prim->grr.ll_pdu, rlcmac_prim->grr.ll_pdu_len, rlcmac_prim->grr.unitdata_req.sapi, - rlcmac_prim->grr.unitdata_req.radio_prio); + radio_prio); msgb_free(rlcmac_prim->oph.msg); return rc; } diff --git a/tests/rlcmac/rlcmac_prim_test.c b/tests/rlcmac/rlcmac_prim_test.c index 10f148a..410b266 100644 --- a/tests/rlcmac/rlcmac_prim_test.c +++ b/tests/rlcmac/rlcmac_prim_test.c @@ -599,6 +599,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); OSMO_ASSERT(sizeof(ccch_imm_ass_pkt_ul_tbf_normal) == GSM_MACBLOCK_LEN); @@ -662,6 +663,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, 14); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); OSMO_ASSERT(sizeof(ccch_imm_ass_pkt_ul_tbf_normal) == GSM_MACBLOCK_LEN); @@ -696,6 +698,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, 14); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); /* Trigger transmission of PKT RES REQ: */ @@ -721,6 +724,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); OSMO_ASSERT(sizeof(ccch_imm_ass_pkt_ul_tbf_normal) == GSM_MACBLOCK_LEN); @@ -757,6 +761,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); for (i = 0; i < 4; i++) { @@ -806,6 +811,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); OSMO_ASSERT(rc == 0); } @@ -853,6 +859,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); ccch_imm_ass_pkt_ul_tbf_normal[7] = last_rach_req_ra; /* Update RA to match */ @@ -910,6 +917,7 @@ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); ccch_imm_ass_pkt_ul_tbf_normal[7] = last_rach_req_ra; /* Update RA to match */ @@ -980,6 +988,7 @@ memset(msgb_data(llc_msg), 0xab, msgb_length(llc_msg)); rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, msgb_data(llc_msg), msgb_length(llc_msg)); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP3; + rlcmac_prim->grr.unitdata_req.radio_prio = 2; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); ccch_imm_ass_pkt_ul_tbf_normal[7] = last_rach_req_ra; /* Update RA to match */ @@ -1111,6 +1120,7 @@ /* Submit 14 bytes to fit in 1 RLCMAC block to shorten test and end up in FINISHED state quickly: */ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, 14); rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rlcmac_prim->grr.unitdata_req.radio_prio = 1; rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); OSMO_ASSERT(rc == 0); diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index 6b84f2c..913c9da 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -1,7 +1,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=1 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -76,7 +76,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=1 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -181,7 +181,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=1 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -335,7 +335,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=1 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -345,7 +345,7 @@ DLGLOBAL DEBUG Tx to lower layers: L1CTL-RACH.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=1 DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_ESTABLISH.request DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: Received Event RX_CCCH_IMM_ASS @@ -511,7 +511,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=1 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -579,7 +579,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=33 SAPI=GMM radio_prio=1 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -693,7 +693,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=200 SAPI=SNDCP3 radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=200 SAPI=SNDCP3 radio_prio=2 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -803,7 +803,7 @@ DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=14 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=14 SAPI=GMM radio_prio=1 DLGLOBAL INFO UL_TBF{NEW}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START @@ -854,7 +854,7 @@ DLGLOBAL INFO UL_TBF{FINISHED}: state_chg to RELEASING DLGLOBAL DEBUG Register POLL (TS=7 FN=17, reason=UL_ACK) DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request -DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=14 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00002342) Enqueueing LLC-PDU len=14 SAPI=GMM radio_prio=1 DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG (ts=7,fn=17,usf=0) Tx Pkt Resource Request (UL ACK/NACK poll) DLGLOBAL INFO UL_TBF{NEW}: Allocated @@ -947,7 +947,7 @@ DLGLOBAL INFO DL_TBF{FLOW}: state_chg to FINISHED DLGLOBAL DEBUG Register POLL (TS=7 FN=21, reason=DL_ACK) DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request -DLGLOBAL DEBUG GRE(00000001) Enqueueing LLC-PDU len=14 SAPI=GMM radio_prio=0 +DLGLOBAL DEBUG GRE(00000001) Enqueueing LLC-PDU len=14 SAPI=GMM radio_prio=1 DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG (ts=7,fn=21,usf=0) Tx DL ACK/NACK FinalAck=1 DLGLOBAL DEBUG TBF(DL:NR-0:TLLI-00000001) - SSN 1, V(N): "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIR" R=Received I=Invalid, FINAL_ACK=1 diff --git a/tests/rlcmac/rlcmac_prim_test.ok b/tests/rlcmac/rlcmac_prim_test.ok index daea0f2..d601794 100644 --- a/tests/rlcmac/rlcmac_prim_test.ok +++ b/tests/rlcmac/rlcmac_prim_test.ok @@ -201,7 +201,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_DL_TBF.request dl_tbf_nr=0 dl_slotmask=0x80 dl_tfi=0 test_rlcmac_prim_up_cb(): Rx GRR-UNITDATA.indication TLLI=0x00000001 ll=[43 c0 01 2b 2b 2b ] -test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=21 ts=7 data_len=23 data=[40 08 10 20 00 00 00 00 00 00 00 30 40 00 00 00 00 03 2b 2b 2b 2b 2b ] +test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=21 ts=7 data_len=23 data=[40 08 10 20 00 00 00 00 00 00 00 30 00 00 00 00 00 03 2b 2b 2b 2b 2b ] test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0xc0 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=43 ts=7 data_len=23 data=[40 04 00 00 00 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b ] test_rlcmac_prim_up_cb(): Rx GMMRR-LLC_TRANSMITTED.indication TLLI=0x00000001 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If2d1946522bc4a1c19d65acb23605f1a3f05ab45 Gerrit-Change-Number: 33981 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-gprs[master]: sm: Introduce APIs to enc/dec QoS Profile

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33970 ) Change subject: sm: Introduce APIs to enc/dec QoS Profile ...................................................................... sm: Introduce APIs to enc/dec QoS Profile Ported from open5gs.git/lib/gtp/v1/types.{c,h} 5764f7267d16a8ea6aeedc6c227552575915def5, for which I was the author too. The ARP extra byte field at the start of the IE val which is introduced in the GTP variant is dropped when porting to SM, since it's not present there (and offsets/sizes are adjusted). The QoS code is moved is moved into a common/ directory where a new libosmo-gprs-common.la private static library is created. This is done in order to be able to resuse the QoS dec/enc code in several libraries since it's actually planned to use it in SNDCP and SM layers. The most natural place to add the APIs is SM, and that's where the public API to accees the enc/dec is provided, since the user app will have to use them in the SM SAP. However, the SNDCP will also have to decode the QoS recived by SM through the SNSM SAP, and we don't really want libosmo-gprs-sndcp depend on libosmo-gprs-sm. This way libosmo-gprs-sndcp will be able to use the private APIs directly in a follow-up commit. Change-Id: I6c0676e55bb1f0f424f41d8d04d4f5e5bf376f4f --- M configure.ac M include/osmocom/gprs/sm/Makefile.am M include/osmocom/gprs/sm/sm.h A include/osmocom/gprs/sm/sm_qos.h M src/Makefile.am A src/common/Makefile.am A src/common/qos.c A src/common/qos.h M src/sm/Makefile.am A src/sm/sm_qos.c 10 files changed, 503 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 52b9d14..91fb36a 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,7 @@ include/osmocom/gprs/sndcp/Makefile include/osmocom/gprs/sm/Makefile src/Makefile + src/common/Makefile src/csn1/Makefile src/gmm/Makefile src/llc/Makefile diff --git a/include/osmocom/gprs/sm/Makefile.am b/include/osmocom/gprs/sm/Makefile.am index 46a30cb..f6bede4 100644 --- a/include/osmocom/gprs/sm/Makefile.am +++ b/include/osmocom/gprs/sm/Makefile.am @@ -8,6 +8,7 @@ sm_HEADERS = \ sm.h \ sm_prim.h \ + sm_qos.h \ $(NULL) smdir = $(includedir)/osmocom/gprs/sm diff --git a/include/osmocom/gprs/sm/sm.h b/include/osmocom/gprs/sm/sm.h index 37f86bc..089faa1 100644 --- a/include/osmocom/gprs/sm/sm.h +++ b/include/osmocom/gprs/sm/sm.h @@ -5,6 +5,8 @@ #include <stdint.h> #include <stddef.h> +#include <osmocom/gprs/sm/sm_qos.h> + /* 3GPP TS 24.008 10.5.6.1 */ #define OSMO_GPRS_SM_APN_MAXLEN 100 @@ -14,9 +16,6 @@ /* 3GPP TS 24.008 10.5.6.3 Protocol configuration options */ #define OSMO_GPRS_SM_PCO_MAXLEN 253 -/* 3GPP TS 24.008 10.5.6.5 Quality of service */ -#define OSMO_GPRS_SM_QOS_MAXLEN 22 - /* 3GPP TS 24.008 10.5.6.21 NBIFOM container (T=1,L=1,V=255 => 257) */ #define OSMO_GPRS_SM_MBIFORM_MAXLEN 255 diff --git a/include/osmocom/gprs/sm/sm_qos.h b/include/osmocom/gprs/sm/sm_qos.h new file mode 100644 index 0000000..a1ffe63 --- /dev/null +++ b/include/osmocom/gprs/sm/sm_qos.h @@ -0,0 +1,96 @@ +/* GPRS QoS definitions from 3GPP TS 24.008 sec 10.5.6.5 */ +#pragma once + +#include <stdint.h> +#include <stddef.h> +#include <stdbool.h> +#include <osmocom/core/endian.h> + +/* 3GPP TS 24.008 10.5.6.5 Quality of service */ +#define OSMO_GPRS_SM_QOS_MAXLEN 22 + +/* TS 24.008 10.5.6.5 Quality of service */ +struct osmo_gprs_sm_qos_profile_data_extended_bit_rate { + uint8_t max_bit_rate_uplink; + uint8_t guaranteed_bit_rate_uplink; + uint8_t max_bit_rate_downlink; + uint8_t guaranteed_bit_rate_downlink; +} __attribute__ ((packed)); + +struct osmo_gprs_sm_qos_profile_data { +#if OSMO_IS_LITTLE_ENDIAN + uint8_t reliability_class:3, + delay_class:2, + spare1:3; + uint8_t precedence_class:3, + spare2:1, + peak_throughput:4; + uint8_t mean_throughput:5, + spare3:3; + uint8_t delivery_erroneous_sdu:3, + delivery_order:2, + traffic_class:3; + uint8_t max_sdu_size; + uint8_t max_bit_rate_uplink; + uint8_t max_bit_rate_downlink; + uint8_t sdu_error_ratio:4, + residual_ber:4; + uint8_t traffic_handling_priority:2, + transfer_delay:6; + uint8_t guaranteed_bit_rate_uplink; + uint8_t guaranteed_bit_rate_downlink; + uint8_t source_statistics_descriptor:4, + signalling_indication:1, + spare4:3; + struct osmo_gprs_sm_qos_profile_data_extended_bit_rate extended; + struct osmo_gprs_sm_qos_profile_data_extended_bit_rate extended2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */ + uint8_t spare1:3, delay_class:2, reliability_class:3; + uint8_t peak_throughput:4, spare2:1, precedence_class:3; + uint8_t spare3:3, mean_throughput:5; + uint8_t traffic_class:3, delivery_order:2, delivery_erroneous_sdu:3; + uint8_t max_sdu_size; + uint8_t max_bit_rate_uplink; + uint8_t max_bit_rate_downlink; + uint8_t residual_ber:4, sdu_error_ratio:4; + uint8_t transfer_delay:6, traffic_handling_priority:2; + uint8_t guaranteed_bit_rate_uplink; + uint8_t guaranteed_bit_rate_downlink; + uint8_t spare4:3, signalling_indication:1, source_statistics_descriptor:4; + struct osmo_gprs_sm_qos_profile_data_extended_bit_rate extended; + struct osmo_gprs_sm_qos_profile_data_extended_bit_rate extended2; +#endif +} __attribute__ ((packed)); + +struct osmo_gprs_sm_qos_profile { + struct osmo_gprs_sm_qos_profile_data data; +} __attribute__ ((packed)); +struct osmo_gprs_sm_qos_profile_decoded { + struct osmo_gprs_sm_qos_profile qos_profile; + /* Filled in by the decoder function: */ + bool data_octet6_to_13_present; /* from traffic_class to guaranteed_bit_rate_downlink */ + bool data_octet14_present; /* byte containing signalling_indication */ + bool bit_rate_downlink_extended_present; + bool bit_rate_uplink_extended_present; + bool bit_rate_downlink_extended2_present; + bool bit_rate_uplink_extended2_present; + uint16_t dec_transfer_delay; + uint32_t dec_mbr_kbps_dl; /* decoded MBR in kbps */ + uint32_t dec_mbr_kbps_ul; /* decoded MBR in kbps */ + uint32_t dec_gbr_kbps_dl; /* decoded GBR in kbps */ + uint32_t dec_gbr_kbps_ul; /* decoded GBR in kbps */ +} __attribute__ ((packed)); + +#define OSMO_GPRS_SM_QOS_TRAFFIC_CLASS_SUBSCRIBED 0 +#define OSMO_GPRS_SM_QOS_TRAFFIC_CLASS_CONVERSATIONAL 1 +#define OSMO_GPRS_SM_QOS_TRAFFIC_CLASS_STREAMING 2 +#define OSMO_GPRS_SM_QOS_TRAFFIC_CLASS_INTERACTIVE 3 +#define OSMO_GPRS_SM_QOS_TRAFFIC_CLASS_BACKGROUND 4 + +#define OSMO_GPRS_SM_QOS_SRC_STATS_DESC_UNKNOWN 0 +#define OSMO_GPRS_SM_QOS_SRC_STATS_DESC_SPEECH 1 + +int16_t osmo_gprs_sm_qos_parse_qos_profile( + struct osmo_gprs_sm_qos_profile_decoded *decoded, const uint8_t *data, size_t data_len); +int16_t osmo_gprs_sm_qos_build_qos_profile(const struct osmo_gprs_sm_qos_profile_decoded *decoded, void *data, int data_len); diff --git a/src/Makefile.am b/src/Makefile.am index 69ce5a0..90d901f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ + common \ csn1 \ llc \ rlcmac \ diff --git a/src/common/Makefile.am b/src/common/Makefile.am new file mode 100644 index 0000000..ae7c2bd --- /dev/null +++ b/src/common/Makefile.am @@ -0,0 +1,22 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOCORE_CFLAGS) \ + $(NULL) + +noinst_LTLIBRARIES = \ + libosmo-gprs-common.la \ + $(NULL) + +libosmo_gprs_common_la_SOURCES = \ + qos.c \ + $(NULL) + +noinst_HEADERS = \ + qos.h \ + $(NULL) diff --git a/src/common/qos.c b/src/common/qos.c new file mode 100644 index 0000000..3de532f --- /dev/null +++ b/src/common/qos.c @@ -0,0 +1,303 @@ +/* GPRS QoS definitions from 3GPP TS 24.008 sec 10.5.6.5 */ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include "qos.h" + +#define GPRS_QOS_FALLTHROUGH __attribute__ ((fallthrough)) + +static uint32_t dec_mbr_kbps(uint8_t mbr_byte, const uint8_t *extended_mbr_byte, const uint8_t *extended2_mbr_byte) +{ + uint8_t mbr, embr1, embr2; + mbr = mbr_byte; + embr1 = extended_mbr_byte ? *extended_mbr_byte : 0; + embr2 = extended2_mbr_byte ? *extended2_mbr_byte : 0; + + if (mbr == 0) + return 0; + if (mbr == 0xff) + return UINT32_MAX; + if (mbr == 0xfe) { /* Check extended field */ + if (extended_mbr_byte == NULL || embr1 == 0) + return 8640; + if (embr1 == 0xfa) { /* Check extended2 field */ + if (extended2_mbr_byte == NULL || embr2 == 0) + return 256 * 1000; + if (embr2 == 0xf6) + return 10 * 1000 * 1000; /* TODO: check "extended quality of service" IE */ + if (embr2 >= 0xa2 && embr2 <= 0xf6) + return (1500 + (embr2 - (0xa2 - 1)) * 100) * 1000; + if (embr2 >= 0x3e && embr2 <= 0xa1) + return (500 + (embr2 - (0x3e - 1)) * 10) * 1000; + return (256 + embr2 * 4) * 1000; + } + if (embr1 >= 0xbb && embr1 <= 0xfa) + return (128 + (embr1 - (0xbb - 1)) * 2) * 1000; + if (embr1 >= 0x4b && embr1 <= 0xba) + return (16 + (embr1 - (0x4b - 1)) * 1) * 1000; + return 8600 + embr1 * 100; + } + if (mbr & 0x80) { + mbr &= ~0x80; + return 576 + mbr_byte * 64; + } + if (mbr & 0x40) { + mbr &= ~0x40; + return 64 + mbr * 8; + } + return mbr; +} + +static uint16_t dec_transfer_delay_ms(uint8_t transfer_delay_byte) +{ + transfer_delay_byte &= 0x3f; /* 6 bits */ + if (transfer_delay_byte <= 0x0f) + return transfer_delay_byte; + if (transfer_delay_byte <= 0x1f) + return 200 + (transfer_delay_byte - 0x10) * 50; + return 1000 + (transfer_delay_byte - 0x20) * 100; +} + +/* TS 29.060 7.7.34 Quality of Service (QoS) Profile */ +/* TS 24.008 10.5.6.5 Quality of service */ +int16_t gprs_qos_parse_qos_profile( + struct osmo_gprs_sm_qos_profile_decoded *decoded, const uint8_t *data, size_t data_len) +{ + struct osmo_gprs_sm_qos_profile *source = (struct osmo_gprs_sm_qos_profile *)data; + + OSMO_ASSERT(decoded); + OSMO_ASSERT(data); + + memset(decoded, 0, sizeof(struct osmo_gprs_sm_qos_profile_decoded)); + switch (data_len) { + case 20: /* octet 3 + octet 3-22 */ + decoded->bit_rate_uplink_extended2_present = true; + GPRS_QOS_FALLTHROUGH; + case 18: /* octet 3 + octet 3-20 */ + decoded->bit_rate_downlink_extended2_present = true; + GPRS_QOS_FALLTHROUGH; + case 16: /* octet 3 + octet 3-18 */ + decoded->bit_rate_uplink_extended_present = true; + GPRS_QOS_FALLTHROUGH; + case 14: /* octet 3 + octet 3-16 */ + decoded->bit_rate_downlink_extended_present = true; + GPRS_QOS_FALLTHROUGH; + case 12: /* octet 3-14 */ + decoded->data_octet14_present = true; + GPRS_QOS_FALLTHROUGH; + case 11: /* octet 3-13 */ + decoded->data_octet6_to_13_present = true; + GPRS_QOS_FALLTHROUGH; + case 3: /* octet 3 + octet 4 + octet 5 */ + break; + default: + LOGP(DLGLOBAL, LOGL_ERROR, "Qos Profile wrong length %zu\n", data_len); + return -1; + } + memcpy(&decoded->qos_profile, source, data_len); + + /* Calculate resulting MBRs in kbps: */ + if (decoded->data_octet6_to_13_present) { + decoded->dec_transfer_delay = dec_transfer_delay_ms(source->data.transfer_delay); + decoded->dec_mbr_kbps_dl = dec_mbr_kbps(source->data.max_bit_rate_downlink, + decoded->bit_rate_downlink_extended_present ? + &source->data.extended.max_bit_rate_downlink : NULL, + decoded->bit_rate_downlink_extended2_present ? + &source->data.extended2.max_bit_rate_downlink : NULL); + decoded->dec_mbr_kbps_ul = dec_mbr_kbps(source->data.max_bit_rate_uplink, + decoded->bit_rate_uplink_extended_present ? + &source->data.extended.max_bit_rate_uplink : NULL, + decoded->bit_rate_uplink_extended2_present ? + &source->data.extended2.max_bit_rate_uplink : NULL); + /* GBR is encoded the same way as MBR: */ + decoded->dec_gbr_kbps_dl = dec_mbr_kbps(source->data.guaranteed_bit_rate_downlink, + decoded->bit_rate_downlink_extended_present ? + &source->data.extended.guaranteed_bit_rate_downlink : NULL, + decoded->bit_rate_downlink_extended2_present ? + &source->data.extended2.guaranteed_bit_rate_downlink : NULL); + decoded->dec_gbr_kbps_ul = dec_mbr_kbps(source->data.guaranteed_bit_rate_uplink, + decoded->bit_rate_uplink_extended_present ? + &source->data.extended.guaranteed_bit_rate_uplink : NULL, + decoded->bit_rate_uplink_extended2_present ? + &source->data.extended2.guaranteed_bit_rate_uplink : NULL); + } + + return data_len; +} + +static uint8_t enc_transfer_delay_ms(uint16_t transfer_delay_ms) +{ + if (transfer_delay_ms >= 4000) + return 0x3e; + if (transfer_delay_ms >= 1000) { + transfer_delay_ms -= 1000; + return 0x20 + (transfer_delay_ms / 100); + } + if (transfer_delay_ms >= 200) { + transfer_delay_ms -= 200; + return 0x10 + (transfer_delay_ms / 50); + } + if (transfer_delay_ms > 150) + transfer_delay_ms = 150; + if (transfer_delay_ms >= 10) + return transfer_delay_ms / 10; + return 1; /* 0 is "Reserved" Network->MS */ +} + +#define CHECK_EXT1 0xfe +#define CHECK_EXT2 0xfa +static uint32_t enc_mbr_kbps(uint32_t mbr_kbps, uint8_t *mbr_byte, uint8_t *extended_mbr_byte, uint8_t *extended2_mbr_byte) +{ + /* up to EXT2 byte: */ + if (mbr_kbps > 10*1000*1000) { + *extended2_mbr_byte = 0xf6; /* TODO: need to set the real value somewhere else */ + goto ret_check_ext2; + } + if (mbr_kbps >= 1600*1000) { + mbr_kbps -= 1500*1000; + *extended2_mbr_byte = 0xa1 + mbr_kbps/(100*1000); + goto ret_check_ext2; + } + if (mbr_kbps >= 510*1000) { + mbr_kbps -= 500*1000; + *extended2_mbr_byte = 0x2d + mbr_kbps/(10*1000); + goto ret_check_ext2; + } + if (mbr_kbps >= 260*1000) { + mbr_kbps -= 256*1000; + *extended2_mbr_byte = 0x00 + mbr_kbps/(4*1000); + goto ret_check_ext2; + } + + /* up to EXT1 byte: */ + if (mbr_kbps >= 130*1000) { + mbr_kbps -= 128*1000; + *extended_mbr_byte = 0xba + mbr_kbps/(2*1000); + goto ret_check_ext1; + } + if (mbr_kbps >= 17*1000) { + mbr_kbps -= 16*1000; + *extended_mbr_byte = 0x4a + mbr_kbps/(1*1000); + goto ret_check_ext1; + } + if (mbr_kbps >= 8700) { + mbr_kbps -= 8600; + *extended_mbr_byte = 0x00 + mbr_kbps/(100); + goto ret_check_ext1; + } + + /* Only MBR byte: */ + if (mbr_kbps >= 576) { + mbr_kbps -= 576; + *mbr_byte = 0x80 + mbr_kbps/(64); + goto ret_mbr; + } + if (mbr_kbps >= 64) { + mbr_kbps -= 64; + *mbr_byte = 0x40 + mbr_kbps/(8); + goto ret_mbr; + } + if (mbr_kbps > 0) { + *mbr_byte = mbr_kbps; + goto ret_mbr; + } + /* if (mbr_kpbs == 0) */ + *mbr_byte = 0xff; + goto ret_mbr; + +ret_check_ext2: + *extended_mbr_byte = CHECK_EXT2; + *mbr_byte = CHECK_EXT1; + return 2; +ret_check_ext1: + *extended2_mbr_byte = 0; + *mbr_byte = CHECK_EXT1; + return 1; +ret_mbr: + *extended2_mbr_byte = 0; + *extended_mbr_byte = 0; + return 0; +} + +int16_t gprs_qos_build_qos_profile(const struct osmo_gprs_sm_qos_profile_decoded *decoded, void *data, int data_len) +{ + struct osmo_gprs_sm_qos_profile *target; + int mbr_extended_dl, mbr_extended_ul; + int gbr_extended_dl, gbr_extended_ul; + int extended_dl, extended_ul; + unsigned int enc_len = 0; + + OSMO_ASSERT(decoded); + OSMO_ASSERT(data); + OSMO_ASSERT((size_t)data_len >= sizeof(struct osmo_gprs_sm_qos_profile)); + + target = (struct osmo_gprs_sm_qos_profile *)data; + + /* First, copy the encoded buffer as it is: */ + memcpy(target, &decoded->qos_profile, sizeof(struct osmo_gprs_sm_qos_profile)); + + /* Avoid setting Traffic Handling to 0=Reserved even if ignored based on + * Interactive/Background Traffic Class: */ + if (target->data.traffic_handling_priority == 0) + target->data.traffic_handling_priority = 1; + + /* Then, encode in the target position the decoded-provided fields: */ + if (decoded->data_octet6_to_13_present) + target->data.transfer_delay = enc_transfer_delay_ms(decoded->dec_transfer_delay); + + mbr_extended_dl = enc_mbr_kbps(decoded->dec_mbr_kbps_dl, + &target->data.max_bit_rate_downlink, + &target->data.extended.max_bit_rate_downlink, + &target->data.extended2.max_bit_rate_downlink); + mbr_extended_ul = enc_mbr_kbps(decoded->dec_mbr_kbps_ul, + &target->data.max_bit_rate_uplink, + &target->data.extended.max_bit_rate_uplink, + &target->data.extended2.max_bit_rate_uplink); + /* GBR is encoded the same way as MBR: */ + gbr_extended_dl = enc_mbr_kbps(decoded->dec_gbr_kbps_dl, + &target->data.guaranteed_bit_rate_downlink, + &target->data.extended.guaranteed_bit_rate_downlink, + &target->data.extended2.guaranteed_bit_rate_downlink); + gbr_extended_ul = enc_mbr_kbps(decoded->dec_gbr_kbps_ul, + &target->data.guaranteed_bit_rate_uplink, + &target->data.extended.guaranteed_bit_rate_uplink, + &target->data.extended2.guaranteed_bit_rate_uplink); + extended_dl = OSMO_MAX(mbr_extended_dl, gbr_extended_dl); + extended_ul = OSMO_MAX(mbr_extended_ul, gbr_extended_ul); + + /* Finally, set len based on the required octets to encode the fields: */ + if (extended_ul == 2) + enc_len = 20; + else if (extended_dl == 2) + enc_len = 18; + else if (extended_ul == 1) + enc_len = 16; + else if (extended_dl == 1) + enc_len = 14; + else if (decoded->data_octet14_present) + enc_len = 12; + else if (decoded->data_octet6_to_13_present) + enc_len = 11; + else + enc_len = 5; + return enc_len; +} diff --git a/src/common/qos.h b/src/common/qos.h new file mode 100644 index 0000000..3ddbacc --- /dev/null +++ b/src/common/qos.h @@ -0,0 +1,12 @@ +/* GPRS QoS definitions from 3GPP TS 24.008 sec 10.5.6.5 */ +#pragma once + +#include <stdint.h> +#include <stddef.h> +#include <stdbool.h> + +#include <osmocom/gprs/sm/sm_qos.h> + +int16_t gprs_qos_parse_qos_profile( + struct osmo_gprs_sm_qos_profile_decoded *decoded, const uint8_t *data, size_t data_len); +int16_t gprs_qos_build_qos_profile(const struct osmo_gprs_sm_qos_profile_decoded *decoded, void *data, int data_len); diff --git a/src/sm/Makefile.am b/src/sm/Makefile.am index ecd8ba3..83b19de 100644 --- a/src/sm/Makefile.am +++ b/src/sm/Makefile.am @@ -23,6 +23,7 @@ sm_ms_fsm.c \ sm_pdu.c \ sm_prim.c \ + sm_qos.c \ misc.c \ $(NULL) @@ -35,7 +36,8 @@ libosmo_gprs_sm_la_LIBADD = \ $(top_builddir)/src/gmm/libosmo-gprs-gmm.la \ $(top_builddir)/src/sndcp/libosmo-gprs-sndcp.la \ - $(LIBOSMOCORE_LIBS) \ + $(top_builddir)/src/common/libosmo-gprs-common.la \ $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOCORE_LIBS) \ -lm \ $(NULL) diff --git a/src/sm/sm_qos.c b/src/sm/sm_qos.c new file mode 100644 index 0000000..504c2a2 --- /dev/null +++ b/src/sm/sm_qos.c @@ -0,0 +1,34 @@ +/* GPRS QoS definitions from 3GPP TS 24.008 sec 10.5.6.5 */ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/gprs/sm/sm_qos.h> +#include "../common/qos.h" + +int16_t osmo_gprs_sm_qos_parse_qos_profile( + struct osmo_gprs_sm_qos_profile_decoded *decoded, const uint8_t *data, size_t data_len) +{ + return gprs_qos_parse_qos_profile(decoded, data, data_len); +} + +int16_t osmo_gprs_sm_qos_build_qos_profile(const struct osmo_gprs_sm_qos_profile_decoded *decoded, void *data, int data_len) +{ + return gprs_qos_build_qos_profile(decoded, data, data_len); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I6c0676e55bb1f0f424f41d8d04d4f5e5bf376f4f Gerrit-Change-Number: 33970 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 ) Change subject: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If2d1946522bc4a1c19d65acb23605f1a3f05ab45 Gerrit-Change-Number: 33981 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:40:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-gprs[master]: sndcp: Forward QoS params from SM to LLC

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33971 ) Change subject: sndcp: Forward QoS params from SM to LLC ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I70e355ef27d24bdaf00e54f0e7126193f5bbf19f Gerrit-Change-Number: 33971 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:40:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-gprs[master]: sm: Introduce APIs to enc/dec QoS Profile

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33970 ) Change subject: sm: Introduce APIs to enc/dec QoS Profile ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS1: > Regarding endianness, should we disable the check? it will keep on failing in all future patches if […] I think it's safe to disable the check and then subsequently at low priority submit patches to the various projects to remove the related generated code. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I6c0676e55bb1f0f424f41d8d04d4f5e5bf376f4f Gerrit-Change-Number: 33970 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:40:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: cosmetic: Document foce_two_phase feature based on specs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34006 ) Change subject: cosmetic: Document foce_two_phase feature based on specs ...................................................................... cosmetic: Document foce_two_phase feature based on specs Change-Id: I4f8e3d0dcb721d51838b50aba5b40d0551c8d0c5 --- M src/bts.cpp 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 177544a..fe48018 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -970,6 +970,12 @@ LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single TS uplink transmission " "(one phase packet access)\n"); if (bts->pcu->vty.force_two_phase) { + /* 3GPP TS 44.018 3.5.2.1.3.1: "If the establishment cause in the + * CHANNEL REQUEST message indicates a request for one phase packet access, + * the network may grant either a one phase packet access or a single block + * packet access for the mobile station. If a single block packet access is + * granted, it forces the mobile station to perform a two phase packet access." + */ LOGP(DRLCMAC, LOGL_DEBUG, "Forcing two phase access\n"); chan_req.single_block = true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f8e3d0dcb721d51838b50aba5b40d0551c8d0c5 Gerrit-Change-Number: 34006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: cosmetic: Document foce_two_phase feature based on specs

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34006 ) Change subject: cosmetic: Document foce_two_phase feature based on specs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f8e3d0dcb721d51838b50aba5b40d0551c8d0c5 Gerrit-Change-Number: 34006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:38:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixed makefile to also clean crypto subdirectory

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33996 ) Change subject: Fixed makefile to also clean crypto subdirectory ...................................................................... Fixed makefile to also clean crypto subdirectory Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 --- M src/Makefile 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/Makefile b/src/Makefile index 9b12484..b424ea4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,4 +30,4 @@ tunctl: tunctl.o clean: - @rm -f tunctl float_to_bits crc_test tetra-rx conv_enc_test *.o phy/*.o lower_mac/*.o *.a + @rm -f tunctl float_to_bits crc_test tetra-rx conv_enc_test *.o phy/*.o lower_mac/*.o crypto/*.o *.a -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 Gerrit-Change-Number: 33996 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added stub for decryption and full keystream application functions

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34001 ) Change subject: Added stub for decryption and full keystream application functions ...................................................................... Patch Set 2: (2 comments) File src/crypto/tetra_crypto.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34001/comment/87f12f9f_714dba42 PS2, Line 207: case KSG_TEA1: : tea1_stub(iv, eck, num_bytes, ks_bytes); : break; : case KSG_TEA2: : tea2_stub(iv, eck, num_bytes, ks_bytes); : break; : case KSG_TEA3: : tea3_stub(iv, eck, num_bytes, ks_bytes); : break; I think it's a bit weird to add the stub functions that don't do anything in a commit here. This leads to situations that if somebody calls the function now, it returns success (true) despite not having generated the keystream. I think it would be wise to not merge the stub functions at all, and have generate_keystream run into the default-clause below which gives a proper error message and return code instead of silent failure. https://gerrit.osmocom.org/c/osmo-tetra/+/34001/comment/cea1cccd_ff18f74c PS2, Line 305: / we typically prefer /* */ comments. Feels especially inconsistenc since this very same patch is adding multiple comments in different styles. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 Gerrit-Change-Number: 34001 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:37:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixups and clarifying comments for msgb tail modifications

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34000 ) Change subject: Fixups and clarifying comments for msgb tail modifications ...................................................................... Patch Set 2: (6 comments) File src/lower_mac/tetra_lower_mac.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/c28a8e8e_e37afbcb PS2, Line 347: msg->len = msg in general we don't ever manually manipulate msgb's this way in other osmocom software. We use the various msgb.[ch] functions as high-level operations on the buffer (like msgb_put/pull/push/get/trim/reserve/...), but don't consider manipulation of the individual fields as good code. I don't know the specific use case here (and have too many other tasks to review in detail) so I don't have a concrete suggestion, just sharing general thoughts. File src/tetra_llc.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/e33e4841_ee2edb49 PS2, Line 124: msg->tail = msg->l3h + lpp.tl_sdu_len; // Strips off FCS (if present) : msg->len = msg->tail - msg->head; this looks a bit like openn-coding a msgb_get(), or probably even more a msgb_l3trim() ? File src/tetra_upper_mac.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/68250cd6_9fecc52e PS2, Line 178: msg->len = m same here. msgb_trim? https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/7b1ffe59_7871231b PS2, Line 185: msg->len = m same here. msgb_trim? https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/edec0a07_0a8865b4 PS2, Line 306: msg->len = m yet another msgb_trim? Also, the entire get_num_fill_bits + following operations happens several times in the code, so it might make sense to create a function to cover the sequence of getting the number of fill-bits and then trimming the message to exclude those? https://gerrit.osmocom.org/c/osmo-tetra/+/34000/comment/46364861_fc916427 PS2, Line 359: msg->len = m again another fill-bits-stripping situation. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db Gerrit-Change-Number: 34000 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:34:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Patch Set 2: (1 comment) File src/tetra-rx.c: https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/4feb8f43_2f5936f7 PS2, Line 96: talloc again, just FYI: talloc is hieararchical. If one would pass the tetra_mac_state as context pointer when allocationg the tcs (instead of NULL as you're doing), then talloc_free(tms) would automatically free the tcs. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:25:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log July 2023