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

Change in osmocom-bb[master]: layer23: make all apps depend on libosmo-gprs-rlcmac

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30811 ) Change subject: layer23: make all apps depend on libosmo-gprs-rlcmac ...................................................................... layer23: make all apps depend on libosmo-gprs-rlcmac This will be needed for the modem application, and is also used in a follow-up commit adding support for parsing SI13 Rest Octets. Change-Id: I8e0f826c9b2a886f94624176e34e7d197e93d25f Related: OS#5500 --- M contrib/jenkins.sh M src/host/layer23/configure.ac M src/host/layer23/src/common/Makefile.am M src/host/layer23/src/misc/Makefile.am M src/host/layer23/src/mobile/Makefile.am M src/host/layer23/src/modem/Makefile.am 6 files changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 16a0a6e..c65387e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -24,6 +24,7 @@ export LD_LIBRARY_PATH="$inst/lib" osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false +osmo-build-dep.sh libosmo-gprs osmo-build-dep.sh gapk set +x diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index 9c11dbd..053cf58 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -44,6 +44,7 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec) +PKG_CHECK_MODULES(LIBOSMOGPRSRLCMAC, libosmo-gprs-rlcmac) AC_CHECK_LIB(gps, gps_waiting, LIBGPS_CFLAGS=" -D_HAVE_GPSD" LIBGPS_LIBS=" -lgps ",,) AC_SUBST([LIBGPS_CFLAGS]) AC_SUBST([LIBGPS_LIBS]) diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 6705ef9..185bf04 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -7,6 +7,7 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOGPRSRLCMAC_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(NULL) diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am index ad48bda..230c04f 100644 --- a/src/host/layer23/src/misc/Makefile.am +++ b/src/host/layer23/src/misc/Makefile.am @@ -7,6 +7,7 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOGPRSRLCMAC_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(NULL) @@ -15,6 +16,7 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOGPRSRLCMAC_LIBS) \ $(LIBGPS_LIBS) \ $(NULL) diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index b7b25e3..a83e082 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOGPRSRLCMAC_CFLAGS) \ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOGAPK_CFLAGS) \ $(LIBGPS_CFLAGS) \ @@ -43,6 +44,7 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOGPRSRLCMAC_LIBS) \ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOGAPK_LIBS) \ $(LIBGPS_LIBS) \ diff --git a/src/host/layer23/src/modem/Makefile.am b/src/host/layer23/src/modem/Makefile.am index a29cc62..4fb3c11 100644 --- a/src/host/layer23/src/modem/Makefile.am +++ b/src/host/layer23/src/modem/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOGPRSRLCMAC_CFLAGS) \ $(NULL) bin_PROGRAMS = modem @@ -18,4 +19,5 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOGPRSRLCMAC_LIBS) \ $(NULL) 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8e0f826c9b2a886f94624176e34e7d197e93d25f Gerrit-Change-Number: 30811 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: contrib/jenkins.sh: build some sub-projects with --enable-werror

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30820 ) Change subject: contrib/jenkins.sh: build some sub-projects with --enable-werror ...................................................................... contrib/jenkins.sh: build some sub-projects with --enable-werror Change-Id: I8976ba3c52a3b4a47c98b9e6e85c7b9dcef4575a --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3a05480..16a0a6e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -39,11 +39,13 @@ for dir in gprsdecode layer23 trxcon virt_phy; do cd $base/src/host/$dir autoreconf -fi - ./configure - $MAKE $PARALLEL_MAKE distcheck + ./configure --enable-werror + $MAKE $PARALLEL_MAKE + DISTCHECK_CONFIGURE_FLAGS="--enable-werror" $MAKE $PARALLEL_MAKE distcheck done # TODO: make sure 'distcheck' passes also for these +# TODO: make sure '--enable-werror' passes also for these for dir in gsmmap osmocon; do cd $base/src/host/$dir autoreconf -fi -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8976ba3c52a3b4a47c98b9e6e85c7b9dcef4575a Gerrit-Change-Number: 30820 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: contrib/jenkins.sh: also run distcheck for trxcon and virt_phy

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30818 ) Change subject: contrib/jenkins.sh: also run distcheck for trxcon and virt_phy ...................................................................... contrib/jenkins.sh: also run distcheck for trxcon and virt_phy Change-Id: I5664806df4051694a5ce705420cd574f7a7da531 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 2758f4e..4374229 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,7 @@ # building those sub-projects where 'distcheck' is known-working -for dir in gprsdecode layer23; do +for dir in gprsdecode layer23 trxcon virt_phy; do cd $base/src/host/$dir autoreconf -fi ./configure @@ -44,7 +44,7 @@ done # TODO: make sure 'distcheck' passes also for these -for dir in gsmmap osmocon trxcon virt_phy; do +for dir in gsmmap osmocon; do cd $base/src/host/$dir autoreconf -fi ./configure 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5664806df4051694a5ce705420cd574f7a7da531 Gerrit-Change-Number: 30818 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: contrib/jenkins.sh: make use of $PARALLEL_MAKE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30819 ) Change subject: contrib/jenkins.sh: make use of $PARALLEL_MAKE ...................................................................... contrib/jenkins.sh: make use of $PARALLEL_MAKE Change-Id: I371a8dca6d992622d005d8c9d84eaaad6f3c7372 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 4374229..3a05480 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -40,7 +40,7 @@ cd $base/src/host/$dir autoreconf -fi ./configure - make distcheck + $MAKE $PARALLEL_MAKE distcheck done # TODO: make sure 'distcheck' passes also for these @@ -48,7 +48,7 @@ cd $base/src/host/$dir autoreconf -fi ./configure - make + $MAKE $PARALLEL_MAKE done # Build and publish manuals 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I371a8dca6d992622d005d8c9d84eaaad6f3c7372 Gerrit-Change-Number: 30819 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: virt_phy: fix make distcheck: access l1ctl_proto.h via symlink

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30817 ) Change subject: virt_phy: fix make distcheck: access l1ctl_proto.h via symlink ...................................................................... virt_phy: fix make distcheck: access l1ctl_proto.h via symlink Accessing a header file from outside of the sub-project requires using the relative path ("-I$(top_srcdir)/../layer23/include"), which does not resolve properly during make distcheck. The '../layer23/include/l1ctl_proto.h' is actually a symlink too. Change-Id: Id64ab161a17d53f5e93cdd100e81d4fb8acfb97a --- M src/host/virt_phy/include/Makefile.am A src/host/virt_phy/include/virtphy/l1ctl_proto.h M src/host/virt_phy/include/virtphy/l1ctl_sap.h M src/host/virt_phy/src/Makefile.am M src/host/virt_phy/src/gsmtapl1_if.c M src/host/virt_phy/src/l1ctl_sap.c M src/host/virt_phy/src/virt_prim_data.c M src/host/virt_phy/src/virt_prim_fbsb.c M src/host/virt_phy/src/virt_prim_pm.c M src/host/virt_phy/src/virt_prim_rach.c M src/host/virt_phy/src/virt_prim_traffic.c 11 files changed, 11 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/virt_phy/include/Makefile.am b/src/host/virt_phy/include/Makefile.am index 6048a4b..ff3e8cb 100644 --- a/src/host/virt_phy/include/Makefile.am +++ b/src/host/virt_phy/include/Makefile.am @@ -1,6 +1,7 @@ noinst_HEADERS = \ virtphy/logging.h \ virtphy/osmo_mcast_sock.h \ + virtphy/l1ctl_proto.h \ virtphy/l1ctl_sock.h \ virtphy/virtual_um.h \ virtphy/gsmtapl1_if.h \ diff --git a/src/host/virt_phy/include/virtphy/l1ctl_proto.h b/src/host/virt_phy/include/virtphy/l1ctl_proto.h new file mode 120000 index 0000000..95d4161 --- /dev/null +++ b/src/host/virt_phy/include/virtphy/l1ctl_proto.h @@ -0,0 +1 @@ +../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/virt_phy/include/virtphy/l1ctl_sap.h b/src/host/virt_phy/include/virtphy/l1ctl_sap.h index d3562a1..6306eeb 100644 --- a/src/host/virt_phy/include/virtphy/l1ctl_sap.h +++ b/src/host/virt_phy/include/virtphy/l1ctl_sap.h @@ -2,7 +2,7 @@ #include <stdint.h> #include <osmocom/core/msgb.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> #include <virtphy/virtual_um.h> #include <virtphy/l1ctl_sock.h> #include <virtphy/virt_l1_model.h> diff --git a/src/host/virt_phy/src/Makefile.am b/src/host/virt_phy/src/Makefile.am index bfd0dfa..66e70cb 100644 --- a/src/host/virt_phy/src/Makefile.am +++ b/src/host/virt_phy/src/Makefile.am @@ -1,5 +1,5 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/../layer23/include +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include bin_PROGRAMS = virtphy virtphy_SOURCES = virtphy.c l1ctl_sock.c gsmtapl1_if.c l1ctl_sap.c virt_prim_pm.c virt_prim_fbsb.c virt_prim_rach.c virt_prim_data.c virt_prim_traffic.c virt_l1_sched_simple.c logging.c virt_l1_model.c shared/virtual_um.c shared/osmo_mcast_sock.c diff --git a/src/host/virt_phy/src/gsmtapl1_if.c b/src/host/virt_phy/src/gsmtapl1_if.c index 83b01fe..1496ee9 100644 --- a/src/host/virt_phy/src/gsmtapl1_if.c +++ b/src/host/virt_phy/src/gsmtapl1_if.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> #include <virtphy/virtual_um.h> #include <virtphy/l1ctl_sock.h> #include <virtphy/virt_l1_model.h> diff --git a/src/host/virt_phy/src/l1ctl_sap.c b/src/host/virt_phy/src/l1ctl_sap.c index 35370f0..ffe94ac 100644 --- a/src/host/virt_phy/src/l1ctl_sap.c +++ b/src/host/virt_phy/src/l1ctl_sap.c @@ -29,7 +29,7 @@ #include <osmocom/gsm/rsl.h> #include <osmocom/gprs/gprs_rlc.h> #include <stdio.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> #include <netinet/in.h> #include <string.h> #include <virtphy/virtual_um.h> diff --git a/src/host/virt_phy/src/virt_prim_data.c b/src/host/virt_phy/src/virt_prim_data.c index f74a9fa..51f7585 100644 --- a/src/host/virt_phy/src/virt_prim_data.c +++ b/src/host/virt_phy/src/virt_prim_data.c @@ -32,7 +32,7 @@ #include <virtphy/logging.h> #include <virtphy/gsmtapl1_if.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> /** * @brief Handler callback function for DATA request. diff --git a/src/host/virt_phy/src/virt_prim_fbsb.c b/src/host/virt_phy/src/virt_prim_fbsb.c index 9637ed9..7c634cb 100644 --- a/src/host/virt_phy/src/virt_prim_fbsb.c +++ b/src/host/virt_phy/src/virt_prim_fbsb.c @@ -29,7 +29,7 @@ #include <virtphy/virt_l1_sched.h> #include <osmocom/core/gsmtap.h> #include <virtphy/logging.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> static uint16_t sync_count = 0; diff --git a/src/host/virt_phy/src/virt_prim_pm.c b/src/host/virt_phy/src/virt_prim_pm.c index 5a9a664..bb7875d 100644 --- a/src/host/virt_phy/src/virt_prim_pm.c +++ b/src/host/virt_phy/src/virt_prim_pm.c @@ -29,7 +29,7 @@ #include <virtphy/virt_l1_sched.h> #include <osmocom/core/gsmtap.h> #include <virtphy/logging.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> /** * @brief Change the signal strength for a given arfcn. diff --git a/src/host/virt_phy/src/virt_prim_rach.c b/src/host/virt_phy/src/virt_prim_rach.c index 2813458..a8a8ffa 100644 --- a/src/host/virt_phy/src/virt_prim_rach.c +++ b/src/host/virt_phy/src/virt_prim_rach.c @@ -32,7 +32,7 @@ #include <virtphy/logging.h> #include <virtphy/gsmtapl1_if.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> /* use if we have a combined uplink (RACH, SDCCH, ...) (see * http://www.rfwireless-world.com/Terminology/GSM-combined-channel-configurat…) diff --git a/src/host/virt_phy/src/virt_prim_traffic.c b/src/host/virt_phy/src/virt_prim_traffic.c index 1686ce9..ae87ad6 100644 --- a/src/host/virt_phy/src/virt_prim_traffic.c +++ b/src/host/virt_phy/src/virt_prim_traffic.c @@ -32,7 +32,7 @@ #include <virtphy/logging.h> #include <virtphy/gsmtapl1_if.h> -#include <l1ctl_proto.h> +#include <virtphy/l1ctl_proto.h> /** * @brief Handler callback function for TRAFFIC request. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id64ab161a17d53f5e93cdd100e81d4fb8acfb97a Gerrit-Change-Number: 30817 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: contrib/jenkins.sh: build some sub-projects with --enable-werror

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30820 ) Change subject: contrib/jenkins.sh: build some sub-projects with --enable-werror ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8976ba3c52a3b4a47c98b9e6e85c7b9dcef4575a Gerrit-Change-Number: 30820 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Jan 2023 17:58:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: virt_phy: fix make distcheck: access l1ctl_proto.h via symlink

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30817 ) Change subject: virt_phy: fix make distcheck: access l1ctl_proto.h via symlink ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id64ab161a17d53f5e93cdd100e81d4fb8acfb97a Gerrit-Change-Number: 30817 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Jan 2023 17:58:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Submit valid l3 payload

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30827 ) Change subject: bsc: Submit valid l3 payload ...................................................................... bsc: Submit valid l3 payload OsmoBSC does some minimal parsing of l3 content to select MSC target, match paging response to paging request, etc. Since tests right now use potentially invalid data, osmo-bsc is not rejecting conns providing invalid l3 content. This commit makes sure TTCN3 tests pass valid l3 payloads to osmo-bsc, so that they keep working once osmo-bsc starts rejecting invalid IEs it parses. Related: SYS#6280 Change-Id: I6e99ac39f32c9a981420b73f8d7d1568d2fa1c54 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_CBSP.ttcn M bsc/BSC_Tests_VAMOS.ttcn 3 files changed, 94 insertions(+), 77 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/30827/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index aebb64c..944589e 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -115,8 +115,6 @@ private const RSL_IE_Body c_mr_conf_5_90 := valueof(RSL_IE_Body:{multirate_cfg := ts_RSL_MultirateCfg(true, 0, '00000100'B /* 5,90k */)}); -friend const octetstring c_l3_payload := '00010203040506'O; - /* per-BTS state which we keep */ type record BTS_State { /* component reference to the IPA_Client component used for RSL */ @@ -609,6 +607,12 @@ } } +friend function gen_l3_valid_payload(hexstring imsi := '001010000000002'H) return octetstring { + var octetstring l3_payload; + l3_payload := enc_PDU_ML3_MS_NW(valueof(ts_LU_REQ(LU_Type_IMSI_Attach, ts_MI_LV(ts_MI_IMSI(imsi))))); + return l3_payload; +} + type component test_CT extends CTRL_Adapter_CT { /* Array of per-BTS/TRX state */ var BTS_State bts[NUM_BTS][NUM_TRX]; @@ -1517,15 +1521,16 @@ var IpaStreamId sid := IPAC_PROTO_RSL_TRX0; var RSL_Message rx_rsl; var ASP_RSL_Unitdata rx_rsl_ud; + var octetstring l3_payload := gen_l3_valid_payload(); f_init(1); /* Send CHAN RQD and wait for allocation; acknowledge it */ var RslChannelNr chan_nr := f_chreq_act_ack(); - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))); + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))); /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ @@ -1537,15 +1542,16 @@ testcase TC_chan_act_ack_est_ind_refused() runs on test_CT { var BSSAP_N_CONNECT_ind rx_c_ind; var RSL_Message rx_rsl; + var octetstring l3_payload := gen_l3_valid_payload(); f_init(1); /* Send CHAN RQD and wait for allocation; acknowledge it */ var RslChannelNr chan_nr := f_chreq_act_ack(); - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) -> value rx_c_ind; BSSAP.send(ts_BSSAP_DISC_req(rx_c_ind.connectionId, 0)); /* expect BSC to disable the channel */ @@ -1680,7 +1686,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { /* send assignment without AoIP IEs */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); @@ -1806,7 +1812,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* send assignment without AoIP IEs */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ass_cmd)); alt { @@ -1946,7 +1952,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* simulate RLL REL IND */ f_ipa_tx(ts_RSL_REL_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); @@ -1974,7 +1980,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* Sending CONN FAIL IND immediately may trigger a race condition. * Give the BSC some time to process a new SCCP connection (OS#5823). */ @@ -2031,7 +2037,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* BSC<-MSC: Instruct BSC to clear connection */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(0))); @@ -2198,7 +2204,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* Instruct BSC to clear channel */ var BssmapCause cause := 0; @@ -2220,7 +2226,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* Send CommonID with some random PLMN (BSC doesn't take it into account /* yet when generating the EUTRAN neigh list in RR CHannel Release) */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_CommonId('001019876543210'H, '323454'O))); @@ -2276,7 +2282,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* Instruct BSC to clear channel */ var BssmapCause cause := 0; @@ -2298,7 +2304,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); @@ -2313,7 +2319,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); @@ -2328,7 +2334,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* Clear the queue, it might still contain stuff like IMMEDIATE ASSIGN */ IPA_RSL[0][0].clear; @@ -2356,7 +2362,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); f_expect_chan_rel(dt.rsl_chan_nr, expect_rll_rel_req := false); f_shutdown_helper(); } @@ -2367,7 +2373,7 @@ { var DchanTuple dt; - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); var BssmapCause cause := 0; BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(enum2int(clear_cmd_cause)))); BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_ClearComplete)) { @@ -2398,11 +2404,12 @@ f_init(1); var RslChannelNr chan_nr := valueof(t_RslChanNr_Bm(6)); - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + var octetstring l3_payload := gen_l3_valid_payload(); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) { setverdict(fail, "MSC received COMPL L3 for non-active lchan"); } [] BSSAP.receive {} @@ -2416,17 +2423,19 @@ /* Test behavior if RSL EST IND for invalid SAPI */ testcase TC_rll_est_ind_inval_sapi1() runs on test_CT { var RslChannelNr chan_nr; + var octetstring l3_payload; f_init(1); - chan_nr := f_chreq_act_ack() + chan_nr := f_chreq_act_ack(); + l3_payload := gen_l3_valid_payload(); - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(1)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(1)), l3_payload)); timer T := 2.0; T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) { setverdict(fail, "MSC received COMPL L3 for invalid SAPI 1"); } [] BSSAP.receive { repeat; } @@ -2444,12 +2453,13 @@ f_init(1); var RslChannelNr chan_nr := f_chreq_act_ack(); + var octetstring l3_payload := gen_l3_valid_payload(); - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(3)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(3)), l3_payload)); T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) { setverdict(fail, "MSC received COMPL L3 for invalid SAPI 3"); } [] BSSAP.receive { repeat; } @@ -2467,12 +2477,13 @@ f_init(1); var RslChannelNr chan_nr := f_chreq_act_ack(); + var octetstring l3_payload := gen_l3_valid_payload(); - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_SACCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_SACCH(0)), l3_payload)); T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) { setverdict(fail, "MSC received COMPL L3 for invalid Link SACCH"); } [] BSSAP.receive { repeat; } @@ -2587,10 +2598,10 @@ f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); + dt := f_est_dchan(f_rnd_ra_cs(), 23, gen_l3_valid_payload()); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(gen_l3_valid_payload(), '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -2614,10 +2625,10 @@ f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); + dt := f_est_dchan(f_rnd_ra_cs(), 23, gen_l3_valid_payload()); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(gen_l3_valid_payload(), '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -2641,10 +2652,10 @@ f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); + dt := f_est_dchan(f_rnd_ra_cs(), 23, gen_l3_valid_payload()); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(gen_l3_valid_payload(), '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -2666,10 +2677,10 @@ f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); + dt := f_est_dchan(f_rnd_ra_cs(), 23, gen_l3_valid_payload()); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(gen_l3_valid_payload(), '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -2733,7 +2744,7 @@ var BSSAP_N_DATA_ind rx_di; var DchanTuple dt; - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* Send CommonID with some random PLMN (BSC doesn't take it into account * yet when generating the EUTRAN neigh list in RR CHannel Release) */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_CommonId('001019876543210'H, '323454'O))); @@ -7547,7 +7558,7 @@ /* Setup a BSSAP connection and clear it right away. This is * the MSC telling the BSC about a planned release, it's not an * erratic loss of a connection. */ - dt := f_est_dchan(int2oct(i,1), 23+i, c_l3_payload); + dt := f_est_dchan(int2oct(i,1), 23+i, gen_l3_valid_payload()); /* MSC disconnects (RLSD). */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); @@ -7591,7 +7602,7 @@ /* Setup a BSSAP connection and clear it right away. This is * the MSC telling the BSC about a planned release, it's not an * erratic loss of a connection. */ - dt := f_est_dchan(int2oct(i,1), 23+i, c_l3_payload); + dt := f_est_dchan(int2oct(i,1), 23+i, gen_l3_valid_payload()); /* Instruct BSC to clear channel */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(cause))); @@ -7637,7 +7648,7 @@ /* Setup a BSSAP connection and clear it right away. This is * the MSC telling the BSC about a planned release, it's not an * erratic loss of a connection. */ - dt := f_est_dchan('23'O, 23, c_l3_payload); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* simulate RLL REL IND */ f_ipa_tx(ts_RSL_REL_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); @@ -7951,7 +7962,7 @@ var DchanTuples sdcch_cleanup := {}; var integer i; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { - dt := f_est_dchan('23'O, i, c_l3_payload); + dt := f_est_dchan('23'O, i, gen_l3_valid_payload()); sdcch_cleanup := sdcch_cleanup & { dt }; } @@ -8028,14 +8039,14 @@ */ var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; } /* Only the dyn TS is still available. Its first lchan gets converted to SDCCH8 */ - chan_cleanup := chan_cleanup & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + chan_cleanup := chan_cleanup & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; /* Also occupy the seven other SDCCH of the dyn TS */ for (i := 0; i < 7; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; } /* Clean up SDCCH lchans */ @@ -8089,7 +8100,7 @@ var DchanTuples chan_cleanup := {}; var OCT1 ra := '43'O; /* RA containing reason=originating speech call*/ for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { - dt := f_est_dchan(ra, i, c_l3_payload); + dt := f_est_dchan(ra, i, gen_l3_valid_payload()); chan_cleanup := chan_cleanup & { dt }; } @@ -8167,7 +8178,7 @@ var DchanTuples chan_cleanup := {}; var integer i; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { - dt := f_est_dchan('23'O, i, c_l3_payload); + dt := f_est_dchan('23'O, i, gen_l3_valid_payload()); chan_cleanup := chan_cleanup & { dt }; } @@ -9207,6 +9218,7 @@ var integer i; var integer chreq_total, chreq_nochan; var RSL_Message rx_rsl; + var octetstring l3_payload := gen_l3_valid_payload(); f_init(1); f_sleep(1.0); @@ -9226,11 +9238,11 @@ /* Send EST IND for the first TCH, so we get to test the RR release cause */ var RslChannelNr first_tch := valueof(t_RslChanNr_Bm(1)); - f_ipa_tx(ts_RSL_EST_IND(first_tch, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(first_tch, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); /* Accept BSSAP conn, so we get to test the Clear Request cause */ var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) -> value rx_c_ind; var integer sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -9615,7 +9627,7 @@ * NOTE: only 3 SDCCH/4 channels are available on CCCH+SDCCH4+CBCH */ for (var integer i := 0; i < 3; i := i + 1) { /* Establish a dedicated channel, so we can trigger (late) TCH assignment */ - var DchanTuple dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); + var DchanTuple dt := f_est_dchan(f_rnd_ra_cs(), 23, gen_l3_valid_payload()); /* Send a BSSMAP Assignment Command, expect CHANnel ACTIVation */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ass_cmd)); @@ -9681,7 +9693,7 @@ var DchanTuple dt; /* Establish a dedicated channel, so we can trigger handover */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); + dt := f_est_dchan(f_rnd_ra_cs(), 23, gen_l3_valid_payload()); f_sleep(0.5); /* Trigger handover from BTS0 to BTS1 */ @@ -11022,6 +11034,7 @@ testcase TC_imm_ass_post_chan_ack() runs on test_CT { var RSL_Message chan_act; var RSL_Message imm_ass; + var octetstring l3_payload := gen_l3_valid_payload(); f_init(1, false); f_sleep(1.0); @@ -11054,10 +11067,10 @@ chan_ident_ie.chan_ident.ch_desc.v.tsc); /* Check that the lchan is working */ - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11069,6 +11082,7 @@ testcase TC_imm_ass_pre_chan_ack() runs on test_CT { var RSL_Message chan_act; var RSL_Message imm_ass; + var octetstring l3_payload := gen_l3_valid_payload(); f_init(1, false); f_sleep(1.0); @@ -11101,10 +11115,10 @@ f_ipa_tx(ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); /* Check that the lchan is working */ - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11116,6 +11130,7 @@ testcase TC_imm_ass_pre_ts_ack() runs on test_CT { var RSL_Message chan_act; var RSL_Message imm_ass; + var octetstring l3_payload := gen_l3_valid_payload(); f_init(1, false); f_sleep(1.0); @@ -11148,10 +11163,10 @@ f_ipa_tx(ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); /* Check that the lchan is working */ - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11169,6 +11184,7 @@ f_init(1, false); f_sleep(1.0); + var octetstring l3_payload := gen_l3_valid_payload(); var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6)); /* The BSC will activate the dynamic PDCH by default, so confirm that */ f_exp_ipa_rx(tr_RSL_CHAN_ACT_PDCH(chan_nr)); @@ -11216,10 +11232,10 @@ f_ipa_tx(ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); /* Check that the lchan is working */ - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11240,6 +11256,7 @@ f_init(1, false); f_sleep(1.0); + var octetstring l3_payload := gen_l3_valid_payload(); var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6)); /* The BSC will activate the dynamic PDCH by default, so confirm that */ f_exp_ipa_rx(tr_RSL_CHAN_ACT_PDCH(chan_nr)); @@ -11288,10 +11305,10 @@ chan_ident_ie.chan_ident.ch_desc.v.tsc); /* Check that the lchan is working */ - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11567,7 +11584,7 @@ */ var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; } /* Since only bts 0 is connected, expecting all_allocated to become true for both bts 0 and the "global" bsc @@ -11577,7 +11594,7 @@ /* Also fill up all remaining (TCH) channels */ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; } /* All TCH are now also occupied */ @@ -11617,7 +11634,7 @@ */ var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; } /* The static SDCCH should now be occupied, while still 3x8 dynamic SDCCH potentially remain. So only @@ -11627,11 +11644,11 @@ /* Request more SDCCH, hence convert the first dyn TS to SDCCH8. * Will release them later, so remember all the DchanTuples. */ var DchanTuples dyn_sddch := {}; - dyn_sddch := dyn_sddch & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + dyn_sddch := dyn_sddch & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; /* Also occupy the seven other SDCCH of the dyn TS */ for (i := 0; i < 7; i := i+1) { - dyn_sddch := dyn_sddch & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + dyn_sddch := dyn_sddch & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; } /* Now all dynamic SDCCH are also occupied, so for the first time all_allocated:sdcch will trigger... */ @@ -11639,7 +11656,7 @@ /* occupy the remaining TCH, three TCH/F and two TCH/H lchans */ for (i := 0; i < 5; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, gen_l3_valid_payload()) }; } /* All TCH lchans are now also occupied, both static and dynamic */ @@ -11713,7 +11730,7 @@ /* Expect the BSC to allocate 4 x TCH/F channels on BTS2/TRX0 */ for (var integer i := 0; i < 4; i := i + 1) { - var DchanTuple dt := f_est_dchan('23'O, 23, c_l3_payload, {2, 0}); + var DchanTuple dt := f_est_dchan('23'O, 23, gen_l3_valid_payload(), {2, 0}); f_TC_chan_alloc_algo(dt, {2, 0}); f_perform_clear_test_ct(dt); } @@ -11736,7 +11753,7 @@ /* Expect the BSC to allocate 5 x TCH/F channels on BTS2/TRX3 */ for (var integer i := 0; i < 5; i := i + 1) { - var DchanTuple dt := f_est_dchan('23'O, 23, c_l3_payload, {2, 0}); + var DchanTuple dt := f_est_dchan('23'O, 23, gen_l3_valid_payload(), {2, 0}); f_TC_chan_alloc_algo(dt, {2, 3}); f_perform_clear_test_ct(dt); } @@ -11765,12 +11782,12 @@ var DchanTuple dt; f_logp(BSCVTY, "Case a) Unknown Uplink RxLev, fall-back to ascending"); - dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload(), TRX0); f_TC_chan_alloc_algo(dt, TRX0); f_perform_clear_test_ct(dt); f_logp(BSCVTY, "Case b) Not enough RxLev samples, use ascending"); - dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload(), TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(30, 0), ts_RSL_IE_BS_Power(0)), TRX0); @@ -11779,7 +11796,7 @@ f_perform_clear_test_ct(dt); f_logp(BSCVTY, "Case c) Uplink RxLev below the threshold, use ascending"); - dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload(), TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(45, 0), ts_RSL_IE_BS_Power(0)), TRX0); @@ -11791,7 +11808,7 @@ f_perform_clear_test_ct(dt); f_logp(BSCVTY, "Case d) Uplink RxLev above the threshold, use descending"); - dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload(), TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(50, 0), ts_RSL_IE_BS_Power(0)), TRX0); @@ -11807,7 +11824,7 @@ f_vty_transceive(BSCVTY, "end"); f_logp(BSCVTY, "Case e) Uplink RxLev above the threshold, but C0 load is not"); - dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); + dt := f_est_dchan('23'O, 23, gen_l3_valid_payload(), TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(50, 0), ts_RSL_IE_BS_Power(0)), TRX0); diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index ae77ac8..3f1eff0 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -1005,7 +1005,7 @@ cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); /* first establish a dedicated channel */ - var DchanTuple dt := f_est_dchan('23'O, 23, c_l3_payload); + var DchanTuple dt := f_est_dchan('23'O, 23, gen_l3_valid_payload()); /* then send ETWS PN */ f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list); diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 3ebcaaa..1dc4910 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -280,12 +280,12 @@ private function f_verify_dtap() runs on MSC_ConnHdlr { var PDU_BSSAP rx_bssap_dtap; - var octetstring l3_data; + var octetstring l3_data := gen_l3_valid_payload(); /* MS to NW */ - RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); + RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_data)); BSSAP.receive(tr_BSSAP_DTAP) -> value rx_bssap_dtap; - if (not match(rx_bssap_dtap.pdu.dtap, c_l3_payload)) { + if (not match(rx_bssap_dtap.pdu.dtap, l3_data)) { setverdict(fail, "unexpected L3 data"); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30827 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: I6e99ac39f32c9a981420b73f8d7d1568d2fa1c54 Gerrit-Change-Number: 30827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cosmetic: library/L3_Templates: Fix trailing whitespace

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30825 ) Change subject: cosmetic: library/L3_Templates: Fix trailing whitespace ...................................................................... cosmetic: library/L3_Templates: Fix trailing whitespace Change-Id: I9c27b9a2b9dc4dbabd5c2db3a63fbec4768ca4ea --- M library/L3_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/30825/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 7a051e0..3b0da5a 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -605,7 +605,7 @@ secondaryPSDomainTSCSet := ?, secondaryPSDomainTSCValue := ? } - + template PDU_ML3_NW_MS tr_RRM_ModeModify(template ChannelDescription2_V desc := ?, template ChannelMode_V mode := ?, template ExtendedTSCSet_TV extendedTSCSet) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30825 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: I9c27b9a2b9dc4dbabd5c2db3a63fbec4768ca4ea Gerrit-Change-Number: 30825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L3_Templates: ts_LU_REQ(): Define fields as template (value)

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30826 ) Change subject: library/L3_Templates: ts_LU_REQ(): Define fields as template (value) ...................................................................... library/L3_Templates: ts_LU_REQ(): Define fields as template (value) Change-Id: I192eb6f191ea43aee71ff3537ced539fc0b72bf2 --- M library/L3_Templates.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/30826/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 3b0da5a..610d410 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -313,8 +313,9 @@ }; /* Send template for LOCATION UPDATING REQUEST */ -template PDU_ML3_MS_NW ts_LU_REQ(template LocationUpdatingType lu_type, MobileIdentityLV mi_lv, - OCT3 mcc_mnc := '123456'O) := { +template (value) PDU_ML3_MS_NW ts_LU_REQ(template (value) LocationUpdatingType lu_type, + template (value) MobileIdentityLV mi_lv, + template (value) OCT3 mcc_mnc := '123456'O) := { discriminator := '0000'B, /* overwritten */ tiOrSkip := { skipIndicator := '0000'B -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30826 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: I192eb6f191ea43aee71ff3537ced539fc0b72bf2 Gerrit-Change-Number: 30826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023