August 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-gprs[master]: update git URLs (git -> https; gitea)

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29016 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icb87ee511ceb9e65d7a801eeb8d4314b66e9f20a Gerrit-Change-Number: 29016 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Aug 2022 12:36:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: README.md: tweak clone URL

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29026 ) Change subject: README.md: tweak clone URL ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Idcfd4421189c711f95926f7e66da3402c059dfff Gerrit-Change-Number: 29026 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 10 Aug 2022 12:35:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: README.md: tweak clone URL

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29026 ) Change subject: README.md: tweak clone URL ...................................................................... README.md: tweak clone URL Change-Id: Idcfd4421189c711f95926f7e66da3402c059dfff --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index de85ca1..9dd12c0 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You can clone from the official libosmo-pfcp.git repository using - git clone git://git.osmocom.org/libosmo-pfcp.git + git clone https://gitea.osmocom.org/osmocom/libosmo-pfcp To submit patches, see "Contributing" below. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Idcfd4421189c711f95926f7e66da3402c059dfff Gerrit-Change-Number: 29026 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: debian packaging of libosmo-gtlv and libosmo-pfcp

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 ) Change subject: debian packaging of libosmo-gtlv and libosmo-pfcp ...................................................................... debian packaging of libosmo-gtlv and libosmo-pfcp Fix debian packaging, so far a copy-paste from osmo-upf.git crept in here by accident. Related: SYS#5895 Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53 --- M debian/changelog M debian/compat M debian/control M debian/copyright A debian/libosmo-gtlv0.install R debian/libosmo-pfcp0.install M debian/rules M tests/libosmo-pfcp/Makefile.am 8 files changed, 96 insertions(+), 33 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index e69de29..e16e70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -0,0 +1,5 @@ +libosmo-pfcp (0.1.0) testing; urgency=low + + Create new Debian package. + + -- Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Tue, 9 Aug 2022 18:29:05 +0200 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 04b8224..d1f8b43 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ -Source: osmo-upf -Section: net -Priority: extra -Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> -Build-Depends: debhelper (>=9), +Source: libosmo-pfcp +Section: libs +Priority: optional +Maintainer: Osmocom team <osmocom-net-gprs(a)lists.osmocom.org> +Build-Depends: debhelper (>=10), dh-autoreconf, autotools-dev, autoconf, @@ -10,33 +10,89 @@ automake, libtool, pkg-config, - python3-minimal, - libtalloc-dev, - libosmocore-dev (>= 1.6.0), - osmo-gsm-manuals-dev (>= 1.2.0) + libosmocore-dev (>= 1.7.0), + libtalloc-dev (>= 2.1.0) Standards-Version: 3.9.8 -Vcs-Git: git://git.osmocom.org/osmo-upf.git -Vcs-Browser: https://git.osmocom.org/osmo-upf/ -Homepage: https://projects.osmocom.org/projects/osmo-upf +Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-pfcp +Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-pfcp +Homepage: https://projects.osmocom.org/projects/libosmo-pfcp -Package: osmo-upf +Package: libosmo-pfcp +Section: libs Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: OsmoUPF: Osmocom User Plane Function +Depends: ${misc:Depends}, + libosmo-gtlv0 (= ${binary:Version}), + libosmo-pfcp0 (= ${binary:Version}) +Description: Osmocom PFCP protocol implementation (metapackage) + Install Osmocom PFCP and generic TLV protocol libraries. -Package: osmo-upf-dbg -Section: debug +Package: libosmo-gtlv0 +Section: libs Architecture: any Multi-Arch: same -Depends: osmo-upf (= ${binary:Version}), ${misc:Depends} -Description: OsmoUPF: Osmocom User Plane Function +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libosmocore-dev (>= 1.7.0), + libtalloc-dev (>= 2.1.0) +Pre-Depends: ${misc:Pre-Depends} +Description: Generic TLV and TLIV protocol support + Decoding, encoding and logging of protocols using a Tag-Length-Value and/or + Tag-Length-Instance-Value structure. -Package: osmo-upf-doc -Architecture: all -Section: doc -Priority: optional -Depends: ${misc:Depends} -Description: ${misc:Package} PDF documentation - Various manuals: user manual, VTY reference manual and/or - protocol/interface manuals. +Package: libosmo-gtlv-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${misc:Depends}, + libosmo-gtlv0 (= ${binary:Version}) +Description: Development headers for libosmo-gtlv + libosmo-gtlv implements decoding, encoding and logging of protocols using a + Tag-Length-Value and/or Tag-Length-Instance-Value structure. This package in + particular contains the files for compiling a program using this library. + +Package: libosmo-gtlv-dbg +Architecture: any +Multi-Arch: same +Section: debug +Priority: extra +Depends: ${misc:Depends}, + libosmo-gtlv0 (= ${binary:Version}) +Description: Debug symbols for libosmo-gtlv + libosmo-gtlv implements decoding, encoding and logging of protocols using a + Tag-Length-Value and/or Tag-Length-Instance-Value structure. This package in + particular contains the debug symbols for this library. + +Package: libosmo-pfcp0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: PFCP protocol support + Decoding, encoding and endpoint implementation of the Packet Forwarding Control Protocol + (3GPP TS 29.244). + +Package: libosmo-pfcp-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${misc:Depends}, + libosmo-pfcp0 (= ${binary:Version}) +Description: Development headers for libosmo-pfcp + libosmo-pfcp implements decoding, encoding and endpoint implementation of the + Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular + contains the files for compiling a program using this library. + +Package: libosmo-pfcp-dbg +Architecture: any +Multi-Arch: same +Section: debug +Priority: extra +Depends: ${misc:Depends}, + libosmo-pfcp0 (= ${binary:Version}) +Description: Debug symbols for libosmo-pfcp + libosmo-pfcp implements decoding, encoding and endpoint implementation of the + Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular + contains the debug symbols for this library. diff --git a/debian/copyright b/debian/copyright index 84c249f..90d27df 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: osmo-upf -Source: git://git.osmocom.org/osmo-upf +Upstream-Name: libosmo-pfcp +Source: https://gitea.osmocom.org/osmocom/libosmo-pfcp Files: * -Copyright: 2021-2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +Copyright: 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> License: AGPL-3.0+ 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 diff --git a/debian/libosmo-gtlv0.install b/debian/libosmo-gtlv0.install new file mode 100644 index 0000000..dba9905 --- /dev/null +++ b/debian/libosmo-gtlv0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-gtlv*.so.* diff --git a/debian/libosmo-pfcp.install b/debian/libosmo-pfcp0.install similarity index 100% rename from debian/libosmo-pfcp.install rename to debian/libosmo-pfcp0.install diff --git a/debian/rules b/debian/rules index b206acd..e32eb67 100755 --- a/debian/rules +++ b/debian/rules @@ -55,7 +55,8 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practic… override_dh_strip: - dh_strip -plibosmo-pfcp --dbg-package=libosmo-pfcp-dbg + dh_strip -plibosmo-gtlv0 --dbg-package=libosmo-gtlv-dbg + dh_strip -plibosmo-pfcp0 --dbg-package=libosmo-pfcp-dbg # Print test results in case of a failure override_dh_auto_test: diff --git a/tests/libosmo-pfcp/Makefile.am b/tests/libosmo-pfcp/Makefile.am index a2bcdf6..6f3eca1 100644 --- a/tests/libosmo-pfcp/Makefile.am +++ b/tests/libosmo-pfcp/Makefile.am @@ -23,8 +23,8 @@ pfcp_test_LDADD = \ $(LIBOSMOCORE_LIBS) \ - $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.la \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(NULL) .PHONY: update_exp -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53 Gerrit-Change-Number: 29005 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: README.md: tweak clone URL

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29026 ) Change subject: README.md: tweak clone URL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Idcfd4421189c711f95926f7e66da3402c059dfff Gerrit-Change-Number: 29026 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Aug 2022 12:35:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: debian packaging of libosmo-gtlv and libosmo-pfcp

