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

Change in osmo-trx[master]: configure.ac: cosmetic: rearrange MS TRX related logic

by Hoernchen

Attention is currently required from: fixeria. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30793 ) Change subject: configure.ac: cosmetic: rearrange MS TRX related logic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1 Gerrit-Change-Number: 30793 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Dec 2022 15:22:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by Hoernchen

Attention is currently required from: fixeria. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 ) Change subject: configure.ac: allow building without cloning submodules ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Gerrit-Change-Number: 30792 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Dec 2022 15:21:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by Hoernchen

Attention is currently required from: laforge, fixeria. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... Patch Set 2: (1 comment) File coverity/prepare_source_Osmocom.sh: https://gerrit.osmocom.org/c/osmo-ci/+/30791/comment/a472d15f_7c951552 PS1, Line 55: && git submodule update --recursive --remote > I am not certain either, my experience with git-submodules is extremely limited... […] As the related commit message states it is only for local testing anyway, I don't know what the user wants to do here, this also applies to the cleaning below, so I'd wouldn't touch it, which is why I didn't modify this part in my own patch that i just abandoned because this patch has more lines and is therefore better. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Dec 2022 15:21:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: add mstrx

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30790 ) Change subject: coverity: add mstrx ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie8f01e61905120c0e9b5db66c1b60b56d777657e Gerrit-Change-Number: 30790 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by Hoernchen

Attention is currently required from: laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Dec 2022 15:18:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by laforge

Attention is currently required from: Hoernchen, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 ) Change subject: configure.ac: allow building without cloning submodules ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Gerrit-Change-Number: 30792 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Dec 2022 11:24:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by fixeria

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 ) Change subject: configure.ac: allow building without cloning submodules ...................................................................... Patch Set 2: Verified+1 (1 comment) Patchset: PS2: Tested on Debian 10, 11, and on Arch. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Gerrit-Change-Number: 30792 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Dec 2022 11:24:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by fixeria

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... Patch Set 2: (1 comment) File coverity/prepare_source_Osmocom.sh: https://gerrit.osmocom.org/c/osmo-ci/+/30791/comment/fc85dbf8_47ce2007 PS1, Line 55: && git submodule update --recursive --remote > I'm not certain that this will always make sure that the submodule is properly updated. […] I am not certain either, my experience with git-submodules is extremely limited... Though, I don't think updating this branch is really important. Jenkins always does clean the workspace, while this (SRC_SKIP_FETCH) was added by Oliver to speed up testing when running these scripts locally. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 27 Dec 2022 22:37:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: cosmetic: rearrange MS TRX related logic

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30793 ) Change subject: configure.ac: cosmetic: rearrange MS TRX related logic ...................................................................... configure.ac: cosmetic: rearrange MS TRX related logic Make it consistent with the existing AS_IF/AM_CONDITIONAL locations. Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1 Related: OS#5599 --- M configure.ac 1 file changed, 12 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/93/30793/1 diff --git a/configure.ac b/configure.ac index eab0e22..fd8d577 100644 --- a/configure.ac +++ b/configure.ac @@ -209,7 +209,17 @@ PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0) ]) -AM_CONDITIONAL([ENABLE_MS_TRX], [test "x$with_mstrx" = "xyes"]) +AS_IF([test "x$with_mstrx" = "xyes"], [ + AC_MSG_NOTICE(["Enabling ms-trx..."]) + AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) + AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") +], [ + # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally, + # autoconf/automake still requires the directory to be present + # and thus the submodule to be fetched (even if MS TRX is not needed). + # Work this around by pointing it to an empty dir. + AC_SUBST(LIBTRXCON_DIR, "osmocom-bb") +]) AS_IF([test "x$with_singledb" = "xyes"], [ AC_DEFINE(SINGLEDB, 1, Define to 1 for single daughterboard) @@ -267,6 +277,7 @@ AM_CONDITIONAL(DEVICE_BLADE, [test "x$with_bladerf" = "xyes"]) AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"]) AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"]) +AM_CONDITIONAL(ENABLE_MS_TRX, [test "x$with_mstrx" = "xyes"]) PKG_CHECK_MODULES(LIBUSB, libusb-1.0) PKG_CHECK_MODULES(FFTWF, fftw3f) @@ -334,18 +345,6 @@ AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) -if test "x$with_mstrx" = "xyes"; then - AC_MSG_NOTICE(["Enabling ms-trx..."]) - AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) - AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") -else - # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally, - # autoconf/automake still requires the directory to be present - # and thus the submodule to be fetched (even if MS TRX is not needed). - # Work this around by pointing it to an empty dir. - AC_SUBST(LIBTRXCON_DIR, "osmocom-bb") -fi - dnl Output files AC_CONFIG_FILES([\ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1 Gerrit-Change-Number: 30793 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... configure.ac: check if LIBTRXCON_DIR (submodule) exists Fail during the configure stage if the submodule is not fetched. Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Related: OS#5599 --- M configure.ac 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/95/30795/1 diff --git a/configure.ac b/configure.ac index 2c4bb28..5d45c27 100644 --- a/configure.ac +++ b/configure.ac @@ -212,7 +212,12 @@ AC_MSG_CHECKING([whether to enable building MS TRX]) AS_IF([test "x$with_mstrx" = "xyes"], [ AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) - AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") + LIBTRXCON_DIR="osmocom-bb/src/host/trxcon" + if ! test -d "$LIBTRXCON_DIR"; then + AC_MSG_RESULT([no]) + AC_MSG_ERROR([$LIBTRXCON_DIR does not exist]) + fi + AC_SUBST(LIBTRXCON_DIR) AC_MSG_RESULT([yes]) ], [ # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally, -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30794 ) Change subject: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT ...................................................................... configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT Always log whether the MS TRX is going to be built, event if it's not. Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772 Related: OS#5599 --- M configure.ac 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/94/30794/1 diff --git a/configure.ac b/configure.ac index fd8d577..2c4bb28 100644 --- a/configure.ac +++ b/configure.ac @@ -209,16 +209,18 @@ PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0) ]) +AC_MSG_CHECKING([whether to enable building MS TRX]) AS_IF([test "x$with_mstrx" = "xyes"], [ - AC_MSG_NOTICE(["Enabling ms-trx..."]) AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") + AC_MSG_RESULT([yes]) ], [ # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally, # autoconf/automake still requires the directory to be present # and thus the submodule to be fetched (even if MS TRX is not needed). # Work this around by pointing it to an empty dir. AC_SUBST(LIBTRXCON_DIR, "osmocom-bb") + AC_MSG_RESULT([no]) ]) AS_IF([test "x$with_singledb" = "xyes"], [ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772 Gerrit-Change-Number: 30794 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 ) Change subject: configure.ac: allow building without cloning submodules ...................................................................... configure.ac: allow building without cloning submodules The MS TRX was intentionally added [1] as an optional feature, which requires a git submodule to be present in order to build libtrxcon. This feature can be enabled by passing --with-mstrx to the configure. But autoconf/automake is a mess. Despite in the root Makefile.am we are adding full submodule path to the SUBDIRS *conditionally*, the configure script would still fail if the submodule is not fetched: Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist It would not even enter that directory if it's present, but somehow it's still required to exist. For the end user this means that cloning the submodule becomes a *necessary* step in order to build osmo-trx from source, even when the MS TRX is not really needed. The fact that we're unconditionally requiring the submodule, which is meant to be used by an optional feature feels wrong to me. It's also unusual for osmocom projects to require submodules, so it may (and already did) cause build failures when cloning as usual. Let's work this problem around by defining LIBTRXCON_DIR variable in configure.ac and using it in the root Makefile.am. If the MS TRX is not enabled explicitly, make autoconf/automake happy by assigning LIBTRXCON_DIR the submodule's root directory, which is always present but empty if the submodule is not fetched. Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Related: [1] b7253c6fdc88a3e2e0c8b441dc3c34dfb1c15d24 Related: OS#5599, OS#5846 --- M Makefile.am M configure.ac 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/30792/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Gerrit-Change-Number: 30792 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 ) Change subject: configure.ac: allow building without cloning submodules ...................................................................... configure.ac: allow building without cloning submodules The MS TRX was intentionally added [1] as an optional feature, which requires a git submodule to be present in order to build libtrxcon. This feature can be enabled by passing --with-mstrx to the configure. But autoconf/automake is a mess. Despite in the root Makefile.am we are adding full submodule path to the SUBDIRS *conditionally*, the configure script would still fail if the submodule is not fetched: Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist It would not even enter that directory if it's present, but somehow it's still required to exist. For the end user this means that cloning the submodule becomes a *necessary* step in order to build osmo-trx from source, even when the MS TRX is not really needed. The fact that we're unconditionally requiring the submodule, which is meant to be used by an optional feature feels wrong to me. It's also unusual for osmocom projects to require submodules, so it may (and already did) cause build failures when cloning as usual. Let's work this problem around by defining LIBTRXCON_DIR variable in configure.ac and using it in the root Makefile.am. If the MS TRX is not enabled explicitly, make autoconf/automake happy by assigning LIBTRXCON_DIR the submodule's root directory, which is always present but empty if the submodule is not fetched. Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Related: [1] b7253c6fdc88a3e2e0c8b441dc3c34dfb1c15d24 Related: OS#5599, OS#5846 --- M Makefile.am M configure.ac 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/30792/1 diff --git a/Makefile.am b/Makefile.am index 580544b..7b2198c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ SUBDIRS = if ENABLE_MS_TRX -SUBDIRS += osmocom-bb/src/host/trxcon +SUBDIRS += $(LIBTRXCON_DIR) endif # Order must be preserved diff --git a/configure.ac b/configure.ac index ff1ae8b..afbc193 100644 --- a/configure.ac +++ b/configure.ac @@ -337,6 +337,9 @@ if test "x$with_mstrx" = "xyes"; then AC_MSG_NOTICE(["Enabling ms-trx..."]) AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) + AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") +else + AC_SUBST(LIBTRXCON_DIR, "osmocom-bb") fi -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Gerrit-Change-Number: 30792 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: add mstrx

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30790 ) Change subject: coverity: add mstrx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie8f01e61905120c0e9b5db66c1b60b56d777657e Gerrit-Change-Number: 30790 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Dec 2022 21:25:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... Patch Set 1: (1 comment) File coverity/prepare_source_Osmocom.sh: https://gerrit.osmocom.org/c/osmo-ci/+/30791/comment/4c287e0b_c47620ca PS1, Line 55: && git submodule update --recursive --remote I'm not certain that this will always make sure that the submodule is properly updated. This is something hoernchen/fixeria have to comment on. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Dec 2022 17:20:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by laforge

