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

[S] Change in docker-playground[master]: debian-bullseye-jenkins: add libcdk5-dev
by osmith 11 Jul '23

11 Jul '23

osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/33675 ) Change subject: debian-bullseye-jenkins: add libcdk5-dev ...................................................................... debian-bullseye-jenkins: add libcdk5-dev Prepare for osmo-bsc I8b3d5efb769437a5d3036e1e627b8d477275d93e where jenkins.sh will explicitly build meas_vis and configure.ac will stop if libcdk5-dev is not installed. Currently meas_vis only gets built if libcdk5-dev is installed, meaning right now it doesn't get built by the jenkins verification and master-build jobs (only by the debian package build verification). Related: OS#5173 Change-Id: I015b6d7cb834e99ea5d04206ba5f8c519c4e6af1 --- M debian-bullseye-jenkins/Dockerfile 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/33675/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I015b6d7cb834e99ea5d04206ba5f8c519c4e6af1 Gerrit-Change-Number: 33675 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in osmo-msc[master]: ASCI: Add VTY to configure GCR (Group Call Register)
by Jenkins Builder 11 Jul '23

11 Jul '23

Attention is currently required from: jolly. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33512 ) Change subject: ASCI: Add VTY to configure GCR (Group Call Register) ...................................................................... Patch Set 15: (1 comment) File src/libmsc/asci_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9365): https://gerrit.osmocom.org/c/osmo-msc/+/33512/comment/f1228b13_71592466 PS15, Line 38: static void asci_disabled(struct vty *vty) { open brace '{' following function definitions go on the next line -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5bd034a62fc8b483f550d29103c2f7587198f590 Gerrit-Change-Number: 33512 Gerrit-PatchSet: 15 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 11 Jul 2023 12:33:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: Cosmetic: debian/rules: remove boilerplate
by osmith 11 Jul '23

11 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33679 ) Change subject: Cosmetic: debian/rules: remove boilerplate ...................................................................... Cosmetic: debian/rules: remove boilerplate Change-Id: I4582c711abc914736322ec2cffcd7b849507534c --- M debian/rules 1 file changed, 9 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/33679/1 diff --git a/debian/rules b/debian/rules index a6646c1..e6834c3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,57 +1,10 @@ #!/usr/bin/make -f -# You must remove unused comment lines for the released package. -# See debhelper(7) (uncomment to enable) -# This is an autogenerated template for debian/rules. -# -# Output every command that modifies files on the build system. -#export DH_VERBOSE = 1 -# -# Copy some variable definitions from pkg-info.mk and vendor.mk -# under /usr/share/dpkg/ to here if they are useful. -# -# See FEATURE AREAS/ENVIRONMENT in dpkg-buildflags(1) -# Apply all hardening options -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# Package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# Package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -# -# With debhelper version 9 or newer, the dh command exports -# all buildflags. So there is no need to include the -# /usr/share/dpkg/buildflags.mk file here if compat is 9 or newer. -# -# These are rarely used code. (START) -# -# The following include for *.mk magically sets miscellaneous -# variables while honoring existing values of pertinent -# environment variables: -# -# Architecture-related variables such as DEB_TARGET_MULTIARCH: -#include /usr/share/dpkg/architecture.mk -# Vendor-related variables such as DEB_VENDOR: -#include /usr/share/dpkg/vendor.mk -# Package-related variables such as DEB_DISTRIBUTION -#include /usr/share/dpkg/pkg-info.mk -# -# You may alternatively set them susing a simple script such as: -# DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) -# -# These are rarely used code. (END) -# - -# main packaging script based on dh7 syntax %: dh $@ --with autoreconf -# debmake generated override targets CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) -# -# Do not install libtool archive, python .pyc .pyo -#override_dh_install: -# dh_install --list-missing -X.la -X.pyc -X.pyo # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practic… override_dh_strip: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4582c711abc914736322ec2cffcd7b849507534c Gerrit-Change-Number: 33679 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: contrib/jenkins.sh: deduplicate configure flags
by osmith 11 Jul '23

