Bump version: 0.2.3.12-7385-dirty → 0.2.4

Change-Id: Ib73d7f15f55a52479a7728f86e96e93bba699ec5

.gitreview

@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.osmocom.org
+project=osmo-smlc
+

configure.ac

@@ -9,6 +9,8 @@ AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_TESTDIR(tests)
 
+CFLAGS="$CFLAGS -std=gnu11"
+
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -34,12 +36,12 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
 fi
 PKG_PROG_PKG_CONFIG([0.20])
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.9.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.9.0)
-PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.8.0)
-PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.8.0)
 
 dnl checks for header files
 AC_HEADER_STDC
@@ -115,9 +117,9 @@ AC_ARG_ENABLE([external_tests],
 				[Include the VTY/CTRL tests in make check [default=no]]),
 		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
 if test "x$enable_ext_tests" = "xyes" ; then
-	AC_CHECK_PROG(PYTHON2_AVAIL,python2,yes)
+	AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes)
-	 if test "x$PYTHON2_AVAIL" != "xyes" ; then
+	 if test "x$PYTHON3_AVAIL" != "xyes" ; then
-		AC_MSG_ERROR([Please install python2 to run the VTY/CTRL tests.])
+		AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.])
 	fi
 	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
 	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then

contrib/jenkins.sh

@@ -58,12 +58,12 @@ LD_LIBRARY_PATH="$inst/lib" $MAKE check \
   || cat-testlogs.sh
 LD_LIBRARY_PATH="$inst/lib" \
   DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \
-  $MAKE distcheck \
+  $MAKE $PARALLEL_MAKE distcheck \
   || cat-testlogs.sh
 
 if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
 	make -C "$base/doc/manuals" publish
 fi
 
-$MAKE maintainer-clean
+$MAKE $PARALLEL_MAKE maintainer-clean
 osmo-clean-workspace.sh

contrib/osmo-smlc.spec.in

@@ -31,13 +31,13 @@ BuildRequires:  pkgconfig >= 0.20
 %if 0%{?suse_version}
 BuildRequires:  systemd-rpm-macros
 %endif
-BuildRequires:  pkgconfig(libosmo-netif) >= 1.2.0
+BuildRequires:  pkgconfig(libosmo-netif) >= 1.4.0
-BuildRequires:  pkgconfig(libosmo-sccp) >= 1.6.0
+BuildRequires:  pkgconfig(libosmo-sccp) >= 1.8.0
-BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.6.0
+BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.8.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.7.0
+BuildRequires:  pkgconfig(libosmocore) >= 1.9.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.7.0
+BuildRequires:  pkgconfig(libosmoctrl) >= 1.9.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.7.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.7.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.9.0
 BuildRequires:  pkgconfig(talloc)
 %{?systemd_requires}
 

contrib/systemd/osmo-smlc.service

@@ -1,9 +1,13 @@
 [Unit]
 Description=Osmocom Serving Mobile Location Center (SMLC)
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 Restart=always
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 ExecStart=/usr/bin/osmo-smlc -c /etc/osmocom/osmo-smlc.cfg
 RestartSec=2
 

debian/changelog

@@ -1,3 +1,41 @@
+osmo-smlc (0.2.4) unstable; urgency=medium
+
+  [ arehbein ]
+  * Transition to use of 'telnet_init_default'
+
+  [ Vadim Yanitskiy ]
+  * configure.ac: set -std=gnu11
+  * Makefile.am: remove $(COVERAGE_LDFLAGS) from osmo_smlc_LDADD
+  * Makefile.am: remove unneeded AM_LDFLAGS with LIBS
+  * tests: $(BUILT_SOURCES) is not defined, depend on osmo-smlc
+  * tests: execute osmotest{vty,config}.py against osmo-smlc
+  * copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH
+  * configure.ac: migrate from python2 to python3
+
+  [ Oliver Smith ]
+  * debian: set compat level to 10
+  * systemd: depend on networking-online.target
+
+  [ Neels Janosch Hofmeyr ]
+  * ctrl-test: drop bogus 'rm -f $(CTRL_TEST_DB)'
+
+  [ Pau Espin Pedrol ]
+  * Write explicit role & sctp-role fields in ASP configurations
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 12 Sep 2023 17:14:41 +0200
+
+osmo-smlc (0.2.3) unstable; urgency=medium
+
+  [ Vadim Yanitskiy ]
+  * contrib/jenkins.sh: execute distcheck/maintainer-clean with $PARALLEL_MAKE
+
+  [ Max ]
+  * Add git-review config
+  * Set working directory in systemd service file
+  * ctrl: take both address and port from vty config
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 07 Feb 2023 17:42:00 +0100
+
 osmo-smlc (0.2.2) unstable; urgency=medium
 
   [ Oliver Smith ]

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -2,7 +2,7 @@ Source: osmo-smlc
 Section: net
 Priority: extra
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Build-Depends: debhelper (>=9),
+Build-Depends: debhelper (>= 10),
                dh-autoreconf,
                autotools-dev,
                autoconf,
@@ -11,10 +11,10 @@ Build-Depends: debhelper (>=9),
                pkg-config,
                libsctp-dev,
                libtalloc-dev,