Attention is currently required from: Hoernchen, laforge. Hello Jenkins Builder, Hoernchen, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 to look at the new patch set (#2). Change subject: coverity: git pull --recursive / update submodules ...................................................................... coverity: git pull --recursive / update submodules osmo-trx has just started to use submodules, so let's add the related git commands here. Closes: OS#5846 Related: osmo-trx.git Change-Id I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e --- M coverity/prepare_source_Osmocom.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/30791/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by fixeria

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 27 Dec 2022 17:16:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... coverity: git pull --recursive / update submodules osmo-trx has just started to use submodules, so let's add the related git commands here. Related: osmo-trx.git Change-Id I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e --- M coverity/prepare_source_Osmocom.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/30791/1 diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 526e9d3..0ea829f 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -52,13 +52,13 @@ for proj in $PROJECTS $PROJECTS_DONT_BUILD_TEST; do if [ -d $proj ]; then if [ -z "$SRC_SKIP_FETCH" ]; then - (cd $proj && git fetch && git checkout -f -B master origin/master) + (cd $proj && git fetch && git checkout -f -B master origin/master && git submodule update --recursive --remote) fi if [ -n "$SRC_CLEAN" ]; then git -C "$proj" clean -ffxd fi else - git clone "$(osmo_git_clone_url "$proj")" + git clone --recursive "$(osmo_git_clone_url "$proj")" fi done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in libosmo-gprs[master]: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 ) Change subject: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI ...................................................................... osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI As per what's specified in 3GPP TS 48.018 section 11.3.9 Cell Identifier. Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa --- M include/osmocom/gprs/llc/llc_prim.h M tests/llc/llc_prim_test.c 2 files changed, 15 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 4f359d8..23b41cf 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -7,7 +7,7 @@ #include <osmocom/core/prim.h> #include <osmocom/core/utils.h> -#include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/gprs/llc/llc.h> /* Section 7.1.0 */ @@ -214,6 +214,11 @@ }; }; +struct osmo_gprs_llc_bssgp_prim_cell_id { + struct gprs_ra_id rai; + uint16_t ci; +}; + /* Parameters for OSMO_GPRS_LLC_BSSGP_* prims */ struct osmo_gprs_llc_bssgp_prim { /* Common fields */ @@ -236,7 +241,7 @@ } dl_unitdata_req; /* OSMO_GPRS_LLC_BSSGP_UL_UNITDATA | Ind */ struct { - struct gsm0808_cell_id cell_id; + struct osmo_gprs_llc_bssgp_prim_cell_id cell_id; /* TODO: MOCN specific parameters: * - Redirect attempt * - IMSI diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index 63f99aa..ab3bf65 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -144,14 +144,15 @@ struct osmo_gprs_llc_prim *llc_prim; const uint32_t tlli = 0xe1c5d364; int rc; - struct gsm0808_cell_id cell_id = { - .id_discr = CELL_IDENT_LAC_AND_CI, - .id = { - .lac_and_ci = { - .lac = 0x0304, - .ci = 0x9876, - }, + struct osmo_gprs_llc_bssgp_prim_cell_id cell_id = { + .rai = { + .mcc = 901, + .mnc = 70, + .mnc_3_digits = false, + .lac = 0x0304, + .rac = 0x01, }, + .ci = 0x9876, }; printf("==== %s() [start] ====\n", __func__); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa Gerrit-Change-Number: 30787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in libosmo-gprs[master]: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 ) Change subject: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa Gerrit-Change-Number: 30787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Dec 2022 17:05:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: coverity: add mstrx

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30790 ) Change subject: coverity: add mstrx ...................................................................... coverity: add mstrx Change-Id: Ie8f01e61905120c0e9b5db66c1b60b56d777657e --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmocom.sh 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/90/30790/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index da2244a..78275ca 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -115,7 +115,8 @@ --with-usrp1 \ --with-uhd \ --with-lms \ - --with-ipc + --with-ipc \ + --with-mstrx # OsmocomBB (without firmware) build_osmocombb diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 526e9d3..5e7cb42 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -58,7 +58,7 @@ git -C "$proj" clean -ffxd fi else - git clone "$(osmo_git_clone_url "$proj")" + git clone --recursive "$(osmo_git_clone_url "$proj")" fi done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie8f01e61905120c0e9b5db66c1b60b56d777657e Gerrit-Change-Number: 30790 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: Vty: Fixup config shown/written from vty

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30699 ) Change subject: Vty: Fixup config shown/written from vty ...................................................................... Vty: Fixup config shown/written from vty This commit fixes the following errors: Missing timeout param for mslookup. Fails to start reading a written config if an msc node is configured in the mslookup server. Places the individual msc node services in the top-level wildcard node due to incorrect indentation. * Add missing timeout param. * Add missing "ipa-name" part to mslookup-server-msc section. * Add one extra space indentation for msc services. This commit also adds a DEFINE for the default timeout value. Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 --- M include/osmocom/hlr/dgsm.h M src/dgsm.c M src/dgsm_vty.c M tests/test_nodes.vty 4 files changed, 29 insertions(+), 24 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hlr/dgsm.h b/include/osmocom/hlr/dgsm.h index cc8f3d2..1114fbe 100644 --- a/include/osmocom/hlr/dgsm.h +++ b/include/osmocom/hlr/dgsm.h @@ -25,6 +25,7 @@ #include <osmocom/gsupclient/cni_peer_id.h> #include <osmocom/gsupclient/gsup_req.h> +#define OSMO_DGSM_DEFAULT_RESULT_TIMEOUT_MS 2000 #define LOG_DGSM(imsi, level, fmt, args...) \ LOGP(DDGSM, level, "(IMSI-%s) " fmt, imsi, ##args) diff --git a/src/dgsm.c b/src/dgsm.c index cdd82a2..f96bca6 100644 --- a/src/dgsm.c +++ b/src/dgsm.c @@ -170,7 +170,7 @@ g_hlr->mslookup.server.local_attach_max_age = 60 * 60; - g_hlr->mslookup.client.result_timeout_milliseconds = 2000; + g_hlr->mslookup.client.result_timeout_milliseconds = OSMO_DGSM_DEFAULT_RESULT_TIMEOUT_MS; g_hlr->gsup_unit_name.unit_name = "HLR"; g_hlr->gsup_unit_name.serno = "unnamed-HLR"; diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c index 00a60ea..925545e 100644 --- a/src/dgsm_vty.c +++ b/src/dgsm_vty.c @@ -447,8 +447,8 @@ llist_for_each_entry(msc, &g_hlr->mslookup.server.local_site_services, entry) { if (!osmo_ipa_name_cmp(&mslookup_server_msc_wildcard, &msc->name)) continue; - vty_out(vty, " msc %s%s", osmo_ipa_name_to_str(&msc->name), VTY_NEWLINE); - config_write_msc_services(vty, " ", msc); + vty_out(vty, " msc ipa-name %s%s", osmo_ipa_name_to_str(&msc->name), VTY_NEWLINE); + config_write_msc_services(vty, " ", msc); } /* If the server is disabled, still output the above to not lose the service config. */ @@ -475,6 +475,10 @@ vty_out(vty, " mdns domain-suffix %s%s", g_hlr->mslookup.client.mdns.domain_suffix, VTY_NEWLINE); + if (g_hlr->mslookup.client.result_timeout_milliseconds != OSMO_DGSM_DEFAULT_RESULT_TIMEOUT_MS) + vty_out(vty, " timeout %u%s", + g_hlr->mslookup.client.result_timeout_milliseconds, + VTY_NEWLINE); } return CMD_SUCCESS; diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index bebe9a0..0f02f22 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -349,15 +349,15 @@ service foo.bar at 123.45.67.89 1011 service baz.bar at 121.31.41.5 1617 service baz.bar at a:b:c::d 1819 - msc MSC-1 - msc msc-901-70-23 - service foo.bar at 76.54.32.10 1234 - service baz.bar at 12.11.10.98 7654 - service baz.bar at dd:cc:bb::a 3210 - msc msc-901-70-42 - service foo.bar at 1.1.1.1 1111 - service baz.bar at 2.2.2.2 2222 - service baz.bar at 2222:2222:2222::2 2222 + msc ipa-name MSC-1 + msc ipa-name msc-901-70-23 + service foo.bar at 76.54.32.10 1234 + service baz.bar at 12.11.10.98 7654 + service baz.bar at dd:cc:bb::a 3210 + msc ipa-name msc-901-70-42 + service foo.bar at 1.1.1.1 1111 + service baz.bar at 2.2.2.2 2222 + service baz.bar at 2222:2222:2222::2 2222 client gateway-proxy 1.2.3.4 4222 mdns bind 239.192.23.42 4266 @@ -404,12 +404,12 @@ mdns bind 239.192.23.42 4266 service foo.bar at 123.45.67.89 1011 service baz.bar at 121.31.41.5 1617 - msc MSC-1 - msc msc-901-70-23 - service foo.bar at 76.54.32.10 1234 - service baz.bar at 12.11.10.98 7654 - msc msc-901-70-42 - service foo.bar at 1.1.1.1 1111 + msc ipa-name MSC-1 + msc ipa-name msc-901-70-23 + service foo.bar at 76.54.32.10 1234 + service baz.bar at 12.11.10.98 7654 + msc ipa-name msc-901-70-42 + service foo.bar at 1.1.1.1 1111 client mdns bind 239.192.23.42 4266 ... @@ -437,12 +437,12 @@ service foo.bar at 123.45.67.89 1011 service baz.bar at 121.31.41.5 1617 service gsup.hlr at 23.42.17.11 4223 - msc MSC-1 - msc msc-901-70-23 - service foo.bar at 76.54.32.10 1234 - service baz.bar at 12.11.10.98 7654 - msc msc-901-70-42 - service foo.bar at 1.1.1.1 1111 + msc ipa-name MSC-1 + msc ipa-name msc-901-70-23 + service foo.bar at 76.54.32.10 1234 + service baz.bar at 12.11.10.98 7654 + msc ipa-name msc-901-70-42 + service foo.bar at 1.1.1.1 1111 client mdns bind 239.192.23.42 4266 ... -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 Gerrit-Change-Number: 30699 Gerrit-PatchSet: 5 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: Vty: Fixup config shown/written from vty