11 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33680 ) Change subject: contrib/jenkins.sh: deduplicate configure flags ...................................................................... contrib/jenkins.sh: deduplicate configure flags Prepare to meas-related flags to CONFIG in future patches. Change-Id: I5685aa0bcb77286d1cd89cc9c8fee58991597446 --- M contrib/jenkins.sh 1 file changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/33680/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 695af3a..a89f7d5 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -60,9 +60,9 @@ osmo-build-dep.sh osmo-mgw # Additional configure options and depends -CONFIG="" +CONFIG="--enable-external-tests --enable-werror" if [ "$WITH_MANUALS" = "1" ]; then - CONFIG="--enable-manuals" + CONFIG="$CONFIG --enable-manuals" fi set +x @@ -75,12 +75,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +./configure --enable-sanitize $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || exit_tar_workspace LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests --enable-werror $CONFIG" \ + DISTCHECK_CONFIGURE_FLAGS="$CONFIG" \ $MAKE $PARALLEL_MAKE distcheck \ || exit_tar_workspace -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5685aa0bcb77286d1cd89cc9c8fee58991597446 Gerrit-Change-Number: 33680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

11 Jul '23

osmith has uploaded this change for review. ( 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, 63 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/33681/1 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..f35cada 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-upd2db + --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..0401371 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,11 @@ %: dh $@ --with autoreconf -CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals +CONFIGURE_FLAGS += " + --enable-manuals + --enable-meas-vis + --with-systemdsystemunitdir=/lib/systemd/system +" 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: configure: ipa utils: add default=yes to arg help
by osmith 11 Jul '23

11 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33678 ) Change subject: configure: ipa utils: add default=yes to arg help ...................................................................... configure: ipa utils: add default=yes to arg help Change-Id: Ie8c22f5103857b317add5f7d9d9f951665a6103a --- M configure.ac 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/33678/1 diff --git a/configure.ac b/configure.ac index 297d2cd..b3cc09d 100644 --- a/configure.ac +++ b/configure.ac @@ -36,8 +36,8 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -# Enable/disable ipaccess-utils (src/ipacces/)? -AC_ARG_ENABLE([ipaccess-utils], [AS_HELP_STRING([--enable-ipaccess-utils], [Build ipaccess utils: abisip-find, ipaccess-config, ...])], +# Enable/disable ipaccess-utils (src/ipacces/) +AC_ARG_ENABLE([ipaccess-utils], [AS_HELP_STRING([--enable-ipaccess-utils], [Build ipaccess utils: abisip-find, ipaccess-config, ... [default=yes]])], [osmo_ac_ipa_utils="$enableval"],[osmo_ac_ipa_utils="yes"]) AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie8c22f5103857b317add5f7d9d9f951665a6103a Gerrit-Change-Number: 33678 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: Cosmetic: configure: move if … then to same line
by osmith 11 Jul '23

11 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33677 ) Change subject: Cosmetic: configure: move if … then to same line ...................................................................... Cosmetic: configure: move if … then to same line Make it consistent throughout the file. Change-Id: I13b98ef63c6fcbb98fb32311404fa5821f7bce58 --- M configure.ac 1 file changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/33677/1 diff --git a/configure.ac b/configure.ac index ebcb839..297d2cd 100644 --- a/configure.ac +++ b/configure.ac @@ -77,8 +77,7 @@ [Compile with address sanitizer enabled], )], [sanitize=$enableval], [sanitize="no"]) -if test x"$sanitize" = x"yes" -then +if test x"$sanitize" = x"yes"; then CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" fi @@ -92,8 +91,7 @@ ] )], [werror=$enableval], [werror="no"]) -if test x"$werror" = x"yes" -then +if test x"$werror" = x"yes"; then WERROR_FLAGS="-Werror" WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" @@ -129,8 +127,7 @@ AC_ARG_ENABLE(profile, [AS_HELP_STRING([--enable-profile], [Compile with profiling support enabled], )], [profile=$enableval], [profile="no"]) -if test x"$profile" = x"yes" -then +if test x"$profile" = x"yes"; then CFLAGS="$CFLAGS -pg" CPPFLAGS="$CPPFLAGS -pg" fi @@ -163,8 +160,7 @@ AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"]) AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals" fallback]) -if test x"$osmo_ac_build_manuals" = x"yes" -then +if test x"$osmo_ac_build_manuals" = x"yes"; then # Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback) if test -n "$OSMO_GSM_MANUALS_DIR"; then echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13b98ef63c6fcbb98fb32311404fa5821f7bce58 Gerrit-Change-Number: 33677 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: Fix various typos
by osmith 11 Jul '23

