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

[M] Change in osmo-bts[master]: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH
by dexter 20 Jul '23

20 Jul '23

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/33829 to look at the new patch set (#3). Change subject: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH ...................................................................... pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH When the SAPI PCU_IF_SAPI_PCH_DT is used, messages should include an IMSI. However, there may be situations in the PCU where no IMSI is available when sending an IMMEDIATE ASSIGNMENT through the PCH. In those cases we cannot calculate the paging group. Even though it would work to use the paging group 0, it is more appropriate to send the IMMEDIATE ASSIGNMENT through the AGCH then. As a background information to this it should be noted that this works because the IMSI is commonly not known during a GMM ATTACH REQUEST. In this phase the MS is in non-DRX mode, which means that it listens on all CCCH blocks (PCH and AGCH) See also: 3gpp TS 44.060, section 5.5.1.5 and 3gpp TS 45.002, section 6.5.3, 6.5.6 Related: OS#6097 Change-Id: Iaa3e5cdcf86578821e149b3e23482a0bcee19f7b --- M include/osmo-bts/bts.h M src/common/bts.c M src/common/pcu_sock.c 3 files changed, 69 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/29/33829/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaa3e5cdcf86578821e149b3e23482a0bcee19f7b Gerrit-Change-Number: 33829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in docker-playground[master]: open5gs-master: use DISTRO variable
by osmith 20 Jul '23

20 Jul '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33805 ) Change subject: open5gs-master: use DISTRO variable ...................................................................... open5gs-master: use DISTRO variable Instead of hardcoding bullseye, use the DISTRO variable so it now defaults to bookworm. Related: OS#6057 Change-Id: Ia392de80ee1f0844563f08a6dc775678ef6b263f --- M open5gs-master/Dockerfile 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 878c655..23ba38b 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -1,7 +1,7 @@ ARG REGISTRY=docker.io ARG USER -FROM $USER/debian-bullseye-build - +ARG DISTRO +FROM $USER/$DISTRO-build RUN apt-get update && \ apt-get upgrade -y && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia392de80ee1f0844563f08a6dc775678ef6b263f Gerrit-Change-Number: 33805 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: open5gs-master: use DISTRO variable
by fixeria 20 Jul '23

20 Jul '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33805 ) Change subject: open5gs-master: use DISTRO variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia392de80ee1f0844563f08a6dc775678ef6b263f Gerrit-Change-Number: 33805 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 08:04:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: emit DATA.cnf early (on bid=0)
by osmith 20 Jul '23

20 Jul '23

Attention is currently required from: laforge, fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33749 ) Change subject: trxcon/l1sched: emit DATA.cnf early (on bid=0) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie09a24cd950a93edd871a9fbc5b47ec96c24cceb Gerrit-Change-Number: 33749 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 08:02:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: lchan_select: fix lchan selection for GSM48_CMODE_DATA_{14k5,12k0}
by fixeria 20 Jul '23

20 Jul '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33830 ) Change subject: lchan_select: fix lchan selection for GSM48_CMODE_DATA_{14k5,12k0} ...................................................................... lchan_select: fix lchan selection for GSM48_CMODE_DATA_{14k5,12k0} Change-Id: I271ebf7e64e3d0861586e9bc63bec113cb5fb410 Fixes: d5eb0f1b5 "lchan_select: chan_mode_to_chan_type: support CSD" Related: OS#4393 --- M src/osmo-bsc/lchan_select.c 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 1e12d96..ad5c984 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -178,14 +178,14 @@ return GSM_LCHAN_NONE; } case GSM48_CMODE_SPEECH_EFR: - /* EFR works over FR channels only */ + case GSM48_CMODE_DATA_14k5: + case GSM48_CMODE_DATA_12k0: + /* these rates work over full-rate channels only */ if (chan_rate != CH_RATE_FULL) return GSM_LCHAN_NONE; /* fall through */ case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_AMR: - case GSM48_CMODE_DATA_14k5: - case GSM48_CMODE_DATA_12k0: case GSM48_CMODE_DATA_6k0: case GSM48_CMODE_DATA_3k6: switch (chan_rate) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I271ebf7e64e3d0861586e9bc63bec113cb5fb410 Gerrit-Change-Number: 33830 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in osmo-bts[master]: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode')
by osmith 20 Jul '23