by laforge

Attention is currently required from: neels, keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30699 ) Change subject: Vty: Fixup config shown/written from vty ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 Gerrit-Change-Number: 30699 Gerrit-PatchSet: 4 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 27 Dec 2022 17:03:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use osmo-iuh/master for asn1c

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30751 ) Change subject: jobs/master-builds: use osmo-iuh/master for asn1c ...................................................................... jobs/master-builds: use osmo-iuh/master for asn1c As discussed with Pau, let's build the "osmo-iuh/master" branch of our asn1c.git repository in jenkins. This branch is what we actually use for osmo-iuh and "master" should track upstream master. Related: OS#2435 Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 --- M jobs/master-builds.yml 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index fc713ed..0f22a77 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -48,12 +48,16 @@ trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org git_base_url: https://gerrit.osmocom.org + branches: + - master ssh: - docs_ftp.osmocom.org # in alphabetical order repos: - - asn1c + - asn1c: + branches: + - osmo-iuh/master - libasn1c: # Full triggers would be: @@ -518,8 +522,7 @@ scm: - git: url: "{git_base_url}/{repos}" - branches: - - 'origin/master' + branches: '{obj:branches}' refspec: name: wipe-workspace: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 Gerrit-Change-Number: 30751 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use osmo-iuh/master for asn1c