by fixeria

Attention is currently required from: osmith, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 ) Change subject: debian packaging of libosmo-gtlv and libosmo-pfcp ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53 Gerrit-Change-Number: 29005 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Aug 2022 12:35:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: debian packaging of libosmo-gtlv and libosmo-pfcp

by laforge

Attention is currently required from: osmith, neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 ) Change subject: debian packaging of libosmo-gtlv and libosmo-pfcp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53 Gerrit-Change-Number: 29005 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Aug 2022 12:35:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-gprs[master]: update git URLs (git -> https; gitea)

by fixeria

Attention is currently required from: laforge. Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29016 to look at the new patch set (#2). Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: Icb87ee511ceb9e65d7a801eeb8d4314b66e9f20a --- M README.md M debian/control M debian/copyright 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/16/29016/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icb87ee511ceb9e65d7a801eeb8d4314b66e9f20a Gerrit-Change-Number: 29016 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: use f_send_meas_rep() in f_TC_ms_pwr_ctrl_{constant,pf_ewma}

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29022 ) Change subject: BTS_Tests: use f_send_meas_rep() in f_TC_ms_pwr_ctrl_{constant,pf_ewma} ...................................................................... BTS_Tests: use f_send_meas_rep() in f_TC_ms_pwr_ctrl_{constant,pf_ewma} Change-Id: Id80317d1e9de3873ab2d26470a3552b4f2b539b1 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cbbb297..9f2e366 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7877,10 +7877,7 @@ f_trxc_fake_rssi(mp_uplink_power_target); /* Populate SACCH cache with a Measurement Report */ - L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), - ts_SacchL1Header(g_pars.l1_pars.ms_power_level, - g_pars.l1_pars.ms_actual_ta), - f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O))); + f_send_meas_rep(ts_MeasurementResults); /* Establish a dedicated channel */ f_est_dchan(more_ies := valueof(ies)); @@ -7944,10 +7941,7 @@ f_trxc_fake_rssi(mp_uplink_power_target); /* Populate SACCH cache with a Measurement Report */ - L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), - ts_SacchL1Header(g_pars.l1_pars.ms_power_level, - g_pars.l1_pars.ms_actual_ta), - f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O))); + f_send_meas_rep(ts_MeasurementResults); /* Establish a dedicated channel */ f_est_dchan(more_ies := valueof(ies)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29022 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: Id80317d1e9de3873ab2d26470a3552b4f2b539b1 Gerrit-Change-Number: 29022 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_ms_pwr_dyn_{up,ass_down,max}: reply received SA...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29023 ) Change subject: BTS_Tests: fix TC_rsl_ms_pwr_dyn_{up,ass_down,max}: reply received SACCH L1H ...................................................................... BTS_Tests: fix TC_rsl_ms_pwr_dyn_{up,ass_down,max}: reply received SACCH L1H As was explained in [1], until recently we relied on trxcon sendig dummy RR Measurement Reports with patched L1 SACCH Header values. Now trxcon does not patch it for us, so we need to send Uplink SACCH blocks with the correct L1H ourselves. Revision 2 of [1] was successfully tested and proved to fix the above-mentioned testcases. However during code review I was asked to make the statements sending Uplink SACCH blocks self-explanatory. In revision 3 of [1] I modified the code to call f_send_meas_rep(), which was introduced in [2], which as stated in the commit message is using g_pars.l1_pars.{ms_power_level,ms_actual_ta} instead of the values from received L1H. Of course this does not work. Add and use f_send_meas_rep_l1h(), which allows to send the given L1H. Take a chance to add a log() statement, so that we can see what we Tx. Change-Id: Ia79a0a7b06394bd34d0f40226cf40e6e8bd2ba35 Fixes: [1] I31dd6b9026d04403092256176f67785a0a6486ad Related: [2] Ia5d0315e053702df5fa8dad8c6c66c11c9f3edcb Related: OS#5635 --- M bts/BTS_Tests.ttcn 1 file changed, 15 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9f2e366..b2d6383 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -782,6 +782,15 @@ friend function f_send_meas_rep(template (value) MeasurementResults meas_res) runs on ConnHdlr { var template (value) SacchL1Header l1h; + + l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); + f_send_meas_rep_l1h(meas_res, l1h); +} + +/* Send the given measurement results and L1H to the IUT over the Um interface */ +friend function f_send_meas_rep_l1h(template (value) MeasurementResults meas_res, + template (value) SacchL1Header l1h) +runs on ConnHdlr { var octetstring l2; /* RR Measurement Report to be sent */ @@ -792,7 +801,8 @@ /* TITAN has weird (and often unusable) padding model, so we pad here manaully */ l2 := f_pad_oct(enc_LapdmFrameAB(valueof(ts_LAPDm_AB(0, meas_rep))), 21, '00'O); - l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); + + log(%definitionId, "(): Tx SACCH L1 header: ", l1h); /* Send RR Measurement Report over the Um interface */ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); @@ -2979,7 +2989,7 @@ T2.start; alt { [] as_l1_sacch_l1h(l1h) { - f_send_meas_rep(ts_MeasurementResults); + f_send_meas_rep_l1h(ts_MeasurementResults, l1h); if (l1h.ms_power_lvl < (pwr_var + 6)) { repeat; @@ -3000,7 +3010,7 @@ T4.start; alt { [] as_l1_sacch_l1h(l1h) { - f_send_meas_rep(ts_MeasurementResults); + f_send_meas_rep_l1h(ts_MeasurementResults, l1h); if (l1h.ms_power_lvl > pwr_var) { repeat; @@ -3045,7 +3055,7 @@ T1.start; alt { [] as_l1_sacch_l1h(l1h) { - f_send_meas_rep(ts_MeasurementResults); + f_send_meas_rep_l1h(ts_MeasurementResults, l1h); repeat; } [] L1CTL.receive { repeat; } @@ -3094,7 +3104,7 @@ T1.start; alt { [] as_l1_sacch_l1h(l1h) { - f_send_meas_rep(ts_MeasurementResults); + f_send_meas_rep_l1h(ts_MeasurementResults, l1h); repeat; } [] L1CTL.receive { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29023 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: Ia79a0a7b06394bd34d0f40226cf40e6e8bd2ba35 Gerrit-Change-Number: 29023 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022