20 Jul '23

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33832 ) Change subject: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode') ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: How about adding tests for _encode and _decode? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e3701ad52d5d428fd02caff037881045f2d0a02 Gerrit-Change-Number: 33832 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 07:44:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: lchan_select: fix lchan selection for GSM48_CMODE_DATA_{14k5,12k0}
by osmith 20 Jul '23

20 Jul '23

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33830 ) Change subject: lchan_select: fix lchan selection for GSM48_CMODE_DATA_{14k5,12k0} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I271ebf7e64e3d0861586e9bc63bec113cb5fb410 Gerrit-Change-Number: 33830 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 07:25:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: configure: add --enable-meas-udp2db/pcap2db/vis
by osmith 20 Jul '23

20 Jul '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33681 ) Change subject: configure: add --enable-meas-udp2db/pcap2db/vis ...................................................................... configure: add --enable-meas-udp2db/pcap2db/vis Do not build these utils implicitly if libsqlite3/libpcap/libcdk are installed. Add configure flags for explicit building and fail if dependencies are missing. Keep behavior in deb and rpm packaging: * deb: build meas_vis * rpm: build none of these (libcdk dependency for meas_vis is not available in most rpm-based distributions we build for) Fixes: OS#5173 Depends: docker-playground I015b6d7cb834e99ea5d04206ba5f8c519c4e6af1 Change-Id: I8b3d5efb769437a5d3036e1e627b8d477275d93e --- M configure.ac M contrib/jenkins.sh M debian/rules M src/utils/Makefile.am 4 files changed, 64 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index b3cc09d..ac3c534 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,24 @@ AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) +# Enable/disable osmo-meas-udp2db +AC_ARG_ENABLE([meas-udp2db], [AS_HELP_STRING([--enable-meas-udp2db], [Build osmo-meas-udp2db: listen to meas_feed on UDP and write it to an sqlite3 database [default=no]])], + [osmo_ac_meas_udp2db="$enableval"],[osmo_ac_meas_udp2db="no"]) +AM_CONDITIONAL(BUILD_MEAS_UDP2DB, test "x$osmo_ac_meas_udp2db" = "xyes") +AC_SUBST(osmo_ac_meas_udp2db) + +# Enable/disable osmo-meas-pcap2db +AC_ARG_ENABLE([meas-pcap2db], [AS_HELP_STRING([--enable-meas-pcap2db], [Build osmo-meas-pcap2db: read PCAP file with meas_feed data and write it to an sqlite3 database [default=no]])], + [osmo_ac_meas_pcap2db="$enableval"],[osmo_ac_meas_pcap2db="no"]) +AM_CONDITIONAL(BUILD_MEAS_PCAP2DB, test "x$osmo_ac_meas_pcap2db" = "xyes") +AC_SUBST(osmo_ac_meas_pcap2db) + +# Enable/disable meas_vis +AC_ARG_ENABLE([meas-vis], [AS_HELP_STRING([--enable-meas-vis], [Build meas_vis: curses-visualization of measurements [default=no]])], + [osmo_ac_meas_vis="$enableval"],[osmo_ac_meas_vis="no"]) +AM_CONDITIONAL(BUILD_MEAS_VIS, test "x$osmo_ac_meas_vis" = "xyes") +AC_SUBST(osmo_ac_meas_vis) + dnl checks for libraries PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0) @@ -55,19 +73,15 @@ dnl checks for header files AC_HEADER_STDC -found_pcap=yes -AC_CHECK_HEADERS(pcap/pcap.h,,found_pcap=no) -AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) - -found_cdk=yes -AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no) -AM_CONDITIONAL(HAVE_LIBCDK, test "$found_cdk" = yes) - -found_sqlite3=yes -PKG_CHECK_MODULES(SQLITE3, sqlite3, ,found_sqlite3=no) -AM_CONDITIONAL(HAVE_SQLITE3, test "$found_sqlite3" = yes) -AC_SUBST(found_sqlite3) - +if test "$osmo_ac_meas_pcap2db" = "yes" || test "$osmo_ac_meas_udp2db" = "yes"; then + PKG_CHECK_MODULES(SQLITE3, sqlite3) +fi +if test "$osmo_ac_meas_pcap2db" = "yes"; then + AC_CHECK_HEADERS(pcap/pcap.h, [], AC_MSG_ERROR(Unable to find libpcap)) +fi +if test "$osmo_ac_meas_vis" = "yes"; then + AC_CHECK_HEADERS(cdk/cdk.h, [], AC_MSG_ERROR(Unable to find libcdk)) +fi dnl Checks for typedefs, structures and compiler characteristics diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a89f7d5..01b0d33 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -60,7 +60,13 @@ osmo-build-dep.sh osmo-mgw # Additional configure options and depends -CONFIG="--enable-external-tests --enable-werror" +CONFIG=" + --enable-external-tests + --enable-meas-pcap2db + --enable-meas-udp2db + --enable-meas-vis + --enable-werror +" if [ "$WITH_MANUALS" = "1" ]; then CONFIG="$CONFIG --enable-manuals" fi diff --git a/debian/rules b/debian/rules index e6834c3..9ed337f 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,12 @@ %: dh $@ --with autoreconf -CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals +CONFIGURE_FLAGS += \ + --enable-manuals \ + --enable-meas-vis \ + --with-systemdsystemunitdir=/lib/systemd/system \ + $(NULL) + override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 18debe7..ece993f 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -28,17 +28,17 @@ isdnsync \ meas_json \ $(NULL) -if HAVE_SQLITE3 +if BUILD_MEAS_UDP2DB bin_PROGRAMS += \ osmo-meas-udp2db \ $(NULL) -if HAVE_PCAP +endif +if BUILD_MEAS_PCAP2DB bin_PROGRAMS += \ osmo-meas-pcap2db \ $(NULL) endif -endif -if HAVE_LIBCDK +if BUILD_MEAS_VIS bin_PROGRAMS += \ meas_vis \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b3d5efb769437a5d3036e1e627b8d477275d93e Gerrit-Change-Number: 33681 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: gmm: Document spec ref regarding Receive N-PDU Numbers IE in RAU Compl
by pespin 20 Jul '23