by fixeria

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30751 ) Change subject: jobs/master-builds: use osmo-iuh/master for asn1c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 Gerrit-Change-Number: 30751 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 27 Dec 2022 12:37:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30788 ) Change subject: start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env ...................................................................... start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env I am not using Debian, so I always have to edit this file in order to be able to run the testsuites. Keep using default paths for Debian, but allow redefining the TITAN_LIBRARY_PATH variable. Change-Id: I3778a52697a182dbac39de6c18a053832ef78d93 --- M start-testsuite.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/start-testsuite.sh b/start-testsuite.sh index b9324bb..a1e753d 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -47,7 +47,7 @@ # below is for the debian packages TTCN3_BIN_DIR="${TTCN3_BIN_DIR:-/usr/bin}" -TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +TITAN_LIBRARY_PATH="${TITAN_LIBRARY_PATH:-/usr/lib/titan:/usr/ttcn3/lib}" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" "$TTCN3_BIN_DIR/ttcn3_start" $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30788 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: I3778a52697a182dbac39de6c18a053832ef78d93 Gerrit-Change-Number: 30788 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF"

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 ) Change subject: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF" ...................................................................... BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF" Since [1] was merged, sending the L1CTL_DM_REL_REQ message alone is not enough to be able to tune back to BCCH. We also need to send L1CTL_RESET_REQ, so the trxcon's state is reset properly. This patch fixes the following testcases: * TC_sacch_chan_act_ho_async, * TC_sacch_chan_act_ho_sync, * TC_conn_fail_crit. Change-Id: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Related: [1] I5bbe6ca4cc6299f9faf343822c992a6872a45081 (osmocom-bb.git) --- M bts/BTS_Tests.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9baee40..25e7952 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1506,6 +1506,7 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_L1CTL_RESET(L1CTL); /* Tune back to CCCH/BCCH */ f_l1_tune(L1CTL); @@ -1586,6 +1587,7 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_L1CTL_RESET(L1CTL); /* Tune back to CCCH/BCCH */ f_l1_tune(L1CTL); @@ -1614,6 +1616,7 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_L1CTL_RESET(L1CTL); /* Tune back to CCCH/BCCH */ f_l1_tune(L1CTL); @@ -1641,6 +1644,7 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_L1CTL_RESET(L1CTL); /* Tune back to CCCH/BCCH */ f_l1_tune(L1CTL); @@ -3944,7 +3948,8 @@ f_est_dchan(); f_sleep(2.0); - L1CTL.send(ts_L1CTL_DM_REL_REQ(g_chan_nr)); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_L1CTL_RESET(L1CTL); f_l1_tune(L1CTL); /* tune back to BCCH */ timer T := 40.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 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: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Gerrit-Change-Number: 30789 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30788 ) Change subject: start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30788 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: I3778a52697a182dbac39de6c18a053832ef78d93 Gerrit-Change-Number: 30788 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Dec 2022 09:45:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF"

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 ) Change subject: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 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: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Gerrit-Change-Number: 30789 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Dec 2022 09:45:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-gprs[master]: sndcp: Initial libosmo-gprs-sndcp support

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30490 ) Change subject: sndcp: Initial libosmo-gprs-sndcp support ...................................................................... Patch Set 12: Code-Review-1 (5 comments) File include/osmocom/gprs/sndcp/sndcp.h: https://gerrit.osmocom.org/c/libosmo-gprs/+/30490/comment/faa04f12_8862d943 PS12, Line 8: osmocom/core/msgb.h You're not using msgb API in this file, why including it here? https://gerrit.osmocom.org/c/libosmo-gprs/+/30490/comment/a711d9cf_f7b8ed3b PS12, Line 13: GPRS_ missing OSMO_ prefix in public API File include/osmocom/gprs/sndcp/sndcp_prim.h: https://gerrit.osmocom.org/c/libosmo-gprs/+/30490/comment/1c613d94_56746455 PS12, Line 117: OSMO_GPRS_SNDCP_BSSGP_ OSMO_GPRS_SNDCP_SNSM_ File tests/sndcp/Makefile.am: https://gerrit.osmocom.org/c/libosmo-gprs/+/30490/comment/df0dd715_afe7bd72 PS12, Line 53: $(NULL) " No newline at end of revision file. " File tests/testsuite.at: https://gerrit.osmocom.org/c/libosmo-gprs/+/30490/comment/f2a9aeb4_d0bc99d8 PS12, Line 56: AT_CLEANUP " No newline at end of revision file. " -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie05b5d721cf0a6147ed45c1feb75ad829865252b Gerrit-Change-Number: 30490 Gerrit-PatchSet: 12 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Dec 2022 15:37:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-gprs[master]: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 ) Change subject: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa Gerrit-Change-Number: 30787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Dec 2022 15:15:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add OML tests for bts_setup_ramp

