ctrl: take both address and port from vty config

Change-Id: I5d73257c0233ce6772847809a6163b6ca4c88f83

.gitreview

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

README

@@ -1,4 +0,0 @@
-About OsmoSMLC
-==============
-
-FIXME

README.md

@@ -0,0 +1,69 @@
+osmo-smlc - Osmocom Serving Mobile Location Centre
+==================================================
+
+This repository contains a C-language implementation of a minimalistic
+GSM Serving Mobile Location Centre (SMLC) for 2G (GSM).  It is part of the
+[Osmocom](https://osmocom.org/) Open Source Mobile Communications project.
+
+OsmoSMLC exposes
+ * 3GPP Lb interface towards the BSC
+ * The Osmocom typical telnet VTY and CTRL interfaces.
+ * The Osmocom typical statsd exporter.
+
+OsmoSMLC supports the following location methods:
+ * currently only the Timing Advance based method of determining a mobile station; operator must configure the
+   locations of the cells in the osmo-smlc configuration file
+
+Homepage
+--------
+
+You can find the OsmoSMLC issue tracker and wiki online at
+<https://osmocom.org/projects/osmo-smlc> and <https://osmocom.org/projects/osmo-smlc/wiki>
+
+
+GIT Repository
+--------------
+
+You can clone from the official osmo-smlc.git repository using
+
+        git clone https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
+
+There is a web interface at <https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc>
+
+
+Documentation
+-------------
+
+User Manuals and VTY reference manuals are [optionally] built in PDF form
+as part of the build process.
+
+Pre-rendered PDF version of the current "master" can be found at
+[User Manual](https://ftp.osmocom.org/docs/latest/osmosmlc-usermanual.pdf)
+as well as the [VTY Reference Manual](https://ftp.osmocom.org/docs/latest/osmosmlc-vty-reference.pdf)
+
+
+Mailing List
+------------
+
+Discussions related to osmo-smlc are happening on the
+openbsc@lists.osmocom.org mailing list, please see
+<https://lists.osmocom.org/mailman/listinfo/openbsc> for subscription
+options and the list archive.
+
+Please observe the [Osmocom Mailing List
+Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules)
+when posting.
+
+Contributing
+------------
+
+Our coding standards are described at
+<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards>
+
+We us a gerrit based patch submission/review process for managing
+contributions.  Please see
+<https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> for
+more details
+
+The current patch queue for osmo-smlc can be seen at
+<https://gerrit.osmocom.org/#/q/project:osmo-smlc+status:open>

configure.ac

@@ -34,12 +34,12 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
 fi
 PKG_PROG_PKG_CONFIG([0.20])
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.6.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.6.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.6.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.6.0)
-PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.5.0)
-PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.5.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.6.0)
 
 dnl checks for header files
 AC_HEADER_STDC
@@ -121,7 +121,7 @@ if test "x$enable_ext_tests" = "xyes" ; then
 	fi
 	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
 	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
-		AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
+		AC_MSG_ERROR([Please install https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests to run the VTY/CTRL tests.])
 	fi
 fi
 AC_MSG_CHECKING([whether to enable VTY/CTRL tests])

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.1.0
-BuildRequires:  pkgconfig(libosmo-sccp) >= 1.5.0
-BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.5.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.6.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.6.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.6.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.6.0
+BuildRequires:  pkgconfig(libosmo-netif) >= 1.2.0
+BuildRequires:  pkgconfig(libosmo-sccp) >= 1.6.0
+BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.6.0
+BuildRequires:  pkgconfig(libosmocore) >= 1.7.0
+BuildRequires:  pkgconfig(libosmoctrl) >= 1.7.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.7.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.7.0
 BuildRequires:  pkgconfig(talloc)
 %{?systemd_requires}
 
@@ -77,7 +77,7 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 
 %files
 %license COPYING
-%doc AUTHORS README
+%doc AUTHORS README.md
 %{_bindir}/osmo-smlc
 %dir %{_docdir}/%{name}/examples
 %dir %{_docdir}/%{name}/examples/osmo-smlc

contrib/systemd/osmo-smlc.service

@@ -4,6 +4,8 @@ Description=Osmocom Serving Mobile Location Center (SMLC)
 [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,20 @@
+osmo-smlc (0.2.2) unstable; urgency=medium
+
+  [ Oliver Smith ]
+  * treewide: remove FSF address
+
+  [ Pau Espin Pedrol ]
+  * deb/rpm packaging: Drop dependency on autoconf-archive
+
+  [ Vadim Yanitskiy ]
+  * tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'
+
+  [ Harald Welte ]
+  * update git URLs (git -> https; gitea)
+  * Fill README with content; convert to markdown
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 29 Jun 2022 12:21:06 +0200
+
 osmo-smlc (0.2.1) unstable; urgency=medium
 
   [ Pau Espin Pedrol ]

debian/control

@@ -11,13 +11,13 @@ Build-Depends: debhelper (>=9),
                pkg-config,
                libsctp-dev,
                libtalloc-dev,
-               libosmocore-dev (>= 1.6.0),
-               libosmo-sccp-dev (>= 1.5.0),
-               libosmo-sigtran-dev (>= 1.5.0),
-               osmo-gsm-manuals-dev (>= 1.2.0)
+               libosmocore-dev (>= 1.7.0),
+               libosmo-sccp-dev (>= 1.6.0),
+               libosmo-sigtran-dev (>= 1.6.0),
+               osmo-gsm-manuals-dev (>= 1.3.0)
 Standards-Version: 3.9.8
-Vcs-Git: git://git.osmocom.org/osmo-smlc.git
-Vcs-Browser: https://git.osmocom.org/osmo-smlc/
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
 Homepage: https://osmocom.org/projects/osmo-smlc
 
 Package: osmo-smlc

debian/copyright

@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: osmo-smlc
-Source: git://git.osmocom.org/osmo-smlc
+Source: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
 
 Files:     *
 Copyright: 2020 Harald Welte <laforge@osmocom.org>

src/osmo-smlc/smlc_main.c

@@ -268,8 +268,7 @@ int main(int argc, char **argv)
 
 	/* 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,
-						   smlc_ctrl_node_lookup, _LAST_CTRL_NODE_SMLC);
+	g_smlc->ctrl = ctrl_interface_setup2(g_smlc, OSMO_CTRL_PORT_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/smlc_subscr/Makefile.am

@@ -20,7 +20,7 @@ EXTRA_DIST = \
 	smlc_subscr_test.err \
 	$(NULL)
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
 	smlc_subscr_test \
 	$(NULL)