20 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33838 ) Change subject: gmm: Document spec ref regarding Receive N-PDU Numbers IE in RAU Compl ...................................................................... gmm: Document spec ref regarding Receive N-PDU Numbers IE in RAU Compl Change-Id: I8b4c5a6c4c4da3648160aa32f7586c74942c7734 --- M src/gmm/gmm_pdu.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gmm/gmm_pdu.c b/src/gmm/gmm_pdu.c index 27c06fd..1c3cc8c 100644 --- a/src/gmm/gmm_pdu.c +++ b/src/gmm/gmm_pdu.c @@ -515,6 +515,11 @@ gh->proto_discr = GSM48_PDISC_MM_GPRS; gh->msg_type = GSM48_MT_GMM_RA_UPD_COMPL; + /* TODO: 3GPP TS 24.008 4.7.5.1.3 "If Receive N-PDU Numbers were + * included, the Receive N-PDU Numbers values valid in the MS, shall be included in + * the ROUTING AREA UPDATE COMPLETE message." + */ + /* TODO: Add optional IEs */ return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8b4c5a6c4c4da3648160aa32f7586c74942c7734 Gerrit-Change-Number: 33838 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: gmm: Document spec ref regarding Receive N-PDU Numbers IE in RAU Compl
by pespin 20 Jul '23

20 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33838 ) Change subject: gmm: Document spec ref regarding Receive N-PDU Numbers IE in RAU Compl ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8b4c5a6c4c4da3648160aa32f7586c74942c7734 Gerrit-Change-Number: 33838 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 07:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0