by lynxis lazus

Attention is currently required from: fixeria. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30356 ) Change subject: BSC_Tests: add OML tests for bts_setup_ramp ...................................................................... Patch Set 2: (1 comment) File bsc/BSC_Tests_OML.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30356/comment/842af31f_74be… PS1, Line 3: OsmoBTS > OsmoBSC Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30356 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: I0934ea26db359b0a6649c613f01de134a3a372ee Gerrit-Change-Number: 30356 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Dec 2022 14:09:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: osmo-bts: add simple run_fake_trx.sh

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30700 ) Change subject: osmo-bts: add simple run_fake_trx.sh ...................................................................... osmo-bts: add simple run_fake_trx.sh Most BTS_Tests require to run fake_trx. Add a simple run_fake_trx.sh script when running these test without docker. Change-Id: Ie3a68931bd52f55570409bb35962cebbfd58d168 --- A bts/run_fake_trx.sh 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/run_fake_trx.sh b/bts/run_fake_trx.sh new file mode 100755 index 0000000..2209972 --- /dev/null +++ b/bts/run_fake_trx.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# Most BTS_Tests require to have fake_trx running. +# fake trx is part of osmo-trx +FAKE_TRX_DIR="${FAKE_TRX_DIR:-../../osmo-trx/osmocom-bb/src/target/trx_toolkit}" + +if [ -n "$FAKE_TRX_DIR" ] ; then + cd "$FAKE_TRX_DIR" +fi + +exec ./fake_trx.py --trx TRX1@127.0.0.1:5700/1 --trx TRX2@127.0.0.1:5700/2 --trx TRX3@127.0.0.1:5700/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30700 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: Ie3a68931bd52f55570409bb35962cebbfd58d168 Gerrit-Change-Number: 30700 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by lynxis lazus

Attention is currently required from: osmith, pespin, fixeria, msuraev. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 ) Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/sgsn/gprs_sndcp.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/3ce4c788_f10b78cc PS4, Line 44: > It's better to keep the empty line separating includes from defines - makes it easier to read. +1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Dec 2022 14:07:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Create new specific file for BSSGP code

by lynxis lazus

Attention is currently required from: osmith, pespin, fixeria. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 ) Change subject: Create new specific file for BSSGP code ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 Gerrit-Change-Number: 30784 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Dec 2022 14:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Rename gprs_gb.[c,h] -> gprs_ns.[c,h]

by lynxis lazus

Attention is currently required from: osmith, pespin, fixeria. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 ) Change subject: Rename gprs_gb.[c,h] -> gprs_ns.[c,h] ...................................................................... Patch Set 4: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-sgsn/+/30786/comment/30ab7467_9d9dadaa PS4, Line 8: A simple commit description it is all NS code would be great and no gb related code. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 Gerrit-Change-Number: 30786 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Dec 2022 14:05:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF"

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 to look at the new patch set (#3). Change subject: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF" ...................................................................... BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF" Since [1] was merged, sending the L1CTL_DM_REL_REQ message alone is not enough to be able to tune back to BCCH. We also need to send L1CTL_RESET_REQ, so the trxcon's state is reset properly. This patch fixes the following testcases: * TC_sacch_chan_act_ho_async, * TC_sacch_chan_act_ho_sync, * TC_conn_fail_crit. Change-Id: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Related: [1] I5bbe6ca4cc6299f9faf343822c992a6872a45081 (osmocom-bb.git) --- M bts/BTS_Tests.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/30789/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 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: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Gerrit-Change-Number: 30789 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF"

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 to look at the new patch set (#2). Change subject: BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF" ...................................................................... BTS_Tests: fix "Timeout waiting for L1CTL_FBSB_CONF" Since [1] was merged, sending the L1CTL_DM_REL_REQ message alone is not enough to be able to tune back to BCCH. We also need to send L1CTL_RESET_REQ, so the trxcon's state is reset properly. This patch fixes the following testcases: * TC_sacch_chan_act_ho_async, * TC_sacch_chan_act_ho_sync, * TC_conn_fail_crit. Change-Id: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Related: [1] I5bbe6ca4cc6299f9faf343822c992a6872a45081 (osmocom-bb.git) --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/30789/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 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: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Gerrit-Change-Number: 30789 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_conn_fail_crit: send L1CTL RESET.req

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 ) Change subject: BTS_Tests: fix TC_conn_fail_crit: send L1CTL RESET.req ...................................................................... BTS_Tests: fix TC_conn_fail_crit: send L1CTL RESET.req Since [1] was merged, sending the L1CTL_DM_REL_REQ message alone is not enough to be able to tune back to BCCH. We also need to send L1CTL_RESET_REQ, so the trxcon's state is reset properly. Change-Id: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Related: [1] I5bbe6ca4cc6299f9faf343822c992a6872a45081 (osmocom-bb.git) --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/30789/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9baee40..57c2397 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3944,7 +3944,8 @@ f_est_dchan(); f_sleep(2.0); - L1CTL.send(ts_L1CTL_DM_REL_REQ(g_chan_nr)); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_L1CTL_RESET(L1CTL); f_l1_tune(L1CTL); /* tune back to BCCH */ timer T := 40.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30789 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: I07192e8a3127f8d9557a4b8aac3ca002f511a1d5 Gerrit-Change-Number: 30789 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30788 ) Change subject: start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env ...................................................................... start-testsuite.sh: allow redefining TITAN_LIBRARY_PATH from env I am not using Debian, so I always have to edit this file in order to be able to run the testsuites. Keep using default paths for Debian, but allow redefining the TITAN_LIBRARY_PATH variable. Change-Id: I3778a52697a182dbac39de6c18a053832ef78d93 --- M start-testsuite.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/30788/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index b9324bb..a1e753d 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -47,7 +47,7 @@ # below is for the debian packages TTCN3_BIN_DIR="${TTCN3_BIN_DIR:-/usr/bin}" -TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +TITAN_LIBRARY_PATH="${TITAN_LIBRARY_PATH:-/usr/lib/titan:/usr/ttcn3/lib}" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" "$TTCN3_BIN_DIR/ttcn3_start" $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30788 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: I3778a52697a182dbac39de6c18a053832ef78d93 Gerrit-Change-Number: 30788 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Rename gprs_gb.[c,h] -> gprs_ns.[c,h]

by laforge

Attention is currently required from: osmith, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 ) Change subject: Rename gprs_gb.[c,h] -> gprs_ns.[c,h] ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 Gerrit-Change-Number: 30786 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 24 Dec 2022 09:41:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by laforge