11 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33676 ) Change subject: Fix various typos ...................................................................... Fix various typos Change-Id: I2726f18156f96999159f7b5f7c6c5a2d93667131 --- M src/osmo-bsc/a_reset.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/chan_alloc.c M src/osmo-bsc/lcs_ta_req.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/paging.c M src/utils/meas_udp2db.c 14 files changed, 31 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/33676/1 diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index d23ffa7..c2c89e3 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -42,7 +42,7 @@ static void a_reset_link_up(void *data) { struct bsc_msc_data *msc = data; - LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is up\n", msc->nr); + LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP association is up\n", msc->nr); osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1); osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1); osmo_signal_dispatch(SS_MSC, S_MSC_CONNECTED, msc); @@ -51,7 +51,7 @@ static void a_reset_link_lost(void *data) { struct bsc_msc_data *msc = data; - LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is down\n", msc->nr); + LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP association is down\n", msc->nr); osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1); osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1); osmo_signal_dispatch(SS_MSC, S_MSC_LOST, msc); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 54357de..0c3be1a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1996,12 +1996,12 @@ return false; } - /* No free TCH/F or TCH/H was found, we now select one of the busy lchans and initate a release on that lchan. - * This will take a short amount of time. We need to come back and check regulary to see if we managed to + /* No free TCH/F or TCH/H was found, we now select one of the busy lchans and initiate a release on that lchan. + * This will take a short amount of time. We need to come back and check regularly to see if we managed to * free up another lchan. */ if (!rqd->release_lchan) { struct gsm_lchan *release_lchan; - /* Pick any busy TCH/F or TCH/H lchan and inititate a channel + /* Pick any busy TCH/F or TCH/H lchan and initiate a channel * release to make room for the incoming emergency call */ rqd->release_lchan = release_lchan = get_any_lchan(rqd->bts); if (!release_lchan) { diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 02ca29c..d58bca2 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -222,7 +222,7 @@ } } - /* Only AoIP networks include a speech codec (choosen) in the + /* Only AoIP networks include a speech codec (chosen) in the * assignment complete message. */ if (gscon_is_aoip(conn)) { /* Extrapolate speech codec from speech mode */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 6300ca6..c84e6c9 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -80,7 +80,7 @@ {GSCON_EV_MO_COMPL_L3, "MO_COMPL_L3"}, {GSCON_EV_A_CONN_CFM, "MO-CONNECT.cfm"}, {GSCON_EV_A_CLEAR_CMD, "CLEAR_CMD"}, - {GSCON_EV_A_DISC_IND, "DISCONNET.ind"}, + {GSCON_EV_A_DISC_IND, "DISCONNECT.ind"}, {GSCON_EV_A_COMMON_ID_IND, "COMMON_ID.ind"}, {GSCON_EV_ASSIGNMENT_START, "ASSIGNMENT_START"}, {GSCON_EV_ASSIGNMENT_END, "ASSIGNMENT_END"}, diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 0292386..bd61501 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1014,7 +1014,7 @@ switch (ts->pchan_is) { /* Not allowed on CCCH/BCCH */ case GSM_PCHAN_CCCH: - /* Preceeding timeslot shall not exceed 2 dB */ + /* Preceding timeslot shall not exceed 2 dB */ if (prev->c0_max_power_red_db > 0) prev->c0_max_power_red_db = 2; /* fall-through */ diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 2028009..dc8ff14 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1338,7 +1338,7 @@ GET_NEXT_BYTE; - /* encoding bit, construced means that other elements are contained */ + /* encoding bit, constructed means that other elements are contained */ constructed = ((ub & 0x20) ? 1 : 0); if ((ub & 0x1F) == 0x1F) { @@ -1397,7 +1397,7 @@ GET_NEXT_BYTE; - /* encoding bit, construced means that other elements are contained */ + /* encoding bit, constructed means that other elements are contained */ constructed = ((ub & 0x20) ? 1 : 0); if ((ub & 0x1F) == 0x1F) { diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 657d03e..5110659 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -4242,7 +4242,7 @@ vty_out(vty, "auto%s", VTY_NEWLINE); } -/* TODO: generalize and move indention handling to libosmocore */ +/* TODO: generalize and move indentation handling to libosmocore */ #define cfg_out(fmt, args...) \ vty_out(vty, "%*s" fmt, indent, "", ##args); diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index 4fbf8be..cc8da3d 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -63,7 +63,7 @@ if (!nm_is_running(&ts->mo.nm_state)) continue; - /* A dynamic timeslot currently in PDCH mode are available as TCH or SDCCH8, beause they can be switched + /* A dynamic timeslot currently in PDCH mode are available as TCH or SDCCH8, because they can be switched * to TCH or SDCCH mode at any moment. Count TCH/F_TCH/H_SDCCH8_PDCH as one total timeslot, even though it may * be switched to TCH/H and would then count as two -- hence opt for pessimistic load. */ if ((ts->pchan_on_init == GSM_PCHAN_OSMO_DYN || diff --git a/src/osmo-bsc/lcs_ta_req.c b/src/osmo-bsc/lcs_ta_req.c index f0bb02e..a1fa873 100644 --- a/src/osmo-bsc/lcs_ta_req.c +++ b/src/osmo-bsc/lcs_ta_req.c @@ -89,7 +89,7 @@ struct lcs_ta_req *lcs_ta_req; if (lcs_loc_req->ta_req) { LOG_LCS_TA_REQ(lcs_loc_req->ta_req, LOGL_ERROR, - "Cannot start anoter TA Request FSM, this TA Request is still active\n"); + "Cannot start another TA Request FSM, this TA Request is still active\n"); return -ENOTSUP; } lcs_ta_req = lcs_ta_req_alloc(lcs_loc_req->fi, LCS_LOC_REQ_EV_TA_REQ_END); diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 7e58e37..44b9057 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -494,7 +494,7 @@ { vty_out(vty, "%% Warning: The CTRL interface for Neighbor Address Resolution is now deprecated." "Upgrade osmo-pcu and drop the 'neighbor-resolution bind " VTY_IPV46_CMD " [<0-65535>]' VTY " - "option in order to let osmo-pcu use the new resoluton method using the PCUIF over IPA " + "option in order to let osmo-pcu use the new resolution method using the PCUIF over IPA " "multiplex, which will work out of the box without required configuration.%s", VTY_NEWLINE); osmo_talloc_replace_string(bsc_gsmnet, &bsc_gsmnet->neigh_ctrl.addr, argv[0]); if (argc > 1) diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index dd05f9a..e601e18 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -122,7 +122,7 @@ bts->bts_nr, 0xff, 0xff, NM_STATE_UNLOCKED); /* Message containing BTS attributes, including the interference band bounds, was ACKed by the BTS. - * Store the sent bounds as the ones being used for logging and comparing intereference levels. */ + * Store the sent bounds as the ones being used for logging and comparing interference levels. */ bts->interf_meas_params_used = bts->interf_meas_params_cfg; } diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 0757da0..ff73ebc 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -870,7 +870,7 @@ struct mgcp_client *mgcp_client_single; unsigned int pool_members_initalized; - /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in + /* Initialize MGW pool. This initializes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ if (!mgcp_client_pool_empty(bsc_gsmnet->mgw.mgw_pool)) { @@ -890,7 +890,7 @@ LOGP(DNM, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'msc'\n"); mgcp_client_single = mgcp_client_init(bsc_gsmnet, bsc_gsmnet->mgw.conf); if (!mgcp_client_single) { - LOGP(DNM, LOGL_ERROR, "MGW (single) client initalization failed\n"); + LOGP(DNM, LOGL_ERROR, "MGW (single) client initialization failed\n"); return -EINVAL; } if (mgcp_client_connect(mgcp_client_single)) { diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 1cee164..b7842dd 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -73,8 +73,8 @@ .tv_nsec = 500 * 1000 * 1000, }; -/* If no CCCH Lod Ind is received before this time period, the BTS is considered - * to have stopped sending CCCH Load Indication, probaby due to being under Load +/* If no CCCH Load Ind is received before this time period, the BTS is considered + * to have stopped sending CCCH Load Indication, probably due to being under Load * Threshold: */ #define bts_no_ccch_load_ind_timeout_sec(bts) ((bts)->ccch_load_ind_period * 2) @@ -361,7 +361,7 @@ * coming from abis_rsl.c * * We attempt to iterate once over the list of items but - * only upto available_slots. + * only up to available_slots. */ static void paging_handle_pending_requests(struct gsm_bts_paging_state *paging_bts) { @@ -562,7 +562,7 @@ } else if (bts_entry->initial_req_list_len == 1) { /* Worker timer is armed -> there was already one req before * bts_entry->initial_req_list_len == 1 -> There were no initial requests - * in the list, aka the timer is waiting for retransmition, + * in the list, aka the timer is waiting for retransmission, * which is a longer period. * Let's recaculate the time to adapt it to initial_period: */ struct timespec now, elapsed, tdiff; diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c index f40f137..0c97d8b 100644 --- a/src/utils/meas_udp2db.c +++ b/src/utils/meas_udp2db.c @@ -1,4 +1,4 @@ -/* liesten to meas_feed on UDP and write it to sqlite3 database */ +/* listen to meas_feed on UDP and write it to sqlite3 database */ /* (C) 2012 by Harald Welte <laforge(a)gnumonks.org> * -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2726f18156f96999159f7b5f7c6c5a2d93667131 Gerrit-Change-Number: 33676 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: debian-bullseye-jenkins: add libcdk5-dev
by osmith 11 Jul '23

11 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33675 ) Change subject: debian-bullseye-jenkins: add libcdk5-dev ...................................................................... debian-bullseye-jenkins: add libcdk5-dev Prepare for osmo-bsc I8b3d5efb769437a5d3036e1e627b8d477275d93e where jenkins.sh will explcitly build meas_vis and configure.ac will stop if libcdk5-dev is not installed. Currently meas_vis only gets built if libcdk5-dev is installed, meaning right now it doesn't get built by the jenkins verification and master-build jobs (only by the debian package build verification). Related: OS#5173 Change-Id: I015b6d7cb834e99ea5d04206ba5f8c519c4e6af1 --- M debian-bullseye-jenkins/Dockerfile 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/33675/1 diff --git a/debian-bullseye-jenkins/Dockerfile b/debian-bullseye-jenkins/Dockerfile index 2edd3f6..a0ef3c8 100644 --- a/debian-bullseye-jenkins/Dockerfile +++ b/debian-bullseye-jenkins/Dockerfile @@ -60,6 +60,7 @@ libasound2-dev \ libboost-all-dev \ libc-ares-dev \ + libcdk5-dev \ libcsv-dev \ libdbd-sqlite3 \ libdbi-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I015b6d7cb834e99ea5d04206ba5f8c519c4e6af1 Gerrit-Change-Number: 33675 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-sccp[master]: asp: Make ASP default LM timers VTY configurable
by fixeria 11 Jul '23

11 Jul '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33648 ) Change subject: asp: Make ASP default LM timers VTY configurable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib62e19f2e528e8b2792cbb51a5900dc3463ebd06 Gerrit-Change-Number: 33648 Gerrit-PatchSet: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 12:29:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0