-               libosmocore-dev (>= 1.7.0),
+               libosmocore-dev (>= 1.9.0),
-               libosmo-sccp-dev (>= 1.6.0),
+               libosmo-sccp-dev (>= 1.8.0),
-               libosmo-sigtran-dev (>= 1.6.0),
+               libosmo-sigtran-dev (>= 1.8.0),
-               osmo-gsm-manuals-dev (>= 1.3.0)
+               osmo-gsm-manuals-dev (>= 1.5.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc

doc/manuals/chapters/running.adoc

@@ -74,6 +74,7 @@ cs7 instance 0
  point-code 1.23.6
  asp asp-clnt-msc-0 2905 0 m3ua
   remote-ip 127.0.0.1
+  role asp
   sctp-role client
 ----
 

src/Makefile.am

@@ -14,12 +14,6 @@ AM_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
 
-AM_LDFLAGS = \
-	$(LIBOSMOCORE_LIBS) \
-	$(LIBOSMOGSM_LIBS) \
-	$(COVERAGE_LDFLAGS) \
-	$(NULL)
-
 SUBDIRS = \
 	osmo-smlc \
 	$(NULL)

src/osmo-smlc/Makefile.am

@@ -39,6 +39,5 @@ osmo_smlc_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOCTRL_LIBS) \
-	$(COVERAGE_LDFLAGS) \
 	$(LIBOSMOSIGTRAN_LIBS) \
 	$(NULL)

src/osmo-smlc/lb_conn.c

@@ -1,7 +1,7 @@
 /* SMLC Lb connection implementation */
 
 /*
- * (C) 2020 by sysmocom s.m.f.c. <info@sysmocom.de>
+ * (C) 2020 by sysmocom s.f.m.c. <info@sysmocom.de>
  * All Rights Reserved
  *
  * Author: Neels Hofmeyr

src/osmo-smlc/lb_peer.c

@@ -1,5 +1,5 @@
 /*
- * (C) 2019 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
+ * (C) 2019 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
  * All Rights Reserved
  *
  * SPDX-License-Identifier: AGPL-3.0+

src/osmo-smlc/sccp_lb_inst.c

@@ -1,5 +1,5 @@
 /*
- * (C) 2020 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
+ * (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
  * All Rights Reserved
  *
  * SPDX-License-Identifier: AGPL-3.0+

src/osmo-smlc/smlc_main.c

@@ -262,14 +262,13 @@ int main(int argc, char **argv)
 	}
 
 	/* Start telnet interface after reading config for vty_get_bind_addr() */
-	rc = telnet_init_dynif(tall_smlc_ctx, g_smlc, vty_get_bind_addr(), OSMO_VTY_PORT_SMLC);
+	rc = telnet_init_default(tall_smlc_ctx, g_smlc, OSMO_VTY_PORT_SMLC);
 	if (rc < 0)
 		exit(1);
 
 	/* start control interface after reading config for
 	 * ctrl_vty_get_bind_addr() */
-	g_smlc->ctrl = ctrl_interface_setup_dynip2(g_smlc, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_SMLC,
+	g_smlc->ctrl = ctrl_interface_setup2(g_smlc, OSMO_CTRL_PORT_SMLC, smlc_ctrl_node_lookup, _LAST_CTRL_NODE_SMLC);
-						   smlc_ctrl_node_lookup, _LAST_CTRL_NODE_SMLC);
 	if (!g_smlc->ctrl) {
 		fprintf(stderr, "Failed to init the control interface. Exiting.\n");
 		exit(1);

tests/Makefile.am

@@ -37,11 +37,13 @@ DISTCLEANFILES = \
 	$(NULL)
 
 if ENABLE_EXT_TESTS
-python-tests: $(BUILT_SOURCES)
+python-tests: $(top_builddir)/src/osmo-smlc/osmo-smlc
 	$(MAKE) vty-test
 	$(MAKE) ctrl-test
+	osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
+	osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
 else
-python-tests: $(BUILT_SOURCES)
+python-tests:
 	echo "Not running python-based tests (determined at configure-time)"
 endif
 
@@ -51,7 +53,7 @@ VTY_TEST ?= *.vty
 # To update the VTY script from current application behavior,
 # pass -u to vty_script_runner.py by doing:
 #   make vty-test U=-u
-vty-test:
+vty-test: $(top_builddir)/src/osmo-smlc/osmo-smlc
 	osmo_verify_transcript_vty.py -v \
 		-n OsmoSMLC -p 4271 \
 		-r "$(top_builddir)/src/osmo-smlc/osmo-smlc -c $(top_srcdir)/tests/osmo-smlc.cfg" \
@@ -60,14 +62,11 @@ vty-test:
 # To update the CTRL script from current application behavior,
 # pass -u to ctrl_script_runner.py by doing:
 #   make ctrl-test U=-u
-ctrl-test:
+ctrl-test: $(top_builddir)/src/osmo-smlc/osmo-smlc
-	-rm -f $(CTRL_TEST_DB)
 	osmo_verify_transcript_ctrl.py -v \
 		-p 4272 \
 		-r "$(top_builddir)/src/osmo-smlc/osmo-smlc -c $(top_srcdir)/tests/osmo-smlc.cfg" \
 		$(U) $(srcdir)/*.ctrl
-	-rm -f $(CTRL_TEST_DB)
-	-rm $(CTRL_TEST_DB)-*
 
 check-local: atconfig $(TESTSUITE)
 	$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)