Attention is currently required from: osmith, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 ) Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 24 Dec 2022 09:41:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Create new specific file for BSSGP code

by laforge

Attention is currently required from: osmith, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 ) Change subject: Create new specific file for BSSGP code ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 Gerrit-Change-Number: 30784 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 24 Dec 2022 09:40:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: osmo_mdns_rfc_record/question_encode: remove ctx

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30778 ) Change subject: osmo_mdns_rfc_record/question_encode: remove ctx ...................................................................... osmo_mdns_rfc_record/question_encode: remove ctx Remove the ctx argument to both functions, as it's not used anymore. Related: OS#5821 Change-Id: I5e3dd18bf08f7aa42f49c262e13250778ea0c6a2 --- M include/osmocom/mslookup/mdns_rfc.h M src/mslookup/mdns_msg.c M src/mslookup/mdns_rfc.c M tests/mslookup/mdns_test.c 4 files changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h index 4aaee96..364b4d3 100644 --- a/include/osmocom/mslookup/mdns_rfc.h +++ b/include/osmocom/mslookup/mdns_rfc.h @@ -102,9 +102,9 @@ void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr); int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr); -int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst); +int osmo_mdns_rfc_question_encode(struct msgb *msg, const struct osmo_mdns_rfc_question *qst); struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len); -int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec); +int osmo_mdns_rfc_record_encode(struct msgb *msg, const struct osmo_mdns_rfc_record *rec); struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, size_t *record_len); diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c index 78ea67a..fb291e1 100644 --- a/src/mslookup/mdns_msg.c +++ b/src/mslookup/mdns_msg.c @@ -40,7 +40,7 @@ qst.domain = req->domain; qst.qtype = req->type; qst.qclass = OSMO_MDNS_RFC_CLASS_IN; - if (osmo_mdns_rfc_question_encode(ctx, msg, &qst) != 0) + if (osmo_mdns_rfc_question_encode(msg, &qst) != 0) return -EINVAL; return 0; @@ -106,7 +106,7 @@ rec.rdlength = ans_record->length; rec.rdata = ans_record->data; - if (osmo_mdns_rfc_record_encode(ctx, msg, &rec) != 0) + if (osmo_mdns_rfc_record_encode(msg, &rec) != 0) return -EINVAL; } diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c index 7bfd328..8a8cdec 100644 --- a/src/mslookup/mdns_rfc.c +++ b/src/mslookup/mdns_rfc.c @@ -69,7 +69,7 @@ /*! Encode question section (RFC 1035 4.1.2). * \param[in] msgb mesage buffer to which the encoded data will be appended. */ -int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst) +int osmo_mdns_rfc_question_encode(struct msgb *msg, const struct osmo_mdns_rfc_question *qst) { uint8_t *buf; size_t buf_len; @@ -125,7 +125,7 @@ /*! Encode one resource record (RFC 1035 4.1.3). * \param[in] msgb mesage buffer to which the encoded data will be appended. */ -int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec) +int osmo_mdns_rfc_record_encode(struct msgb *msg, const struct osmo_mdns_rfc_record *rec) { uint8_t *buf; size_t buf_len; diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c index 3e5a230..e9fc1fb 100644 --- a/tests/mslookup/mdns_test.c +++ b/tests/mslookup/mdns_test.c @@ -147,7 +147,7 @@ struct msgb *msg = msgb_alloc(4096, "dns_test"); PRINT_QST(&in, "in"); - assert(osmo_mdns_rfc_question_encode(ctx, msg, &in) == 0); + assert(osmo_mdns_rfc_question_encode(msg, &in) == 0); fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); out = osmo_mdns_rfc_question_decode(ctx, msgb_data(msg), msgb_length(msg)); assert(out); @@ -211,7 +211,7 @@ size_t record_len; PRINT_REC(&in, "in"); - assert(osmo_mdns_rfc_record_encode(ctx, msg, &in) == 0); + assert(osmo_mdns_rfc_record_encode(msg, &in) == 0); fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); out = osmo_mdns_rfc_record_decode(ctx, msgb_data(msg), msgb_length(msg), &record_len); fprintf(stderr, "record_len: %lu\n", record_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5e3dd18bf08f7aa42f49c262e13250778ea0c6a2 Gerrit-Change-Number: 30778 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-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: mslookup: use apn functions from libosmocore

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30777 ) Change subject: mslookup: use apn functions from libosmocore ...................................................................... mslookup: use apn functions from libosmocore Use the apn functions from libosmocore to encode and decode qnames to avoid code duplication and to avoid unnecessary dynamic allocation. The unit tests for encoding and decoding rfc_question / rfc_record are still passing and have the same output. Fixes: OS#5821 Change-Id: I09d3c617fd6eb4075084ee106d3f3c5803861d2f --- M include/osmocom/mslookup/mdns_rfc.h M src/mslookup/mdns_rfc.c M tests/mslookup/mdns_test.c M tests/mslookup/mdns_test.err 4 files changed, 34 insertions(+), 339 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h index 9d6be5a..4aaee96 100644 --- a/include/osmocom/mslookup/mdns_rfc.h +++ b/include/osmocom/mslookup/mdns_rfc.h @@ -99,9 +99,6 @@ uint8_t *rdata; }; -char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain); -char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_len); - void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr); int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr); diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c index eddba30..7bfd328 100644 --- a/src/mslookup/mdns_rfc.c +++ b/src/mslookup/mdns_rfc.c @@ -27,92 +27,10 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/bitvec.h> #include <osmocom/core/logging.h> +#include <osmocom/gsm/apn.h> #include <osmocom/mslookup/mdns_rfc.h> /* - * Encode/decode IEs - */ - -/*! Encode a domain string as qname (RFC 1035 4.1.2). - * \param[in] domain multiple labels separated by dots, e.g. "sip.voice.1234.msisdn". - * \returns allocated buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...), NULL on error. - */ -char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain) -{ - char *domain_dup; - char *domain_iter; - char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 2] = ""; /* len(qname) is len(domain) +1 */ - struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; - char *label; - - if (strlen(domain) > OSMO_MDNS_RFC_MAX_NAME_LEN) - return NULL; - - domain_iter = domain_dup = talloc_strdup(ctx, domain); - while ((label = strsep(&domain_iter, "."))) { - size_t len = strlen(label); - - /* Empty domain, dot at start, two dots in a row, or ending with a dot */ - if (!len) - goto error; - - OSMO_STRBUF_PRINTF(sb, "%c%s", (char)len, label); - } - - talloc_free(domain_dup); - return talloc_strdup(ctx, buf); - -error: - talloc_free(domain_dup); - return NULL; -} - -/*! Decode a domain string from a qname (RFC 1035 4.1.2). - * \param[in] qname buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...) - * \param[in] qname_max_len amount of bytes that can be read at most from the memory location that qname points to. - * \returns allocated buffer with domain string, multiple labels separated by dots (e.g. "sip.voice.1234.msisdn"), - * NULL on error. - */ -char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_len) -{ - const char *next_label, *qname_end = qname + qname_max_len; - char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 1]; - int i = 0; - - if (qname_max_len < 1) - return NULL; - - while (*qname) { - size_t len; - - if (i >= qname_max_len) - return NULL; - - len = *qname; - next_label = qname + len + 1; - - if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) - return NULL; - - if (i) { - /* Two dots in a row is not allowed */ - if (buf[i - 1] == '.') - return NULL; - - buf[i] = '.'; - i++; - } - - memcpy(buf + i, qname + 1, len); - i += len; - qname = next_label; - } - buf[i] = '\0'; - - return talloc_strdup(ctx, buf); -} - -/* * Encode/decode message sections */ @@ -153,18 +71,15 @@ */ int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst) { - char *qname; - size_t qname_len; - uint8_t *qname_buf; + uint8_t *buf; + size_t buf_len; /* qname */ - qname = osmo_mdns_rfc_qname_encode(ctx, qst->domain); - if (!qname) + buf_len = strlen(qst->domain) + 1; + buf = msgb_put(msg, buf_len); + if (osmo_apn_from_str(buf, buf_len, qst->domain) < 0) return -EINVAL; - qname_len = strlen(qname) + 1; - qname_buf = msgb_put(msg, qname_len); - memcpy(qname_buf, qname, qname_len); - talloc_free(qname); + msgb_put_u8(msg, 0x00); /* qtype and qclass */ msgb_put_u16(msg, qst->qtype); @@ -182,21 +97,25 @@ if (data_len < 6) return NULL; - /* qname */ ret = talloc_zero(ctx, struct osmo_mdns_rfc_question); if (!ret) return NULL; - ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, qname_len); - if (!ret->domain) { - talloc_free(ret); - return NULL; - } + + /* qname */ + ret->domain = talloc_size(ret, qname_len - 1); + if (!ret->domain) + goto error; + if (!osmo_apn_to_str(ret->domain, data, qname_len - 1)) + goto error; /* qtype and qclass */ ret->qtype = osmo_load16be(data + qname_len); ret->qclass = osmo_load16be(data + qname_len + 2); return ret; +error: + talloc_free(ret); + return NULL; } /* @@ -208,18 +127,15 @@ */ int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec) { - char *name; - size_t name_len; uint8_t *buf; + size_t buf_len; /* name */ - name = osmo_mdns_rfc_qname_encode(ctx, rec->domain); - if (!name) + buf_len = strlen(rec->domain) + 1; + buf = msgb_put(msg, buf_len); + if (osmo_apn_from_str(buf, buf_len, rec->domain) < 0) return -EINVAL; - name_len = strlen(name) + 1; - buf = msgb_put(msg, name_len); - memcpy(buf, name, name_len); - talloc_free(name); + msgb_put_u8(msg, 0x00); /* type, class, ttl, rdlength */ msgb_put_u16(msg, rec->type); @@ -240,16 +156,23 @@ struct osmo_mdns_rfc_record *ret; size_t name_len; + /* name length: represented as a series of labels, and terminated by a + * label with zero length (RFC 1035 3.3). A label with zero length is a + * NUL byte. */ + name_len = strnlen((const char *)data, data_len - 10) + 1; + if (data[name_len]) + return NULL; + + /* allocate ret + ret->domain */ ret = talloc_zero(ctx, struct osmo_mdns_rfc_record); if (!ret) return NULL; - - /* name */ - ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, data_len - 10); + ret->domain = talloc_size(ctx, name_len - 1); if (!ret->domain) goto error; - name_len = strlen(ret->domain) + 2; - if (name_len + 10 > data_len) + + /* name */ + if (!osmo_apn_to_str(ret->domain, data, name_len - 1)) goto error; /* type, class, ttl, rdlength */ diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c index 7b26f0f..3e5a230 100644 --- a/tests/mslookup/mdns_test.c +++ b/tests/mslookup/mdns_test.c @@ -32,148 +32,6 @@ size_t qname_max_len; /* default: strlen(qname) + 1 */ }; -static const struct qname_enc_dec_test qname_enc_dec_test_data[] = { - { - /* OK: typical mslookup domain */ - .domain = "hlr.1234567.imsi", - .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", - }, - { - /* Wrong format: double dot */ - .domain = "hlr..imsi", - .qname = NULL, - }, - { - /* Wrong format: double dot */ - .domain = "hlr", - .qname = "\x03hlr\0\x03imsi", - }, - { - /* Wrong format: dot at end */ - .domain = "hlr.", - .qname = NULL, - }, - { - /* Wrong format: dot at start */ - .domain = ".hlr", - .qname = NULL, - }, - { - /* Wrong format: empty */ - .domain = "", - .qname = NULL, - }, - { - /* OK: maximum length */ - .domain = - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "12345" - , - .qname = - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\x05" "12345" - }, - { - /* Error: too long domain */ - .domain = - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "12345toolong" - , - .qname = NULL, - }, - { - /* Error: too long qname */ - .domain = NULL, - .qname = - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - }, - { - /* Error: wrong token length in qname */ - .domain = NULL, - .qname = "\x03" "hlr" "\x07" "1234567" "\x05" "imsi", - }, - { - /* Error: wrong token length in qname */ - .domain = NULL, - .qname = "\x02" "hlr" "\x07" "1234567" "\x04" "imsi", - }, - { - /* Wrong format: token length at end of qname */ - .domain = NULL, - .qname = "\x03hlr\x03", - }, - { - /* Error: overflow in label length */ - .domain = NULL, - .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", - .qname_max_len = 17, - }, -}; - -void test_enc_dec_rfc_qname(void *ctx) -{ - char quote_buf[300]; - int i; - - fprintf(stderr, "-- %s --\n", __func__); - - for (i = 0; i < ARRAY_SIZE(qname_enc_dec_test_data); i++) { - const struct qname_enc_dec_test *t = &qname_enc_dec_test_data[i]; - char *res; - - if (t->domain) { - fprintf(stderr, "domain: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); - fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); - res = osmo_mdns_rfc_qname_encode(ctx, t->domain); - fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); - if (t->qname == res || (t->qname && res && strcmp(t->qname, res) == 0)) - fprintf(stderr, "=> OK\n"); - else - fprintf(stderr, "=> ERROR\n"); - if (res) - talloc_free(res); - fprintf(stderr, "\n"); - } - - if (t->qname) { - size_t qname_max_len = t->qname_max_len; - if (qname_max_len) - fprintf(stderr, "qname_max_len: %lu\n", qname_max_len); - else - qname_max_len = strlen(t->qname) + 1; - - fprintf(stderr, "qname: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); - fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); - res = osmo_mdns_rfc_qname_decode(ctx, t->qname, qname_max_len); - fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); - if (t->domain == res || (t->domain && res && strcmp(t->domain, res) == 0)) - fprintf(stderr, "=> OK\n"); - else - fprintf(stderr, "=> ERROR\n"); - if (res) - talloc_free(res); - fprintf(stderr, "\n"); - } - } -} - #define PRINT_HDR(hdr, name) \ fprintf(stderr, "header %s:\n" \ ".id = %i\n" \ @@ -589,7 +447,6 @@ log_set_print_category_hex(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); - test_enc_dec_rfc_qname(ctx); test_enc_dec_rfc_header(); test_enc_dec_rfc_header_einval(); test_enc_dec_rfc_question(ctx); diff --git a/tests/mslookup/mdns_test.err b/tests/mslookup/mdns_test.err index 51e5afe..0d650be 100644 --- a/tests/mslookup/mdns_test.err +++ b/tests/mslookup/mdns_test.err @@ -1,85 +1,3 @@ --- test_enc_dec_rfc_qname -- -domain: "hlr.1234567.imsi" -exp: "\3hlr\a1234567\4imsi" -res: "\3hlr\a1234567\4imsi" -=> OK - -qname: "\3hlr\a1234567\4imsi" -exp: "hlr.1234567.imsi" -res: "hlr.1234567.imsi" -=> OK - -domain: "hlr..imsi" -exp: NULL -res: NULL -=> OK - -domain: "hlr" -exp: "\3hlr" -res: "\3hlr" -=> OK - -qname: "\3hlr" -exp: "hlr" -res: "hlr" -=> OK - -domain: "hlr." -exp: NULL -res: NULL -=> OK - -domain: ".hlr" -exp: NULL -res: NULL -=> OK - -domain: "" -exp: NULL -res: NULL -=> OK - -domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -exp: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -res: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -=> OK - -qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -exp: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -res: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -=> OK - -domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345toolong" -exp: NULL -res: NULL -=> OK - -qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\ -exp: NULL -res: NULL -=> OK - -qname: "\3hlr\a1234567\5imsi" -exp: NULL -res: NULL -=> OK - -qname: "\2hlr\a1234567\4imsi" -exp: NULL -res: NULL -=> OK - -qname: "\3hlr\3" -exp: NULL -res: NULL -=> OK - -qname_max_len: 17 -qname: "\3hlr\a1234567\4imsi" -exp: NULL -res: NULL -=> OK - -- test_enc_dec_rfc_header -- header in: .id = 1337 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I09d3c617fd6eb4075084ee106d3f3c5803861d2f Gerrit-Change-Number: 30777 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-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: osmo_mdns_rfc_record/question_encode: remove ctx

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30778 ) Change subject: osmo_mdns_rfc_record/question_encode: remove ctx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5e3dd18bf08f7aa42f49c262e13250778ea0c6a2 Gerrit-Change-Number: 30778 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, 24 Dec 2022 09:39:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: mslookup: use apn functions from libosmocore

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30777 ) Change subject: mslookup: use apn functions from libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I09d3c617fd6eb4075084ee106d3f3c5803861d2f Gerrit-Change-Number: 30777 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, 24 Dec 2022 09:39:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: fix: properly check whether to enable ms-trx

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30783 ) Change subject: configure.ac: fix: properly check whether to enable ms-trx ...................................................................... configure.ac: fix: properly check whether to enable ms-trx Condition 'test ENABLE_MS_TRX' is always true because 'ENABLE_MS_TRX' is a string literal, not a variable... Because of this, automeke will unconditionally try to configure the submodule. Change-Id: Icbb9278c688bfe506d5ad726f16a6c200572de1b Fixes: b7253c6fdc88a3e2e0c8b441dc3c34dfb1c15d24 Related: OS#5599 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 699fb32..ff1ae8b 100644 --- a/configure.ac +++ b/configure.ac @@ -334,7 +334,7 @@ AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) -if test ENABLE_MS_TRX; then +if test "x$with_mstrx" = "xyes"; then AC_MSG_NOTICE(["Enabling ms-trx..."]) AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) fi -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icbb9278c688bfe506d5ad726f16a6c200572de1b Gerrit-Change-Number: 30783 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: fix: properly check whether to enable ms-trx

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30783 ) Change subject: configure.ac: fix: properly check whether to enable ms-trx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icbb9278c688bfe506d5ad726f16a6c200572de1b Gerrit-Change-Number: 30783 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 24 Dec 2022 09:38:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: mstrx: add proper autoconf check

by laforge

laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30782 ) Change subject: mstrx: add proper autoconf check ...................................................................... Abandoned https://gerrit.osmocom.org/c/osmo-trx/+/30783 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0f5d0547d029ad59b166123026afc2162f611778 Gerrit-Change-Number: 30782 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 year, 4 months

1
0
0 0

2024

2023

2022

gerrit-log December 2022