esme_dgsm.py: add --always-fail option for debugging SMPP

Change-Id: Ibacf2676cae40712c89b57ced34085311d9a416d

Makefile.am

@@ -17,8 +17,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmo-gsup-client.pc \
-		 libosmo-mslookup.pc
+pkgconfig_DATA = libosmo-gsup-client.pc
 
 @RELMAKE@
 

configure.ac

@@ -25,11 +25,6 @@ AC_PROG_MKDIR_P
 AC_PROG_CC
 AC_PROG_INSTALL
 
-dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang 
-AS_CASE(["$LD"],[*clang*],
-  [AS_CASE(["${host_os}"],
-     [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])])
-
 dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
 AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
 if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
@@ -112,15 +107,6 @@ AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
 
-# mslookup_client_mdns_test (OS#4385: does not work everywhere)
-AC_ARG_ENABLE([mslookup_client_mdns_test],
-		AC_HELP_STRING([--enable-mslookup-client-mdns-test],
-				[Include the mslookup_client_mdns_test in make check [default=no]]),
-		[enable_mslookup_client_mdns_test="$enableval"],[enable_mslookup_client_mdns_test="no"])
-AC_MSG_CHECKING([whether to enable mslookup_client_mdns_test])
-AC_MSG_RESULT([$enable_mslookup_client_mdns_test])
-AM_CONDITIONAL(ENABLE_MSLOOKUP_CLIENT_MDNS_TEST, test "x$enable_mslookup_client_mdns_test" = "xyes")
-
 # Generate manuals
 AC_ARG_ENABLE(manuals,
 	[AS_HELP_STRING(

contrib/dgsm/esme_dgsm.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
 """
-SPDX-License-Identifier: MIT
+SPDX-License-Identifier: AGPL-3.0-or-later
 Copyright 2019 sysmocom s.f.m.c GmbH <info@sysmocom.de>
 
 WARNING: this is just a proof-of-concept implementation, it blocks for every
 received SMPP request and is not suitable for servicing more than one request
 at a time.
 
-Based on esme.py from RCCN (license changed with permission from author):
+Based on esme.py from RCCN:
 https://github.com/Rhizomatica/rccn/blob/master/rccn/esme.py
 Copyright 2017 keith <keith@rhizomatica.org>
 
@@ -39,7 +39,13 @@ import time
 
 def can_handle_pdu(pdu):
     if not isinstance(pdu, smpplib.command.DeliverSM):
-        logging.info('PDU is not a DeliverSM, ignoring')
+        logging.info('PDU is not a DeliverSM. Is OsmoMSC configured properly?')
+        return False
+
+    # Multipart SMS etc. not handled here (see RCCN's esme.py)
+    if pdu.esm_class & smpplib.consts.SMPP_GSMFEAT_UDHI:
+        logging.info("UDH (User Data Header) handling not implemented in this"
+                     " example, dropping message.")
         return False
 
     if int(pdu.dest_addr_ton) == smpplib.consts.SMPP_TON_INTL:
@@ -63,8 +69,7 @@ def query_mslookup(service_type, id, id_type='msisdn'):
     return json.loads(result_line)
 
 
-def tx_sms(dst_host, dst_port, source, destination, registered_delivery,
-           unicode_text):
+def tx_sms(dst_host, dst_port, source, destination, unicode_text):
     smpp_client = smpplib.client.Client(dst_host, dst_port, 90)
     smpp_client.connect()
     smpp_client.bind_transceiver(system_id=args.dst_id, password=args.dst_pass)
@@ -79,7 +84,7 @@ def tx_sms(dst_host, dst_port, source, destination, registered_delivery,
         dest_addr_npi=smpplib.consts.SMPP_NPI_ISDN,
         destination_addr=destination.decode(),
         short_message=unicode_text,
-        registered_delivery=registered_delivery,
+        registered_delivery=False,
     )
 
     smpp_client.unbind()
@@ -111,8 +116,7 @@ def rx_deliver_sm(pdu):
 
     dst_host, dst_port = result['v4']
     tx_sms(dst_host, dst_port, pdu.source_addr,
-           pdu.destination_addr, int(pdu.registered_delivery),
-           pdu.short_message)
+           pdu.destination_addr, pdu.short_message)
 
     return smpplib.consts.SMPP_ESME_ROK
 

contrib/dgsm/freeswitch_dialplan_dgsm.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-SPDX-License-Identifier: MIT
+SPDX-License-Identifier: AGPL-3.0-or-later
 Copyright 2019 sysmocom s.f.m.c GmbH <info@sysmocom.de>
 
 This is a freeswitch dialplan implementation, see:

contrib/jenkins.sh

@@ -49,12 +49,7 @@ set -x
 
 cd "$base"
 autoreconf --install --force
-./configure \
-	--enable-sanitize \
-	--enable-external-tests \
-	--enable-mslookup-client-mdns-test \
-	--enable-werror \
-	$CONFIG
+./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG
 $MAKE $PARALLEL_MAKE
 $MAKE check || cat-testlogs.sh
 DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh

contrib/osmo-hlr.spec

@@ -1,191 +0,0 @@
-#
-# spec file for package osmo-hlr
-#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2016, Martin Hauke <mardnh@gmx.de>
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name:           osmo-hlr
-Version:        0.0.0
-Release:        0
-Summary:        Osmocom Home Location Register for GSUP protocol towards OsmoSGSN and OsmoCSCN
-License:        AGPL-3.0-or-later AND GPL-2.0-or-later
-Group:          Productivity/Telephony/Servers
-URL:            https://projects.osmocom.org/projects/osmo-hlr
-Source:         %{name}-%{version}.tar.xz
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  pkgconfig >= 0.20
-BuildRequires:  python3
-%if 0%{?centos_ver}
-BuildRequires:  systemd
-%else
-BuildRequires:  systemd-rpm-macros
-%endif
-BuildRequires:  pkgconfig(libosmoabis) >= 0.6.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.2.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.2.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.2.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.2.0
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(talloc) >= 2.0.1
-# only needed for populate_hlr_db.pl
-Requires:       libdbi-drivers-dbd-sqlite3
-
-%description
-The GSUP HLR is a stand-alone HLR (Home Location Register) for SIM
-and USIM based subscribers which exposes the GSUP protocol towards
-its users. OsmoSGSN supports this protocol.
-
-osmo-gsup-hlr is still very simplistic. It is a single-threaded
-architecture and uses only sqlite3 tables as back-end.  It is suitable
-for installations of the scale that OsmoNITB was able to handle.  It
-also lacks various features like fine-grained control of subscribed
-services (like supplementary services).
-
-%package -n libosmo-gsup-client0
-Summary:        Osmocom GSUP (General Subscriber Update Protocol) client library
-License:        GPL-2.0-or-later
-Group:          System/Libraries
-
-%description -n libosmo-gsup-client0
-This is a shared library that can be used to implement client programs for
-the GSUP protocol. The typical GSUP server is OsmoHLR, with OsmoMSC, OsmoSGSN
-and External USSD Entities (EUSEs) using this library to implement clients.
-
-%package -n libosmo-gsup-client-devel
-Summary:        Development files for the Osmocom GSUP client library
-License:        GPL-2.0-or-later
-Group:          Development/Libraries/C and C++
-Requires:       libosmo-gsup-client0 = %{version}
-
-%description -n libosmo-gsup-client-devel
-This is a shared library that can be used to implement client programs for
-the GSUP protocol. The typical GSUP server is OsmoHLR, with OsmoMSC, OsmoSGSN
-and External USSD Entities (EUSEs) using this library to implement clients.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-gsup-client.
-
-%package -n libosmo-mslookup0
-Summary:        Osmocom MS lookup library
-License:        GPL-2.0-or-later
-Group:          System/Libraries
-
-%description -n libosmo-mslookup0
-This shared library contains routines for looking up mobile subscribers.
-
-%package -n libosmo-mslookup-devel
-Summary:        Development files for the Osmocom MS lookup library
-License:        GPL-2.0-or-later
-Group:          Development/Libraries/C and C++
-Requires:       libosmo-mslookup0 = %{version}
-
-%description -n libosmo-mslookup-devel
-This shared library contains routines for looking up mobile subscribers.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-mslookup.
-
-
-%package -n osmo-mslookup-client
-Summary:        Standalone program using libosmo-mslookup
-License:        GPL-2.0-or-later
-Group:          Development/Libraries/C and C++
-
-%description -n osmo-mslookup-client
-Standalone program using libosmo-mslookup to easily integrate with programs
-that want to connect services (SIP, SMS,...) to the current location of a
-subscriber.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
-  --docdir="%{_docdir}/%{name}" \
-  --with-systemdsystemunitdir=%{_unitdir} \
-  --enable-shared \
-  --disable-static
-make V=1 %{?_smp_mflags}
-
-%install
-%make_install
-install -d "%{buildroot}/%{_localstatedir}/lib/osmocom"
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%if 0%{?suse_version}
-%preun
-%service_del_preun %{name}.service
-
-%postun
-%service_del_postun %{name}.service
-
-%pre
-%service_add_pre %{name}.service
-
-%post
-%service_add_post %{name}.service
-%endif
-
-%post   -n libosmo-gsup-client0 -p /sbin/ldconfig
-%postun -n libosmo-gsup-client0 -p /sbin/ldconfig
-%post   -n libosmo-mslookup0 -p /sbin/ldconfig
-%postun -n libosmo-mslookup0 -p /sbin/ldconfig
-
-%files
-%license COPYING
-%dir %{_docdir}/%{name}
-%dir %{_docdir}/%{name}/examples
-%{_docdir}/%{name}/examples/osmo-hlr.cfg
-%{_docdir}/%{name}/examples/osmo-hlr-dgsm.cfg
-%dir %{_docdir}/%{name}/sql
-%{_docdir}/%{name}/sql/hlr.sql
-%{_docdir}/%{name}/sql//hlr_data.sql
-%dir %{_sysconfdir}/osmocom
-%dir %{_localstatedir}/lib/osmocom
-%{_bindir}/osmo-hlr
-%{_bindir}/osmo-hlr-db-tool
-%dir %{_sysconfdir}/osmocom
-%config %{_sysconfdir}/osmocom/osmo-hlr.cfg
-%{_unitdir}/osmo-hlr.service
-
-%files -n libosmo-gsup-client0
-%{_libdir}/libosmo-gsup-client.so.0*
-
-%files -n libosmo-gsup-client-devel
-%{_bindir}/osmo-euse-demo
-%dir %{_includedir}/osmocom
-%dir %{_includedir}/osmocom/gsupclient
-%{_includedir}/osmocom/gsupclient/*.h
-%{_libdir}/libosmo-gsup-client.so
-%{_libdir}/pkgconfig/libosmo-gsup-client.pc
-
-%files -n libosmo-mslookup0
-%{_libdir}/libosmo-mslookup.so.0*
-
-%files -n libosmo-mslookup-devel
-%dir %{_includedir}/osmocom
-%dir %{_includedir}/osmocom/mslookup
-%{_includedir}/osmocom/mslookup/*.h
-%{_libdir}/libosmo-mslookup.so
-%{_libdir}/pkgconfig/libosmo-mslookup.pc
-
-%files -n osmo-mslookup-client
-%{_bindir}/osmo-mslookup-client
-
-%changelog

doc/manuals/chapters/dgsm.adoc

@@ -38,7 +38,7 @@ There are two fundamentally distinct subscriber lookups provided by the mslookup
 ----
 digraph G {
 rankdir=LR
-
+	
 subgraph cluster_village_b {
 	label="Village B"
 	ms_bob [label="Bob\n(from village B)",shape=box]
@@ -113,7 +113,7 @@ msc {
 ----
 digraph G {
 rankdir=LR
-
+	
 subgraph cluster_village_b {
 	label="Village B"
 
@@ -214,12 +214,6 @@ port, but beware that the IP address must be from a multicast range, see <<ietf-
  mslookup
   mdns bind 239.192.23.42 4266
 
-Domain names generated from mslookup queries (e.g. "sip.voice.123.msisdn") should not collide with IANA permitted
-domains. Therefore we add the "mdns.osmocom.org" suffix. It can be overridden as follows:
-
- mslookup
-  mdns domain-suffix mdns.osmocom.org
-
 ==== Server: Site Services
 
 The mslookup server requires a list of service addresses provided at the local site, in order to respond to service

include/Makefile.am

@@ -1,7 +1,7 @@
 SUBDIRS = osmocom
 
 nobase_include_HEADERS = \
-	osmocom/gsupclient/cni_peer_id.h \
+	osmocom/gsupclient/gsup_peer_id.h \
 	osmocom/gsupclient/gsup_client.h \
 	osmocom/gsupclient/gsup_req.h \
 	osmocom/mslookup/mdns.h \

include/osmocom/gsupclient/gsup_peer_id.h

@@ -32,35 +32,33 @@ struct osmo_ipa_name {
 	uint8_t val[128];
 };
 
-bool osmo_ipa_name_is_empty(const struct osmo_ipa_name *ipa_name);
+bool osmo_ipa_name_is_empty(struct osmo_ipa_name *ipa_name);
 int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len);
 int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...);
 int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b);
-const char *osmo_ipa_name_to_str_c(void *ctx, const struct osmo_ipa_name *ipa_name);
 const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name);
 
-enum osmo_cni_peer_id_type {
-	OSMO_CNI_PEER_ID_EMPTY=0,
-	OSMO_CNI_PEER_ID_IPA_NAME,
-	/* OSMO_CNI_PEER_ID_GLOBAL_TITLE, <-- currently not implemented, but likely future possibility */
+enum osmo_gsup_peer_id_type {
+	OSMO_GSUP_PEER_ID_EMPTY=0,
+	OSMO_GSUP_PEER_ID_IPA_NAME,
+	/* OSMO_GSUP_PEER_ID_GLOBAL_TITLE, <-- currently not implemented, but likely future possibility */
 };
 
-extern const struct value_string osmo_cni_peer_id_type_names[];
-static inline const char *osmo_cni_peer_id_type_name(enum osmo_cni_peer_id_type val)
-{ return get_value_string(osmo_cni_peer_id_type_names, val); }
+extern const struct value_string osmo_gsup_peer_id_type_names[];
+static inline const char *osmo_gsup_peer_id_type_name(enum osmo_gsup_peer_id_type val)
+{ return get_value_string(osmo_gsup_peer_id_type_names, val); }
 
-struct osmo_cni_peer_id {
-	enum osmo_cni_peer_id_type type;
+struct osmo_gsup_peer_id {
+	enum osmo_gsup_peer_id_type type;
 	union {
 		struct osmo_ipa_name ipa_name;
 	};
 };
 
-bool osmo_cni_peer_id_is_empty(const struct osmo_cni_peer_id *cni_peer_id);
-int osmo_cni_peer_id_set(struct osmo_cni_peer_id *cni_peer_id, enum osmo_cni_peer_id_type type,
+bool osmo_gsup_peer_id_is_empty(struct osmo_gsup_peer_id *gsup_peer_id);
+int osmo_gsup_peer_id_set(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,
 			  const uint8_t *val, size_t len);
-int osmo_cni_peer_id_set_str(struct osmo_cni_peer_id *cni_peer_id, enum osmo_cni_peer_id_type type,
+int osmo_gsup_peer_id_set_str(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,
 			      const char *str_fmt, ...);
-int osmo_cni_peer_id_cmp(const struct osmo_cni_peer_id *a, const struct osmo_cni_peer_id *b);
-const char *osmo_cni_peer_id_to_str(const struct osmo_cni_peer_id *cni_peer_id);
-const char *osmo_cni_peer_id_to_str_c(void *ctx, const struct osmo_cni_peer_id *cni_peer_id);
+int osmo_gsup_peer_id_cmp(const struct osmo_gsup_peer_id *a, const struct osmo_gsup_peer_id *b);
+const char *osmo_gsup_peer_id_to_str(const struct osmo_gsup_peer_id *gsup_peer_id);

include/osmocom/gsupclient/gsup_req.h

@@ -19,14 +19,14 @@
 #pragma once
 
 #include <osmocom/gsm/gsup.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 
 struct osmo_gsup_req;
 
 #define LOG_GSUP_REQ_CAT_SRC(req, subsys, level, file, line, fmt, args...) \
 	LOGPSRC(subsys, level, file, line, "GSUP %u: %s: IMSI-%s %s: " fmt, \
 		(req) ? (req)->nr : 0, \
-		(req) ? osmo_cni_peer_id_to_str(&(req)->source_name) : "NULL", \
+		(req) ? osmo_gsup_peer_id_to_str(&(req)->source_name) : "NULL", \
 		(req) ? (req)->gsup.imsi : "NULL", \
 		(req) ? osmo_gsup_message_type_name((req)->gsup.message_type) : "NULL", \
 		##args)
@@ -56,11 +56,11 @@ struct osmo_gsup_req {
 	/* The ultimate source of this message: the source_name form the GSUP message, or, if not present, then the
 	 * immediate GSUP peer. GSUP messages going via a proxy reflect the initial source in the source_name.
 	 * This source_name is implicitly added to the routes for the conn the message was received on. */
-	struct osmo_cni_peer_id source_name;
+	struct osmo_gsup_peer_id source_name;
 
 	/* If the source_name is not an immediate GSUP peer, this is set to the closest intermediate peer between here
 	 * and source_name. */
-	struct osmo_cni_peer_id via_proxy;
+	struct osmo_gsup_peer_id via_proxy;
 
 	/* Identify this request by number, for logging. */
 	unsigned int nr;
@@ -82,28 +82,24 @@ struct osmo_gsup_req {
 	struct msgb *msg;
 };
 
-struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_cni_peer_id *from_peer, struct msgb *msg,
+struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_gsup_peer_id *from_peer, struct msgb *msg,
 					osmo_gsup_req_send_response_t send_response_cb, void *cb_data,
 					struct llist_head *add_to_list);
 void osmo_gsup_req_free(struct osmo_gsup_req *req);
 
-/*! See _osmo_gsup_req_respond() for details.
- * Call _osmo_gsup_req_respond(), passing the caller's source file and line for logging. */
+/*! Call _osmo_gsup_req_respond() to convey the sender's source file and line in the logs. */
 #define osmo_gsup_req_respond(REQ, RESPONSE, ERROR, FINAL_RESPONSE) \
 	_osmo_gsup_req_respond(REQ, RESPONSE, ERROR, FINAL_RESPONSE, __FILE__, __LINE__)
 int _osmo_gsup_req_respond(struct osmo_gsup_req *req, struct osmo_gsup_message *response,
 			   bool error, bool final_response, const char *file, int line);
 
-/*! See _osmo_gsup_req_respond_msgt() for details.
- * Call _osmo_gsup_req_respond_msgt(), passing the caller's source file and line for logging. */
+/*! Call _osmo_gsup_req_respond_msgt() to convey the sender's source file and line in the logs. */
 #define osmo_gsup_req_respond_msgt(REQ, MESSAGE_TYPE, FINAL_RESPONSE) \
 	_osmo_gsup_req_respond_msgt(REQ, MESSAGE_TYPE, FINAL_RESPONSE, __FILE__, __LINE__)
 int _osmo_gsup_req_respond_msgt(struct osmo_gsup_req *req, enum osmo_gsup_message_type message_type,
 				bool final_response, const char *file, int line);
 
-/*! See _osmo_gsup_req_respond_err() for details.
- * Log an error message, and call _osmo_gsup_req_respond_err(), passing the caller's source file and line for logging.
- */
+/*! Log an error message, and call _osmo_gsup_req_respond() to convey the sender's source file and line in the logs. */
 #define osmo_gsup_req_respond_err(REQ, CAUSE, FMT, args...) do { \
 		LOG_GSUP_REQ(REQ, LOGL_ERROR, "%s: " FMT "\n", \
 			     get_value_string(gsm48_gmm_cause_names, CAUSE), ##args); \

include/osmocom/hlr/db.h

@@ -3,7 +3,8 @@
 #include <stdbool.h>
 #include <sqlite3.h>
 
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
+#include <osmocom/gsm/gsup.h>
 
 struct hlr;
 
@@ -33,6 +34,9 @@ enum stmt_idx {
 	DB_STMT_SET_LAST_LU_SEEN_PS,
 	DB_STMT_EXISTS_BY_IMSI,
 	DB_STMT_EXISTS_BY_MSISDN,
+	DB_STMT_IND_ADD,
+	DB_STMT_IND_SELECT,
+	DB_STMT_IND_DEL,
 	_NUM_DB_STMT
 };
 
@@ -163,6 +167,9 @@ int db_subscr_lu(struct db_context *dbc, int64_t subscr_id,
 int db_subscr_purge(struct db_context *dbc, const char *by_imsi,
 		    bool purge_val, bool is_ps);
 
+int db_ind(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr, unsigned int *ind);
+int db_ind_del(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr);
+
 /*! Call sqlite3_column_text() and copy result to a char[].
  * \param[out] buf  A char[] used as sizeof() arg(!) and osmo_strlcpy() target.
  * \param[in] stmt  An sqlite3_stmt*.

include/osmocom/hlr/dgsm.h

@@ -22,7 +22,7 @@
 #include <osmocom/mslookup/mslookup.h>
 #include <osmocom/hlr/gsup_server.h>
 #include <osmocom/hlr/logging.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/gsupclient/gsup_req.h>
 
 #define LOG_DGSM(imsi, level, fmt, args...) \

include/osmocom/hlr/gsup_server.h

@@ -5,7 +5,7 @@
 #include <osmocom/abis/ipa.h>
 #include <osmocom/abis/ipaccess.h>
 #include <osmocom/gsm/gsup.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/gsupclient/gsup_req.h>
 
 #ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN
@@ -74,5 +74,5 @@ int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup,
 					    uint8_t *msisdn_enc, size_t msisdn_enc_size,
 				            uint8_t *apn_buf, size_t apn_buf_size,
 					    enum osmo_gsup_cn_domain cn_domain);
-int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_cni_peer_id *to_peer,
+int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_gsup_peer_id *to_peer,
 				    struct osmo_gsup_req *req, struct osmo_gsup_message *modified_gsup);

include/osmocom/hlr/hlr.h

@@ -56,6 +56,7 @@ struct hlr {
 
 	struct llist_head euse_list;
 	struct hlr_euse *euse_default;
+	struct llist_head iuse_list;
 
 	/* NCSS (call independent) session guard timeout value */
 	int ncss_guard_timeout;

include/osmocom/hlr/mslookup_server.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/mslookup/mslookup.h>
 
 struct osmo_mslookup_query;

include/osmocom/hlr/proxy.h

@@ -22,7 +22,7 @@
 #include <time.h>
 #include <osmocom/gsm/protocol/gsm_23_003.h>
 #include <osmocom/core/sockaddr_str.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/hlr/timestamp.h>
 
 struct osmo_gsup_req;

sql/hlr.sql

@@ -79,8 +79,16 @@ CREATE TABLE auc_3g (
 	ind_bitlen	INTEGER NOT NULL DEFAULT 5
 );
 
+CREATE TABLE ind (
+	-- 3G auth IND pool to be used for this VLR
+	ind     INTEGER PRIMARY KEY,
+	-- VLR identification, usually the GSUP source_name
+	vlr     TEXT NOT NULL,
+	UNIQUE (vlr)
+);
+
 CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi);
 
 -- Set HLR database schema version number
 -- Note: This constant is currently duplicated in src/db.c and must be kept in sync!
-PRAGMA user_version = 5;
+PRAGMA user_version = 6;

src/Makefile.am

@@ -82,7 +82,7 @@ osmo_hlr_db_tool_SOURCES = \
 	logging.c \
 	rand_urandom.c \
 	dbd_decode_binary.c \
-	$(srcdir)/gsupclient/cni_peer_id.c \
+	$(srcdir)/gsupclient/gsup_peer_id.c \
 	$(NULL)
 
 osmo_hlr_db_tool_LDADD = \

src/db.c

@@ -22,13 +22,15 @@
 #include <stdbool.h>
 #include <sqlite3.h>
 #include <string.h>
+#include <errno.h>
 
 #include <osmocom/hlr/logging.h>
 #include <osmocom/hlr/db.h>
+
 #include "db_bootstrap.h"
 
 /* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */
-#define CURRENT_SCHEMA_VERSION	5
+#define CURRENT_SCHEMA_VERSION	6
 
 #define SEL_COLUMNS \
 	"id," \
@@ -85,6 +87,9 @@ static const char *stmt_sql[] = {
 	[DB_STMT_SET_LAST_LU_SEEN_PS] = "UPDATE subscriber SET last_lu_seen_ps = datetime($val, 'unixepoch') WHERE id = $subscriber_id",
 	[DB_STMT_EXISTS_BY_IMSI] = "SELECT 1 FROM subscriber WHERE imsi = $imsi",
 	[DB_STMT_EXISTS_BY_MSISDN] = "SELECT 1 FROM subscriber WHERE msisdn = $msisdn",
+	[DB_STMT_IND_ADD] = "INSERT INTO ind (vlr) VALUES ($vlr)",
+	[DB_STMT_IND_SELECT] = "SELECT ind FROM ind WHERE vlr = $vlr",
+	[DB_STMT_IND_DEL] = "DELETE FROM ind WHERE vlr = $vlr",
 };
 
 static void sql3_error_log_cb(void *arg, int err_code, const char *msg)
@@ -479,6 +484,29 @@ static int db_upgrade_v5(struct db_context *dbc)
 	return rc;
 }
 
+static int db_upgrade_v6(struct db_context *dbc)
+{
+	int rc;
+	const char *statements[] = {
+		"CREATE TABLE ind (\n"
+		"	-- 3G auth IND pool to be used for this VLR\n"
+		"	ind     INTEGER PRIMARY KEY,\n"
+		"	-- VLR identification, usually the GSUP source_name\n"
+		"	vlr     TEXT NOT NULL,\n"
+		"	UNIQUE (vlr)\n"
+		")"
+		,
+		"PRAGMA user_version = 6",
+	};
+
+	rc = db_run_statements(dbc, statements, ARRAY_SIZE(statements));
+	if (rc != SQLITE_DONE) {
+		LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version 6\n");
+		return rc;
+	}
+	return rc;
+}
+
 typedef int (*db_upgrade_func_t)(struct db_context *dbc);
 static db_upgrade_func_t db_upgrade_path[] = {
 	db_upgrade_v1,
@@ -486,6 +514,7 @@ static db_upgrade_func_t db_upgrade_path[] = {
 	db_upgrade_v3,
 	db_upgrade_v4,
 	db_upgrade_v5,
+	db_upgrade_v6,
 };
 
 static int db_get_user_version(struct db_context *dbc)
@@ -574,11 +603,9 @@ struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logg
 
 	char *err_msg;
 	rc = sqlite3_exec(dbc->db, "PRAGMA journal_mode=WAL; PRAGMA synchonous = NORMAL;", 0, 0, &err_msg);
-	if (rc != SQLITE_OK) {
+	if (rc != SQLITE_OK)
 		LOGP(DDB, LOGL_ERROR, "Unable to set Write-Ahead Logging: %s\n",
 			err_msg);
-		sqlite3_free(err_msg);
-	}
 
 	version = db_get_user_version(dbc);
 	if (version < 0) {

src/db_hlr.c

@@ -37,7 +37,7 @@
 #include <osmocom/hlr/logging.h>
 #include <osmocom/hlr/hlr.h>
 #include <osmocom/hlr/db.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 
 #define LOGHLR(imsi, level, fmt, args ...)	LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args)
 
@@ -884,3 +884,106 @@ out:
 
 	return ret;
 }
+
+static int _db_ind_run(struct db_context *dbc, sqlite3_stmt *stmt, const char *vlr, bool reset)
+{
+	int rc;
+
+	if (!db_bind_text(stmt, "$vlr", vlr))
+		return -EIO;
+
+	/* execute the statement */
+	rc = sqlite3_step(stmt);
+	if (reset)
+		db_remove_reset(stmt);
+	return rc;
+}
+
+static int _db_ind_add(struct db_context *dbc, const char *vlr)
+{
+	sqlite3_stmt *stmt = dbc->stmt[DB_STMT_IND_ADD];
+	if (_db_ind_run(dbc, stmt, vlr, true) != SQLITE_DONE) {
+		LOGP(DDB, LOGL_ERROR, "Cannot create IND entry for %s\n", osmo_quote_str_c(OTC_SELECT, vlr, -1));
+		return -EIO;
+	}
+	return 0;
+}
+
+static int _db_ind_del(struct db_context *dbc, const char *vlr)
+{
+	sqlite3_stmt *stmt = dbc->stmt[DB_STMT_IND_DEL];
+	_db_ind_run(dbc, stmt, vlr, true);
+	/* We don't really care about the result. If it didn't exist, then that was the goal anyway. */
+	return 0;
+}
+
+static int _db_ind_get(struct db_context *dbc, const char *vlr, unsigned int *ind)
+{
+	int ret = 0;
+	sqlite3_stmt *stmt = dbc->stmt[DB_STMT_IND_SELECT];
+	int rc = _db_ind_run(dbc, stmt, vlr, false);
+	if (rc == SQLITE_DONE) {
+		/* Does not exist yet */
+		ret = -ENOENT;
+		goto out;
+	} else if (rc != SQLITE_ROW) {
+		LOGP(DDB, LOGL_ERROR, "Error executing SQL: %d\n", rc);
+		ret = -EIO;
+		goto out;
+	}
+
+	OSMO_ASSERT(ind);
+	*ind = sqlite3_column_int64(stmt, 0);
+out:
+	db_remove_reset(stmt);
+	return ret;
+}
+
+int _db_ind(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr,
+	    unsigned int *ind, bool del)
+{
+	const char *vlr_name = NULL;
+	int rc;
+
+	switch (vlr->type) {
+	case OSMO_GSUP_PEER_ID_IPA_NAME:
+		if (vlr->ipa_name.len < 2 || vlr->ipa_name.val[vlr->ipa_name.len - 1] != '\0') {
+			LOGP(DDB, LOGL_ERROR, "Expecting VLR ipa_name to be zero terminated; found %s\n",
+			     osmo_ipa_name_to_str(&vlr->ipa_name));
+			return -ENOTSUP;
+		}
+		vlr_name = (const char*)vlr->ipa_name.val;
+		break;
+	default:
+		LOGP(DDB, LOGL_ERROR, "Unsupported osmo_gsup_peer_id type: %s\n",
+		     osmo_gsup_peer_id_type_name(vlr->type));
+		return -ENOTSUP;
+	}
+
+	if (del)
+		return _db_ind_del(dbc, vlr_name);
+
+	rc = _db_ind_get(dbc, vlr_name, ind);
+	if (!rc)
+		return 0;
+
+	/* Does not exist yet, create. */
+	rc = _db_ind_add(dbc, vlr_name);
+	if (rc) {
+		LOGP(DDB, LOGL_ERROR, "Error creating IND entry for %s\n", osmo_quote_str_c(OTC_SELECT, vlr_name, -1));
+		return rc;
+	}
+
+	/* To be sure, query again from scratch. */
+	return _db_ind_get(dbc, vlr_name, ind);
+}
+
+int db_ind(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr, unsigned int *ind)
+{
+	return _db_ind(dbc, vlr, ind, false);
+}
+
+int db_ind_del(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr)
+{
+	return _db_ind(dbc, vlr, NULL, true);
+}

src/dgsm.c

@@ -22,7 +22,7 @@
 #include <osmocom/mslookup/mslookup_client.h>
 #include <osmocom/mslookup/mslookup_client_mdns.h>
 #include <osmocom/gsupclient/gsup_client.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/hlr/logging.h>
 #include <osmocom/hlr/hlr.h>
 #include <osmocom/hlr/db.h>

src/dgsm_vty.c

@@ -24,7 +24,7 @@
 #include <osmocom/hlr/hlr_vty.h>
 #include <osmocom/hlr/mslookup_server.h>
 #include <osmocom/hlr/mslookup_server_mdns.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 
 struct cmd_node mslookup_node = {
 	MSLOOKUP_NODE,
@@ -119,7 +119,7 @@ DEFUN(cfg_mslookup_mdns_domain_suffix,
 
 DEFUN(cfg_mslookup_no_mdns,
       cfg_mslookup_no_mdns_cmd,
-      "no mdns bind",
+      "no mdns",
       NO_STR "Disable both server and client for mDNS mslookup\n")
 {
 	g_hlr->mslookup.server.mdns.enable = false;
@@ -178,9 +178,9 @@ DEFUN(cfg_mslookup_server_mdns_domain_suffix,
 	return CMD_SUCCESS;
 }
 
-DEFUN(cfg_mslookup_server_no_mdns_bind,
-      cfg_mslookup_server_no_mdns_bind_cmd,
-      "no mdns bind",
+DEFUN(cfg_mslookup_server_no_mdns,
+      cfg_mslookup_server_no_mdns_cmd,
+      "no mdns",
       NO_STR "Disable server for mDNS mslookup (do not answer remote requests)\n")
 {
 	g_hlr->mslookup.server.mdns.enable = false;
@@ -366,8 +366,8 @@ DEFUN(cfg_mslookup_client_timeout,
 		vty_out(vty, "%% 'exit' this node to apply changes%s", VTY_NEWLINE)
 
 
-DEFUN(cfg_mslookup_client_mdns_bind,
-      cfg_mslookup_client_mdns_bind_cmd,
+DEFUN(cfg_mslookup_client_mdns,
+      cfg_mslookup_client_mdns_cmd,
       "mdns bind [IP] [<1-65535>]",
       MDNS_STR
       "Enable mDNS client, and configure multicast address to send mDNS mslookup requests to\n"
@@ -388,9 +388,9 @@ DEFUN(cfg_mslookup_client_mdns_domain_suffix,
 	return CMD_SUCCESS;
 }
 
-DEFUN(cfg_mslookup_client_no_mdns_bind,
-      cfg_mslookup_client_no_mdns_bind_cmd,
-      "no mdns bind",
+DEFUN(cfg_mslookup_client_no_mdns,
+      cfg_mslookup_client_no_mdns_cmd,
+      "no mdns",
       NO_STR "Disable mDNS client, do not query remote services by mDNS\n")
 {
 	g_hlr->mslookup.client.mdns.enable = false;
@@ -467,7 +467,7 @@ int config_write_mslookup(struct vty *vty)
 
 		if (g_hlr->mslookup.client.mdns.enable
 		    && osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.client.mdns.query_addr))
-			vty_out(vty, "  mdns bind %s %u%s",
+			vty_out(vty, "  mdns to %s %u%s",
 				g_hlr->mslookup.client.mdns.query_addr.ip,
 				g_hlr->mslookup.client.mdns.query_addr.port,
 				VTY_NEWLINE);
@@ -555,7 +555,7 @@ void dgsm_vty_init(void)
 	install_node(&mslookup_server_node, NULL);
 	install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_mdns_bind_cmd);
 	install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_mdns_domain_suffix_cmd);
-	install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_no_mdns_bind_cmd);
+	install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_no_mdns_cmd);
 	install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_msc_service_cmd);
 	install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_msc_no_service_cmd);
 	install_element(MSLOOKUP_SERVER_NODE, &cfg_mslookup_server_msc_no_service_addr_cmd);
@@ -570,9 +570,9 @@ void dgsm_vty_init(void)
 	install_element(MSLOOKUP_NODE, &cfg_mslookup_no_client_cmd);
 	install_node(&mslookup_client_node, NULL);
 	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_timeout_cmd);
-	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_mdns_bind_cmd);
+	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_mdns_cmd);
 	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_mdns_domain_suffix_cmd);
-	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_no_mdns_bind_cmd);
+	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_no_mdns_cmd);
 	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_gateway_proxy_cmd);
 	install_element(MSLOOKUP_CLIENT_NODE, &cfg_mslookup_client_no_gateway_proxy_cmd);
 

src/gsup_server.c

@@ -65,13 +65,13 @@ int osmo_gsup_conn_send(struct osmo_gsup_conn *conn, struct msgb *msg)
 static void gsup_server_send_req_response(struct osmo_gsup_req *req, struct osmo_gsup_message *response)
 {
 	struct osmo_gsup_server *server = req->cb_data;
-	struct osmo_cni_peer_id *routing;
+	struct osmo_gsup_peer_id *routing;
 	struct osmo_gsup_conn *conn = NULL;
 	struct msgb *msg = osmo_gsup_msgb_alloc("GSUP Tx");
 	int rc;
 
 	if (response->message_type == OSMO_GSUP_MSGT_ROUTING_ERROR
-	    && !osmo_cni_peer_id_is_empty(&req->via_proxy)) {
+	    && !osmo_gsup_peer_id_is_empty(&req->via_proxy)) {
 		/* If a routing error occured, we need to route back via the immediate sending peer, not via the
 		 * intended final recipient -- because one source of routing errors is a duplicate name for a recipient.
 		 * If we resolve to req->source_name, we may send to a completely unrelated recipient. */
@@ -80,12 +80,12 @@ static void gsup_server_send_req_response(struct osmo_gsup_req *req, struct osmo
 		routing = &req->source_name;
 	}
 	switch (routing->type) {
-	case OSMO_CNI_PEER_ID_IPA_NAME:
+	case OSMO_GSUP_PEER_ID_IPA_NAME:
 		conn = gsup_route_find_by_ipa_name(server, &routing->ipa_name);
 		break;
 	default:
 		LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP peer id kind not supported: %s\n",
-			     osmo_cni_peer_id_type_name(routing->type));
+			     osmo_gsup_peer_id_type_name(routing->type));
 		break;
 	}
 
@@ -111,22 +111,22 @@ static void gsup_server_send_req_response(struct osmo_gsup_req *req, struct osmo
 struct osmo_gsup_req *osmo_gsup_conn_rx(struct osmo_gsup_conn *conn, struct msgb *msg)
 {
 	struct osmo_gsup_req *req;
-	struct osmo_cni_peer_id cpi = {
-		.type = OSMO_CNI_PEER_ID_IPA_NAME,
+	struct osmo_gsup_peer_id gpi = {
+		.type = OSMO_GSUP_PEER_ID_IPA_NAME,
 		.ipa_name = conn->peer_name,
 	};
 
-	req = osmo_gsup_req_new(conn->server, &cpi, msg, gsup_server_send_req_response, conn->server, NULL);
+	req = osmo_gsup_req_new(conn->server, &gpi, msg, gsup_server_send_req_response, conn->server, NULL);
 	if (!req)
 		return NULL;
 
-	if (!osmo_cni_peer_id_is_empty(&req->via_proxy)) {
+	if (!osmo_gsup_peer_id_is_empty(&req->via_proxy)) {
 		switch (req->via_proxy.type) {
-		case OSMO_CNI_PEER_ID_IPA_NAME:
+		case OSMO_GSUP_PEER_ID_IPA_NAME:
 			break;
 		default:
 			LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP peer id kind not supported: %s\n",
-				     osmo_cni_peer_id_type_name(req->source_name.type));
+				     osmo_gsup_peer_id_type_name(req->source_name.type));
 			osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true);
 			return NULL;
 		}
@@ -137,7 +137,7 @@ struct osmo_gsup_req *osmo_gsup_conn_rx(struct osmo_gsup_conn *conn, struct msgb
 			LOG_GSUP_REQ(req, LOGL_ERROR,
 				     "GSUP message received from %s via peer %s, but there already exists a"
 				     " different route to this source, message is not routable\n",
-				     osmo_cni_peer_id_to_str(&req->source_name),
+				     osmo_gsup_peer_id_to_str(&req->source_name),
 				     osmo_ipa_name_to_str(&conn->peer_name));
 			osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true);
 			return NULL;
@@ -274,7 +274,7 @@ static int osmo_gsup_server_ccm_cb(struct ipa_server_conn *conn,
 {
 	struct osmo_gsup_conn *clnt = (struct osmo_gsup_conn *)conn->data;
 	uint8_t *addr = NULL;
-	int addr_len;
+	size_t addr_len;
 
 	LOGP(DLGSUP, LOGL_INFO, "CCM Callback\n");
 
@@ -459,6 +459,7 @@ int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup,
 	return 0;
 }
 
+
 /**
  * Populate a gsup message structure with an Insert Subscriber Data Message.
  * All required memory buffers for data pointed to by pointers in struct omso_gsup_message
@@ -475,46 +476,46 @@ int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup,
  * \returns 0 on success, and negative on error.
  */
 int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, const char *imsi, const char *msisdn,
-						uint8_t *msisdn_enc, size_t msisdn_enc_size,
-						uint8_t *apn_buf, size_t apn_buf_size,
-						enum osmo_gsup_cn_domain cn_domain)
+                                               uint8_t *msisdn_enc, size_t msisdn_enc_size,
+                                               uint8_t *apn_buf, size_t apn_buf_size,
+                                               enum osmo_gsup_cn_domain cn_domain)
 {
-	int len;
+       int len;
 
-	OSMO_ASSERT(gsup);
-	*gsup = (struct osmo_gsup_message){
-		.message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST,
-	};
+       OSMO_ASSERT(gsup);
+       *gsup = (struct osmo_gsup_message){
+	       .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST,
+       };
 
-	osmo_strlcpy(gsup->imsi, imsi, sizeof(gsup->imsi));
+       osmo_strlcpy(gsup->imsi, imsi, sizeof(gsup->imsi));
 
-	if (msisdn_enc_size < OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN)
-		return -ENOSPC;
+       if (msisdn_enc_size < OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN)
+               return -ENOSPC;
 
-	OSMO_ASSERT(msisdn_enc);
-	len = gsm48_encode_bcd_number(msisdn_enc, msisdn_enc_size, 0, msisdn);
-	if (len < 1) {
-		LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", imsi, msisdn);
-		return -ENOSPC;
-	}
-	gsup->msisdn_enc = msisdn_enc;
-	gsup->msisdn_enc_len = len;
+       OSMO_ASSERT(msisdn_enc);
+       len = gsm48_encode_bcd_number(msisdn_enc, msisdn_enc_size, 0, msisdn);
+       if (len < 1) {
+               LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", imsi, msisdn);
+               return -ENOSPC;
+       }
+       gsup->msisdn_enc = msisdn_enc;
+       gsup->msisdn_enc_len = len;
 
-	#pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc"
+       #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc"
 
-	gsup->cn_domain = cn_domain;
-	if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) {
-		OSMO_ASSERT(apn_buf_size >= APN_MAXLEN);
-		OSMO_ASSERT(apn_buf);
-		/* FIXME: PDP infos - use more fine-grained access control
-		   instead of wildcard APN */
-		osmo_gsup_configure_wildcard_apn(gsup, apn_buf, apn_buf_size);
-	}
+       gsup->cn_domain = cn_domain;
+       if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) {
+               OSMO_ASSERT(apn_buf_size >= APN_MAXLEN);
+               OSMO_ASSERT(apn_buf);
+               /* FIXME: PDP infos - use more fine-grained access control
+                  instead of wildcard APN */
+               osmo_gsup_configure_wildcard_apn(gsup, apn_buf, apn_buf_size);
+       }
 
-	return 0;
+       return 0;
 }
 
-int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_cni_peer_id *to_peer,
+int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_gsup_peer_id *to_peer,
 				    struct osmo_gsup_req *req, struct osmo_gsup_message *modified_gsup)
 {
 	int rc;
@@ -523,22 +524,22 @@ int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struc
 	 * is required to return this as gsup->destination_name so that the reply gets routed to the original sender. */
 	struct osmo_gsup_message forward = *(modified_gsup? : &req->gsup);
 
-	if (req->source_name.type != OSMO_CNI_PEER_ID_IPA_NAME) {
+	if (req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) {
 		osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s",
-					  osmo_cni_peer_id_type_name(req->source_name.type));
+					  osmo_gsup_peer_id_type_name(req->source_name.type));
 		rc = -ENOTSUP;
 		goto routing_error;
 	}
 	forward.source_name = req->source_name.ipa_name.val;
 	forward.source_name_len = req->source_name.ipa_name.len;
 
-	if (to_peer->type != OSMO_CNI_PEER_ID_IPA_NAME) {
+	if (to_peer->type != OSMO_GSUP_PEER_ID_IPA_NAME) {
 		osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s",
-					  osmo_cni_peer_id_type_name(to_peer->type));
+					  osmo_gsup_peer_id_type_name(to_peer->type));
 		rc = -ENOTSUP;
 		goto routing_error;
 	}
-	LOG_GSUP_REQ(req, LOGL_INFO, "Forwarding to %s\n", osmo_cni_peer_id_to_str(to_peer));
+	LOG_GSUP_REQ(req, LOGL_INFO, "Forwarding to %s\n", osmo_gsup_peer_id_to_str(to_peer));
 	rc = osmo_gsup_enc_send_to_ipa_name(server, &to_peer->ipa_name, &forward);
 	if (rc)
 		goto routing_error;

src/gsupclient/Makefile.am

@@ -9,7 +9,7 @@ AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/incl
 lib_LTLIBRARIES = libosmo-gsup-client.la
 
 libosmo_gsup_client_la_SOURCES = \
-	cni_peer_id.c \
+	gsup_peer_id.c \
 	gsup_client.c \
 	gsup_req.c \
 	$(NULL)

src/gsupclient/gsup_peer_id.c

@@ -19,9 +19,9 @@
 #include <errno.h>
 #include <string.h>
 #include <osmocom/core/utils.h>
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 
-bool osmo_ipa_name_is_empty(const struct osmo_ipa_name *ipa_name)
+bool osmo_ipa_name_is_empty(struct osmo_ipa_name *ipa_name)
 {
 	return (!ipa_name) || (!ipa_name->len);
 }
@@ -90,61 +90,55 @@ int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name
 	}
 }
 
-/* Call osmo_ipa_name_to_str_c with OTC_SELECT. */
-const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name)
-{
-	return osmo_ipa_name_to_str_c(OTC_SELECT, ipa_name);
-}
-
 /* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */
-const char *osmo_ipa_name_to_str_c(void *ctx, const struct osmo_ipa_name *ipa_name)
+const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name)
 {
 	size_t len = ipa_name->len;
 	if (!len)
-		return talloc_strdup(ctx, "");
+		return "";
 	if (ipa_name->val[len-1] == '\0')
 		len--;
-	return osmo_escape_str_c(ctx, (char*)ipa_name->val, len);
+	return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len);
 }
 
-bool osmo_cni_peer_id_is_empty(const struct osmo_cni_peer_id *cni_peer_id)
+bool osmo_gsup_peer_id_is_empty(struct osmo_gsup_peer_id *gsup_peer_id)
 {
-	if (!cni_peer_id)
+	if (!gsup_peer_id)
 		return true;
-	switch (cni_peer_id->type) {
-	case OSMO_CNI_PEER_ID_EMPTY:
+	switch (gsup_peer_id->type) {
+	case OSMO_GSUP_PEER_ID_EMPTY:
 		return true;
-	case OSMO_CNI_PEER_ID_IPA_NAME:
-		return osmo_ipa_name_is_empty(&cni_peer_id->ipa_name);
+	case OSMO_GSUP_PEER_ID_IPA_NAME:
+		return osmo_ipa_name_is_empty(&gsup_peer_id->ipa_name);
 	default:
 		return false;
 	}
 }
-int osmo_cni_peer_id_set(struct osmo_cni_peer_id *cni_peer_id, enum osmo_cni_peer_id_type type,
+int osmo_gsup_peer_id_set(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,
 			  const uint8_t *val, size_t len)
 {
-	cni_peer_id->type = type;
+	gsup_peer_id->type = type;
 	switch (type) {
-	case OSMO_CNI_PEER_ID_IPA_NAME:
-		return osmo_ipa_name_set(&cni_peer_id->ipa_name, val, len);
+	case OSMO_GSUP_PEER_ID_IPA_NAME:
+		return osmo_ipa_name_set(&gsup_peer_id->ipa_name, val, len);
 	default:
 		return -EINVAL;
 	}
 }
 
-int osmo_cni_peer_id_set_str(struct osmo_cni_peer_id *cni_peer_id, enum osmo_cni_peer_id_type type,
+int osmo_gsup_peer_id_set_str(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type,
 			      const char *str_fmt, ...)
 {
 	va_list ap;
 	int rc;
 
-	*cni_peer_id = (struct osmo_cni_peer_id){};
+	*gsup_peer_id = (struct osmo_gsup_peer_id){};
 
 	switch (type) {
-	case OSMO_CNI_PEER_ID_IPA_NAME:
-		cni_peer_id->type = OSMO_CNI_PEER_ID_IPA_NAME;
+	case OSMO_GSUP_PEER_ID_IPA_NAME:
+		gsup_peer_id->type = OSMO_GSUP_PEER_ID_IPA_NAME;
 		va_start(ap, str_fmt);
-		rc = osmo_ipa_name_set_str_va(&cni_peer_id->ipa_name, str_fmt, ap);
+		rc = osmo_ipa_name_set_str_va(&gsup_peer_id->ipa_name, str_fmt, ap);
 		va_end(ap);
 		return rc;
 	default:
@@ -152,42 +146,30 @@ int osmo_cni_peer_id_set_str(struct osmo_cni_peer_id *cni_peer_id, enum osmo_cni
 	}
 }
 
-int osmo_cni_peer_id_cmp(const struct osmo_cni_peer_id *a, const struct osmo_cni_peer_id *b)
+int osmo_gsup_peer_id_cmp(const struct osmo_gsup_peer_id *a, const struct osmo_gsup_peer_id *b)
 {
-	if (a == b)
-		return 0;
-	if (!a)
-		return -1;
-	if (!b)
-		return 1;
 	if (a->type != b->type)
 		return OSMO_CMP(a->type, b->type);
 	switch (a->type) {
-	case OSMO_CNI_PEER_ID_IPA_NAME:
+	case OSMO_GSUP_PEER_ID_IPA_NAME:
 		return osmo_ipa_name_cmp(&a->ipa_name, &b->ipa_name);
 	default:
 		return -EINVAL;
 	}
 }
 
-const struct value_string osmo_cni_peer_id_type_names[] = {
-	{ OSMO_CNI_PEER_ID_IPA_NAME, "IPA-name" },
+const struct value_string osmo_gsup_peer_id_type_names[] = {
+	{ OSMO_GSUP_PEER_ID_IPA_NAME, "IPA-name" },
 	{}
 };
 
-/* Call osmo_cni_peer_id_to_str_c with OTC_SELECT */
-const char *osmo_cni_peer_id_to_str(const struct osmo_cni_peer_id *cpi)
-{
-	return osmo_cni_peer_id_to_str_c(OTC_SELECT, cpi);
-}
-
 /* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */
-const char *osmo_cni_peer_id_to_str_c(void *ctx, const struct osmo_cni_peer_id *cpi)
+const char *osmo_gsup_peer_id_to_str(const struct osmo_gsup_peer_id *gpi)
 {
-	switch (cpi->type) {
-	case OSMO_CNI_PEER_ID_IPA_NAME:
-		return osmo_ipa_name_to_str_c(ctx, &cpi->ipa_name);
+	switch (gpi->type) {
+	case OSMO_GSUP_PEER_ID_IPA_NAME:
+		return osmo_ipa_name_to_str(&gpi->ipa_name);
 	default:
-		return talloc_strdup(ctx, osmo_cni_peer_id_type_name(cpi->type));
+		return osmo_gsup_peer_id_type_name(gpi->type);
 	}
 }

src/gsupclient/gsup_req.c

@@ -25,81 +25,26 @@
 #include <osmocom/gsupclient/gsup_req.h>
 
 /*! Create a new osmo_gsup_req record, decode GSUP and add to a provided list of requests.
- *
- * Rationales:
- *
- * - osmo_gsup_req makes it easy to handle GSUP requests asynchronously. Before this, a GSUP message struct would be
- *   valid only within a read callback function, and would not survive asynchronous handling, because the struct often
- *   points directly into the received msgb. An osmo_gsup_req takes ownership of the msgb and ensures that the data
- *   remains valid, so that it can easily be queued for later handling.
- * - osmo_gsup_req unifies the composition of response messages to ensure that all IEs that identify it to belong to
- *   the initial request are preserved / derived, like the source_name, destination_name, session_id, etc (see
- *   osmo_gsup_make_response() for details).
- * - Deallocation of an osmo_gsup_req is implicit upon sending a response. The idea is that msgb memory leaks are a
- *   recurring source of bugs. By enforcing a request-response relation with implicit deallocation, osmo_gsup_req aims
- *   to help avoid most such memory leaks implicitly.
- *
- * The typical GSUP message sequence is:
- *   -> rx request,
- *   <- tx response.
- *
- * With osmo_gsup_req we can easily expand to:
- *   -> rx request,
- *   ... wait asynchronously,
- *   <- tx response.
- *
- * Only few GSUP conversations go beyond a 1:1 request-response match. But some have a session (e.g. USSD) or more
- * negotiation may happen before the initial request is completed (e.g. Update Location with interleaved Insert
- * Subscriber Data), so osmo_gsup_req also allows passing non-final responses.
- * The final_response flag allows for:
- *    -> rx request,
- *    ... wait async,
- *    <- tx intermediate message to same peer (final_response = false, req remains open),
- *    ... wait async,
- *    -> rx intermediate response,
- *    ... wait async,
- *    <- tx final response (final_response = true, req is deallocated).
- *
  * This function takes ownership of the msgb, which will, on success, be owned by the returned osmo_gsup_req instance
  * until osmo_gsup_req_free(). If a decoding error occurs, send an error response immediately, and return NULL.
  *
- * The original CNI entity that sent the message is found in req->source_name. If the message was passed on by an
- * intermediate CNI peer, then req->via_proxy is set to the immediate peer, and it is the responsibility of the caller
- * to add req->source_name to the GSUP routes that are serviced by req->via_proxy (usually not relevant for clients with
- * a single GSUP conn).
- * Examples:
- *
- *   "msc" ---> here
- *   source_name = "msc"
- *   via_proxy = <empty>
- *
- *   "msc" ---> "proxy-HLR" ---> here (e.g. home HLR)
- *   source_name = "msc"
- *   via_proxy = "proxy-HLR"
- *
- *   "msc" ---> "proxy-HLR" ---> "home-HLR" ---> here (e.g. EUSE)
- *   source_name = "msc"
- *   via_proxy = "home-HLR"
- *
- * An osmo_gsup_req must be concluded (and deallocated) by calling one of the osmo_gsup_req_respond* functions.
+ * When this function returns, the original sender is found in req->source_name. If this is not the immediate peer name,
+ * then req->via_proxy is set to the immediate peer, and it is the responsibility of the caller to add req->source_name
+ * to the GSUP routes that are serviced by req->via_proxy (usually not relevant for clients with a single GSUP conn).
  *
  * Note: osmo_gsup_req API makes use of OTC_SELECT to allocate volatile buffers for logging. Use of
  * osmo_select_main_ctx() is mandatory when using osmo_gsup_req.
  *
  * \param[in] ctx  Talloc context for allocation of the new request.
  * \param[in] from_peer  The IPA unit name of the immediate GSUP peer from which this msgb was received.
- * \param[in] msg  The message buffer containing the received GSUP message, where msgb_l2() shall point to the GSUP
- *                 message start. The caller no longer owns the msgb when it is passed to this function: on error, the
- *                 msgb is freed immediately, and on success, the msgb is owned by the returned osmo_gsup_req.
+ * \param[in] msg  The GSUP message buffer.
  * \param[in] send_response_cb  User specific method to send a GSUP response message, invoked upon
- *				osmo_gsup_req_respond*() functions. Typically this invokes encoding and transmitting the
- *				GSUP message over a network socket. See for example gsup_server_send_req_response().
+ *				osmo_gsup_req_respond*() functions.
  * \param[inout] cb_data  Context data to be used freely by the caller.
  * \param[inout] add_to_list  List to which to append this request, or NULL for no list.
- * \return a newly allocated osmo_gsup_req, or NULL on error. If NULL is returned, an error response has already been
- *         dispatched to the send_response_cb.
+ * \return a newly allocated osmo_gsup_req, or NULL on error.
  */
-struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_cni_peer_id *from_peer, struct msgb *msg,
+struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_gsup_peer_id *from_peer, struct msgb *msg,
 					osmo_gsup_req_send_response_t send_response_cb, void *cb_data,
 					struct llist_head *add_to_list)
 {
@@ -107,15 +52,9 @@ struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_cni_peer_id
 	struct osmo_gsup_req *req;
 	int rc;
 
-	if (!from_peer) {
-		LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from NULL peer is not allowed\n");
-		msgb_free(msg);
-		return NULL;
-	}
-
 	if (!msgb_l2(msg) || !msgb_l2len(msg)) {
 		LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: missing or empty L2 data\n",
-		     osmo_cni_peer_id_to_str(from_peer));
+		     osmo_gsup_peer_id_to_str(from_peer));
 		msgb_free(msg);
 		return NULL;
 	}
@@ -127,10 +66,11 @@ struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_cni_peer_id
 	req->msg = msg;
 	req->send_response_cb = send_response_cb;
 	req->cb_data = cb_data;
-	req->source_name = *from_peer;
+	if (from_peer)
+		req->source_name = *from_peer;
 	rc = osmo_gsup_decode(msgb_l2(req->msg), msgb_l2len(req->msg), (struct osmo_gsup_message*)&req->gsup);
 	if (rc < 0) {
-		LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: cannot decode (rc=%d)\n", osmo_cni_peer_id_to_str(from_peer), rc);
+		LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: cannot decode (rc=%d)\n", osmo_gsup_peer_id_to_str(from_peer), rc);
 		osmo_gsup_req_free(req);
 		return NULL;
 	}
@@ -138,18 +78,18 @@ struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_cni_peer_id
 	LOG_GSUP_REQ(req, LOGL_DEBUG, "new request: {%s}\n", osmo_gsup_message_to_str_c(OTC_SELECT, &req->gsup));
 
 	if (req->gsup.source_name_len) {
-		if (osmo_cni_peer_id_set(&req->source_name, OSMO_CNI_PEER_ID_IPA_NAME,
+		if (osmo_gsup_peer_id_set(&req->source_name, OSMO_GSUP_PEER_ID_IPA_NAME,
 					  req->gsup.source_name, req->gsup.source_name_len)) {
 			LOGP(DLGSUP, LOGL_ERROR,
 			     "Rx GSUP from %s: failed to decode source_name, message is not routable\n",
-			     osmo_cni_peer_id_to_str(from_peer));
+			     osmo_gsup_peer_id_to_str(from_peer));
 			osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true);
 			return NULL;
 		}
 
 		/* The source of the GSUP message is not the immediate GSUP peer; the peer is our proxy for that source.
 		 */
-		if (osmo_cni_peer_id_cmp(&req->source_name, from_peer))
+		if (osmo_gsup_peer_id_cmp(&req->source_name, from_peer))
 			req->via_proxy = *from_peer;
 	}
 
@@ -164,8 +104,6 @@ struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_cni_peer_id
 	return req;
 }
 
-/*! Free an osmo_gsup_req and its msgb -- this is usually implicit in osmo_gsup_req_resond_*(), it should not be
- * necessary to call this directly. */
 void osmo_gsup_req_free(struct osmo_gsup_req *req)
 {
 	LOG_GSUP_REQ(req, LOGL_DEBUG, "free\n");
@@ -176,25 +114,6 @@ void osmo_gsup_req_free(struct osmo_gsup_req *req)
 	talloc_free(req);
 }
 
-/*! Send a response to a GSUP request.
- *
- * Ensure that the response message contains all GSUP IEs that identify it as a response for the request req, by calling
- * osmo_gsup_make_response().
- *
- * The final complete response message is passed to req->send_response_cb() to take care of the transmission.
- *
- * \param req  Request as previously initialized by osmo_gsup_req_new().
- * \param response  Buffer to compose the response, possibly with some pre-configured IEs.
- *                  Any missing IEs are added via osmo_gsup_make_response().
- *                  Must not be NULL. Does not need to remain valid memory beyond the function call,
- *                  i.e. this can just be a local variable in the calling function.
- * \param error  True when the response message indicates an error response (error message type).
- * \param final_response  True when the request is concluded by this response, which deallocates the req.
- *                        False when the request should remain open after this response.
- *                        For most plain request->response GSUP messages, this should be True.
- * \param file  Source file for logging as in __FILE__, added by osmo_gsup_req_respond() macro.
- * \param line  Source line for logging as in __LINE__, added by osmo_gsup_req_respond() macro.
- */
 int _osmo_gsup_req_respond(struct osmo_gsup_req *req, struct osmo_gsup_message *response,
 			   bool error, bool final_response, const char *file, int line)
 {
@@ -225,18 +144,6 @@ exit_cleanup:
 	return rc;
 }
 
-/*! Shorthand for _osmo_gsup_req_respond() with no additional IEs and a fixed message type.
- * Set the message type in a local osmo_gsup_message and feed it to _osmo_gsup_req_respond().
- * That will ensure to add all IEs that identify it as a response to req.
- *
- * \param req  Request as previously initialized by osmo_gsup_req_new().
- * \param message_type  The GSUP message type discriminator to respond with.
- * \param final_response  True when the request is concluded by this response, which deallocates the req.
- *                        False when the request should remain open after this response.
- *                        For most plain request->response GSUP messages, this should be True.
- * \param file  Source file for logging as in __FILE__, added by osmo_gsup_req_respond_msgt() macro.
- * \param line  Source line for logging as in __LINE__, added by osmo_gsup_req_respond_msgt() macro.
- */
 int _osmo_gsup_req_respond_msgt(struct osmo_gsup_req *req, enum osmo_gsup_message_type message_type,
 				bool final_response, const char *file, int line)
 {
@@ -247,17 +154,6 @@ int _osmo_gsup_req_respond_msgt(struct osmo_gsup_req *req, enum osmo_gsup_messag
 				      file, line);
 }
 
-/*! Shorthand for _osmo_gsup_req_respond() with an error cause IEs and using the req's matched error message type.
- * Set the error cause in a local osmo_gsup_message and feed it to _osmo_gsup_req_respond().
- * That will ensure to add all IEs that identify it as a response to req.
- *
- * Responding with an error always implies a final response: req is implicitly deallocated.
- *
- * \param req  Request as previously initialized by osmo_gsup_req_new().
- * \param cause  The error cause to include in a OSMO_GSUP_CAUSE_IE.
- * \param file  Source file for logging as in __FILE__, added by osmo_gsup_req_respond_err() macro.
- * \param line  Source line for logging as in __LINE__, added by osmo_gsup_req_respond_err() macro.
- */
 void _osmo_gsup_req_respond_err(struct osmo_gsup_req *req, enum gsm48_gmm_cause cause,
 				const char *file, int line)
 {

src/hlr.c

@@ -38,7 +38,7 @@
 #include <osmocom/gsm/gsm23003.h>
 #include <osmocom/mslookup/mslookup_client.h>
 
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/hlr/db.h>
 #include <osmocom/hlr/hlr.h>
 #include <osmocom/hlr/ctrl.h>
@@ -268,9 +268,9 @@ int hlr_subscr_nam(struct hlr *hlr, struct hlr_subscriber *subscr, bool nam_val,
 	if (nam_val)
 		return 0;
 
-	if (subscr->vlr_number[0] && !osmo_ipa_name_set_str(&vlr_name, subscr->vlr_number))
+	if (subscr->vlr_number && osmo_ipa_name_set_str(&vlr_name, subscr->vlr_number))
 		osmo_gsup_enc_send_to_ipa_name(g_hlr->gs, &vlr_name, &gsup_del_data);
-	if (subscr->sgsn_number[0] && !osmo_ipa_name_set_str(&vlr_name, subscr->sgsn_number))
+	if (subscr->sgsn_number && osmo_ipa_name_set_str(&vlr_name, subscr->sgsn_number))
 		osmo_gsup_enc_send_to_ipa_name(g_hlr->gs, &vlr_name, &gsup_del_data);
 	return 0;
 }
@@ -280,13 +280,13 @@ int hlr_subscr_nam(struct hlr *hlr, struct hlr_subscriber *subscr, bool nam_val,
  ***********************************************************************/
 
 /* process an incoming SAI request */
-static int rx_send_auth_info(unsigned int auc_3g_ind, struct osmo_gsup_req *req)
+static int rx_send_auth_info(struct osmo_gsup_req *req)
 {
 	struct osmo_gsup_message gsup_out = {
 		.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT,
 	};
 	bool separation_bit = false;
-	int num_auth_vectors = OSMO_GSUP_MAX_NUM_AUTH_INFO;
+	unsigned int auc_3g_ind;
 	int rc;
 
 	subscr_create_on_demand(req->gsup.imsi);
@@ -294,13 +294,18 @@ static int rx_send_auth_info(unsigned int auc_3g_ind, struct osmo_gsup_req *req)
 	if (req->gsup.current_rat_type == OSMO_RAT_EUTRAN_SGS)
 		separation_bit = true;
 
-	if (req->gsup.num_auth_vectors > 0 &&
-			req->gsup.num_auth_vectors <= OSMO_GSUP_MAX_NUM_AUTH_INFO)
-		num_auth_vectors = req->gsup.num_auth_vectors;
+	rc = db_ind(g_hlr->dbc, &req->source_name, &auc_3g_ind);
+	if (rc) {
+		LOG_GSUP_REQ(req, LOGL_ERROR,
+			     "Unable to determine 3G auth IND for source %s (rc=%d),"
+			     " generating tuples with IND = 0\n",
+			     osmo_gsup_peer_id_to_str(&req->source_name), rc);
+		auc_3g_ind = 0;
+	}
 
 	rc = db_get_auc(g_hlr->dbc, req->gsup.imsi, auc_3g_ind,
 			gsup_out.auth_vectors,
-			num_auth_vectors,
+			ARRAY_SIZE(gsup_out.auth_vectors),
 			req->gsup.rand, req->gsup.auts, separation_bit);
 
 	if (rc <= 0) {
@@ -448,8 +453,8 @@ static int read_cb_forward(struct osmo_gsup_req *req)
 	struct osmo_ipa_name destination_name;
 
 	/* Check for routing IEs */
-	if (!req->gsup.source_name || !req->gsup.source_name_len
-	    || !req->gsup.destination_name || !req->gsup.destination_name_len) {
+	if (!req->gsup.source_name[0] || !req->gsup.source_name_len
+	    || !req->gsup.destination_name[0] || !req->gsup.destination_name_len) {
 		LOGP_GSUP_FWD(&req->gsup, LOGL_ERROR, "missing routing IEs\n");
 		goto routing_error;
 	}
@@ -516,7 +521,7 @@ static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg)
 	switch (req->gsup.message_type) {
 	/* requests sent to us */
 	case OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST:
-		rx_send_auth_info(conn->auc_3g_ind, req);
+		rx_send_auth_info(req);
 		break;
 	case OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST:
 		rx_upd_loc_req(conn, req);
@@ -707,6 +712,7 @@ int main(int argc, char **argv)
 
 	g_hlr = talloc_zero(hlr_ctx, struct hlr);
 	INIT_LLIST_HEAD(&g_hlr->euse_list);
+	INIT_LLIST_HEAD(&g_hlr->iuse_list);
 	INIT_LLIST_HEAD(&g_hlr->ss_sessions);
 	INIT_LLIST_HEAD(&g_hlr->ussd_routes);
 	INIT_LLIST_HEAD(&g_hlr->mslookup.server.local_site_services);

src/hlr_ussd.c

@@ -252,7 +252,6 @@ static int ss_gsup_send_to_ms(struct ss_session *ss, struct osmo_gsup_server *gs
 	rc = osmo_gsup_encode(msg, gsup);
 	if (rc) {
 		LOGPSS(ss, LOGL_ERROR, "Failed to encode GSUP message\n");
-		msgb_free(msg);
 		return rc;
 	}
 
@@ -279,19 +278,20 @@ static int ss_gsup_send_to_ms(struct ss_session *ss, struct osmo_gsup_server *gs
 }
 
 static int ss_tx_to_ms(struct ss_session *ss, enum osmo_gsup_message_type gsup_msg_type,
-			bool final, struct msgb *ss_msg)
+		       bool final, struct msgb *ss_msg)
 
 {
-	struct osmo_gsup_message resp = {0};
+	struct osmo_gsup_message resp = {
+		.message_type = gsup_msg_type,
+		.session_id = ss->session_id,
+	};
 	int rc;
 
-	resp.message_type = gsup_msg_type;
 	OSMO_STRLCPY_ARRAY(resp.imsi, ss->imsi);
 	if (final)
 		resp.session_state = OSMO_GSUP_SESSION_STATE_END;
 	else
 		resp.session_state = OSMO_GSUP_SESSION_STATE_CONTINUE;
-	resp.session_id = ss->session_id;
 	if (ss_msg) {
 		resp.ss_info = msgb_data(ss_msg);
 		resp.ss_info_len = msgb_length(ss_msg);
@@ -416,22 +416,22 @@ static bool ss_op_is_ussd(uint8_t opcode)
 }
 
 /* is this GSUP connection an EUSE (true) or not (false)? */
-static bool peer_name_is_euse(const struct osmo_cni_peer_id *peer_name)
+static bool peer_name_is_euse(const struct osmo_gsup_peer_id *peer_name)
 {
-	if (peer_name->type != OSMO_CNI_PEER_ID_IPA_NAME)
+	if (peer_name->type != OSMO_GSUP_PEER_ID_IPA_NAME)
 		return false;
 	if (peer_name->ipa_name.len <= 5)
 		return false;
 	return strncmp((char *)(peer_name->ipa_name.val), "EUSE-", 5) == 0;
 }
 
-static struct hlr_euse *euse_by_name(const struct osmo_cni_peer_id *peer_name)
+static struct hlr_euse *euse_by_name(const struct osmo_gsup_peer_id *peer_name)
 {
 	if (!peer_name_is_euse(peer_name))
 		return NULL;
 
 	/* above peer_name_is_euse() ensures this: */
-	OSMO_ASSERT(peer_name->type == OSMO_CNI_PEER_ID_IPA_NAME);
+	OSMO_ASSERT(peer_name->type == OSMO_GSUP_PEER_ID_IPA_NAME);
 
 	return euse_find(g_hlr, (const char*)(peer_name->ipa_name.val)+5);
 }
@@ -498,6 +498,7 @@ static int handle_ussd(struct ss_session *ss, bool is_euse_originated, const str
 			ss->u.iuse->handle_ussd(ss, gsup, req);
 			/* Release session immediately */
 			ss_session_free(ss);
+			return 0;
 		}
 	}
 
@@ -521,10 +522,10 @@ void rx_proc_ss_req(struct osmo_gsup_req *gsup_req)
 	LOGP(DSS, LOGL_DEBUG, "%s/0x%08x: Process SS (%s)\n", gsup->imsi, gsup->session_id,
 		osmo_gsup_session_state_name(gsup->session_state));
 
-	if (gsup_req->source_name.type != OSMO_CNI_PEER_ID_IPA_NAME) {
+	if (gsup_req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) {
 		LOGP(DSS, LOGL_ERROR, "%s/0x%082x: Unable to process SS request: Unsupported GSUP peer id type%s\n",
 		     gsup->imsi, gsup->session_id,
-		     osmo_cni_peer_id_type_name(gsup_req->source_name.type));
+		     osmo_gsup_peer_id_type_name(gsup_req->source_name.type));
 		osmo_gsup_req_respond_err(gsup_req, GMM_CAUSE_PROTO_ERR_UNSPEC, "error processing SS request");
 		return;
 	}
@@ -566,7 +567,7 @@ void rx_proc_ss_req(struct osmo_gsup_req *gsup_req)
 		if (!is_euse_originated) {
 			ss->initial_req_from_ms = gsup_req;
 			free_gsup_req = NULL;
-			OSMO_ASSERT(gsup_req->source_name.type == OSMO_CNI_PEER_ID_IPA_NAME); /* checked above */
+			OSMO_ASSERT(gsup_req->source_name.type == OSMO_GSUP_PEER_ID_IPA_NAME); /* checked above */
 			ss->vlr_name = gsup_req->source_name.ipa_name;
 		} else {
 			ss->initial_req_from_euse = gsup_req;

src/hlr_vty_subscr.c

@@ -38,9 +38,13 @@ struct vty;
 
 static char *get_datestr(const time_t *t, char *buf, size_t bufsize)
 {
-	struct tm tm;
-	gmtime_r(t, &tm);
-	strftime(buf, bufsize, "%FT%T+00:00", &tm);
+	struct tm *tm;
+
+	tm = gmtime(t);
+	if (!tm)
+		return "UNKNOWN";
+
+	strftime(buf, bufsize, "%FT%T+00:00", tm);
 	return buf;
 }
 

src/lu_fsm.c

@@ -26,7 +26,7 @@
 #include <osmocom/gsm/apn.h>
 #include <osmocom/gsm/gsm48_ie.h>
 
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/gsupclient/gsup_req.h>
 #include <osmocom/hlr/logging.h>
 #include <osmocom/hlr/hlr.h>
@@ -52,11 +52,11 @@ struct lu {
 	bool is_ps;
 
 	/* VLR requesting the LU. */
-	struct osmo_cni_peer_id vlr_name;
+	struct osmo_gsup_peer_id vlr_name;
 
 	/* If the LU request was received via a proxy and not immediately from a local VLR, this indicates the closest
 	 * peer that forwarded the GSUP message. */
-	struct osmo_cni_peer_id via_proxy;
+	struct osmo_gsup_peer_id via_proxy;
 };
 LLIST_HEAD(g_all_lu);
 
@@ -130,7 +130,7 @@ static void lu_start(struct osmo_gsup_req *update_location_req)
 
 	osmo_fsm_inst_update_id_f_sanitize(fi, '_', "%s:IMSI-%s", lu->is_ps ? "PS" : "CS", update_location_req->gsup.imsi);
 
-	if (osmo_cni_peer_id_is_empty(&lu->vlr_name)) {
+	if (osmo_gsup_peer_id_is_empty(&lu->vlr_name)) {
 		lu_failure(lu, GMM_CAUSE_NET_FAIL, "LU without a VLR");
 		return;
 	}
@@ -154,7 +154,7 @@ static void lu_start(struct osmo_gsup_req *update_location_req)
 	/* TODO: Set subscriber tracing = deactive in VLR/SGSN */
 
 #if 0
-	/* Cancel in old VLR/SGSN, if new VLR/SGSN differs from old (FIXME: OS#4491) */
+	/* Cancel in old VLR/SGSN, if new VLR/SGSN differs from old */
 	if (!lu->is_ps && strcmp(subscr->vlr_number, vlr_number)) {
 		lu_op_tx_cancel_old(lu);
 	} else if (lu->is_ps && strcmp(subscr->sgsn_number, sgsn_number)) {
@@ -163,30 +163,30 @@ static void lu_start(struct osmo_gsup_req *update_location_req)
 #endif
 
 	/* Store the VLR / SGSN number with the subscriber, so we know where it was last seen. */
-	if (!osmo_cni_peer_id_is_empty(&lu->via_proxy)) {
+	if (!osmo_gsup_peer_id_is_empty(&lu->via_proxy)) {
 		LOG_GSUP_REQ(update_location_req, LOGL_DEBUG, "storing %s = %s, via proxy %s\n",
 			     lu->is_ps ? "SGSN number" : "VLR number",
-			     osmo_cni_peer_id_to_str(&lu->vlr_name),
-			     osmo_cni_peer_id_to_str(&lu->via_proxy));
+			     osmo_gsup_peer_id_to_str(&lu->vlr_name),
+			     osmo_gsup_peer_id_to_str(&lu->via_proxy));
 	} else {
 		LOG_GSUP_REQ(update_location_req, LOGL_DEBUG, "storing %s = %s\n",
 		     lu->is_ps ? "SGSN number" : "VLR number",
-		     osmo_cni_peer_id_to_str(&lu->vlr_name));
+		     osmo_gsup_peer_id_to_str(&lu->vlr_name));
 	}
 
-	if (osmo_cni_peer_id_is_empty(&lu->vlr_name)
-	    || (lu->vlr_name.type != OSMO_CNI_PEER_ID_IPA_NAME)) {
+	if (osmo_gsup_peer_id_is_empty(&lu->vlr_name)
+	    || (lu->vlr_name.type != OSMO_GSUP_PEER_ID_IPA_NAME)) {
 		lu_failure(lu, GMM_CAUSE_PROTO_ERR_UNSPEC, "Unsupported GSUP peer id type for vlr_name: %s",
-			   osmo_cni_peer_id_type_name(lu->vlr_name.type));
+			   osmo_gsup_peer_id_type_name(lu->vlr_name.type));
 		return;
 	}
-	if (!osmo_cni_peer_id_is_empty(&lu->via_proxy) && (lu->via_proxy.type != OSMO_CNI_PEER_ID_IPA_NAME)) {
+	if (!osmo_gsup_peer_id_is_empty(&lu->via_proxy) && (lu->via_proxy.type != OSMO_GSUP_PEER_ID_IPA_NAME)) {
 		lu_failure(lu, GMM_CAUSE_PROTO_ERR_UNSPEC, "Unsupported GSUP peer id type for via_proxy: %s",
-			   osmo_cni_peer_id_type_name(lu->via_proxy.type));
+			   osmo_gsup_peer_id_type_name(lu->via_proxy.type));
 		return;
 	}
 	if (db_subscr_lu(g_hlr->dbc, lu->subscr.id, &lu->vlr_name.ipa_name, lu->is_ps,
-			 osmo_cni_peer_id_is_empty(&lu->via_proxy)? NULL : &lu->via_proxy.ipa_name)) {
+			 osmo_gsup_peer_id_is_empty(&lu->via_proxy)? NULL : &lu->via_proxy.ipa_name)) {
 		lu_failure(lu, GMM_CAUSE_NET_FAIL, "Cannot update %s in the database",
 			   lu->is_ps ? "SGSN number" : "VLR number");
 		return;

src/mslookup/mdns_msg.c

@@ -213,9 +213,9 @@ struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const cha
 
 	va_start(ap, value_fmt);
 	value = talloc_vasprintf(ctx, value_fmt, ap);
-	va_end(ap);
 	if (!value)
 		return NULL;
+	va_end(ap);
 	r = _osmo_mdns_record_txt_encode(ctx, key, value);
 	talloc_free(value);
 	return r;

src/mslookup/mdns_rfc.c

@@ -83,12 +83,7 @@ char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_
 		return NULL;
 
 	while (*qname) {
-		size_t len;
-
-		if (i >= qname_max_len)
-			return NULL;
-
-		len = *qname;
+		size_t len = *qname;
 		next_label = qname + len + 1;
 
 		if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN)

src/mslookup/mdns_sock.c

@@ -84,7 +84,7 @@ struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned i
 	rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface));
 	if (rc == -1) {
 		LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno));
-		goto error_sock;
+		goto error;
 	}
 	memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr,
 	       sizeof(multicast_req.imr_multiaddr));
@@ -92,7 +92,7 @@ struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned i
 	rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req));
 	if (rc == -1) {
 		LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno));
-		goto error_sock;
+		goto error;
 	}
 
 	/* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by
@@ -102,22 +102,20 @@ struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned i
 	rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y));
 	if (rc == -1) {
 		LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno));
-		goto error_sock;
+		goto error;
 	}
 
 	/* Bind and register osmo_fd callback */
 	rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen);
 	if (rc == -1) {
 		LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno));
-		goto error_sock;
+		goto error;
 	}
 	osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr);
 	if (osmo_fd_register(&ret->osmo_fd) != 0)
-		goto error_sock;
+		goto error;
 
 	return ret;
-error_sock:
-	close(sock);
 error:
 	if (ret->ai)
 		freeaddrinfo(ret->ai);

src/mslookup/mslookup_client.c

@@ -146,7 +146,7 @@ void osmo_mslookup_client_rx_result(struct osmo_mslookup_client *client, uint32_
 	if (!req) {
 		LOGP(DMSLOOKUP, LOGL_ERROR,
 		     "Internal error: Got mslookup result for a request that does not exist (handle %u)\n",
-		     request_handle);
+		     req->request_handle);
 		return;
 	}
 

src/mslookup/mslookup_client_mdns.c

@@ -114,7 +114,6 @@ static void mdns_method_request(struct osmo_mslookup_client_method *method, cons
 	if (!msg) {
 		LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n",
 		     osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL));
-		return;
 	}
 
 	/* Send over the wire */

src/mslookup/osmo-mslookup-client.c

@@ -315,18 +315,17 @@ int do_send(int argc, char ** argv)
 	struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix);
 	if (!msg) {
 		print_error("unable to encode mDNS response\n");
-		goto exit_cleanup_sock;
+		goto exit_cleanup;
 	}
 
 	if (osmo_mdns_sock_send(sock, msg)) {
 		print_error("unable to send mDNS message\n");
-		goto exit_cleanup_sock;
+		goto exit_cleanup;
 	}
 
 	rc = 0;
-exit_cleanup_sock:
-	osmo_mdns_sock_cleanup(sock);
 exit_cleanup:
+	osmo_mdns_sock_cleanup(sock);
 	talloc_free(ctx);
 	return rc;
 }
@@ -456,11 +455,6 @@ static int socket_read_cb(struct osmo_fd *ofd)
 
 	rxbuf[rc] = '\0';
 	query_with_timeout = strtok(rxbuf, "\r\n");
-	if (!query_with_timeout) {
-		print_error("ERROR: failed to read line from socket\n");
-		goto close;
-	}
-
 	at = strchr(query_with_timeout, '@');
 	query_str = at ? at + 1 : query_with_timeout;
 

src/mslookup_server.c

@@ -261,7 +261,6 @@ static bool subscriber_has_done_lu_here_hlr(const struct osmo_mslookup_query *qu
 	if (!subscr->vlr_number[0]) {
 		LOGP(DMSLOOKUP, LOGL_DEBUG, "%s: not attached (vlr_number unset)\n",
 		     osmo_mslookup_result_name_c(OTC_SELECT, query, NULL));
-		return false;
 	}
 
 	if (subscr->vlr_via_proxy.len) {

src/mslookup_server_mdns.c

@@ -71,7 +71,7 @@ static int osmo_mslookup_server_mdns_rx(struct osmo_fd *osmo_fd, unsigned int wh
 
 	/* Parse the message and print it */
 	n = read(osmo_fd->fd, buffer, sizeof(buffer));
-	if (n <= 0)
+	if (n < 0)
 		return n;
 
 	ctx = talloc_named_const(server, 0, __func__);
@@ -148,7 +148,7 @@ void mslookup_server_mdns_config_apply()
 							g_hlr->mslookup.server.mdns.domain_suffix);
 		if (!g_hlr->mslookup.server.mdns.running)
 			LOGP(DMSLOOKUP, LOGL_ERROR, "Failed to start mslookup mDNS server on " OSMO_SOCKADDR_STR_FMT "\n",
-			     OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.server.mdns.bind_addr));
+			     OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.server.mdns.running->bind_addr));
 		else
 			LOGP(DMSLOOKUP, LOGL_NOTICE, "Started mslookup mDNS server, receiving mDNS requests at multicast "
 			     OSMO_SOCKADDR_STR_FMT "\n",

src/proxy.c

@@ -263,10 +263,10 @@ static int proxy_acknowledge_gsup_to_remote_hlr(struct proxy *proxy, const struc
 	bool cs;
 	int rc;
 
-	if (req->source_name.type != OSMO_CNI_PEER_ID_IPA_NAME) {
+	if (req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) {
 		LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_ERROR,
 				     "Unsupported GSUP peer id type: %s\n",
-				     osmo_cni_peer_id_type_name(req->source_name.type));
+				     osmo_gsup_peer_id_type_name(req->source_name.type));
 		return -ENOTSUP;
 	}
 
@@ -303,7 +303,7 @@ static int proxy_acknowledge_gsup_to_remote_hlr(struct proxy *proxy, const struc
 				     "%s: preliminary VLR name for%s%s to %s\n",
 				     rc ? "failed to update" : "updated",
 				     cs ? " CS" : "", ps ? " PS" : "",
-				     osmo_cni_peer_id_to_str(&req->source_name));
+				     osmo_gsup_peer_id_to_str(&req->source_name));
 		break;
 	/* TODO: delete proxy entry in case of a Purge Request? */
 	default:
@@ -483,13 +483,13 @@ int proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct proxy_s
 		return 0;
 	}
 
-	if (!osmo_cni_peer_id_is_empty(&req->via_proxy)) {
+	if (!osmo_gsup_peer_id_is_empty(&req->via_proxy)) {
 		LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_INFO, "VLR->HLR: forwarding from %s via proxy %s\n",
-				     osmo_cni_peer_id_to_str(&req->source_name),
-				     osmo_cni_peer_id_to_str(&req->via_proxy));
+				     osmo_gsup_peer_id_to_str(&req->source_name),
+				     osmo_gsup_peer_id_to_str(&req->via_proxy));
 	} else {
 		LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_INFO, "VLR->HLR: forwarding from %s\n",
-				     osmo_cni_peer_id_to_str(&req->source_name));
+				     osmo_gsup_peer_id_to_str(&req->source_name));
 	}
 
 	/* We could always store in the defer queue and empty the queue if the connection is already up.

src/remote_hlr.c

@@ -233,9 +233,9 @@ void remote_hlr_gsup_forward_to_remote_hlr(struct remote_hlr *remote_hlr, struct
 	else
 		forward = req->gsup;
 
-	if (req->source_name.type != OSMO_CNI_PEER_ID_IPA_NAME) {
+	if (req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) {
 		osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s",
-					  osmo_cni_peer_id_type_name(req->source_name.type));
+					  osmo_gsup_peer_id_type_name(req->source_name.type));
 		return;
 	}
 	forward.source_name = req->source_name.ipa_name.val;

tests/db/Makefile.am

@@ -30,7 +30,7 @@ db_test_LDADD = \
 	$(top_builddir)/src/db_auc.o \
 	$(top_builddir)/src/db_hlr.o \
 	$(top_builddir)/src/db.o \
-	$(top_builddir)/src/cni_peer_id.o \
+	$(top_builddir)/src/gsup_peer_id.o \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOABIS_LIBS) \

tests/db/db_test.c

@@ -27,7 +27,7 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
 
-#include <osmocom/gsupclient/cni_peer_id.h>
+#include <osmocom/gsupclient/gsup_peer_id.h>
 #include <osmocom/hlr/db.h>
 #include <osmocom/hlr/logging.h>
 
@@ -918,6 +918,50 @@ static void test_subscr_sqn()
 	comment_end();
 }
 
+static void test_ind()
+{
+	comment_start();
+
+#define ASSERT_IND(VLR, IND) do { \
+		unsigned int ind; \
+		struct osmo_gsup_peer_id vlr; \
+		OSMO_ASSERT(!osmo_gsup_peer_id_set_str(&vlr, OSMO_GSUP_PEER_ID_IPA_NAME, VLR)); \
+		ASSERT_RC(db_ind(dbc, &vlr, &ind), 0); \
+		fprintf(stderr, "%s ind = %u\n\n", osmo_quote_str((char*)vlr.ipa_name.val, vlr.ipa_name.len), ind); \
+		if (ind != (IND)) \
+			fprintf(stderr, "  ERROR: expected " #IND "\n"); \
+	} while (0)
+#define IND_DEL(VLR) do { \
+		struct osmo_gsup_peer_id vlr; \
+		OSMO_ASSERT(!osmo_gsup_peer_id_set_str(&vlr, OSMO_GSUP_PEER_ID_IPA_NAME, VLR)); \
+		ASSERT_RC(db_ind_del(dbc, &vlr), 0); \
+		fprintf(stderr, "%s ind deleted\n\n", osmo_quote_str((char*)vlr.ipa_name.val, vlr.ipa_name.len)); \
+	} while (0)
+
+	ASSERT_IND("msc-23", 1);
+	ASSERT_IND("sgsn-11", 2);
+	ASSERT_IND("msc-42", 3);
+	ASSERT_IND("sgsn-22", 4);
+	ASSERT_IND("msc-0x17", 5);
+	ASSERT_IND("sgsn-0xaa", 6);
+	ASSERT_IND("msc-42", 3);
+	ASSERT_IND("sgsn-22", 4);
+	ASSERT_IND("msc-0x17", 5);
+	ASSERT_IND("sgsn-0xaa", 6);
+	ASSERT_IND("sgsn-0xbb", 7);
+	ASSERT_IND("msc-0x2a", 8);
+	ASSERT_IND("msc-42", 3);
+	ASSERT_IND("sgsn-22", 4);
+	ASSERT_IND("msc-23", 1);
+	ASSERT_IND("sgsn-11", 2);
+
+	IND_DEL("msc-0x17"); /* dropped IND == 5 */
+	ASSERT_IND("msc-0x2a", 8); /* known CS remains where it is */
+	ASSERT_IND("any-unknown", 9); /* new VLR takes a new IND from the end */
+
+	comment_end();
+}
+
 static struct {
 	bool verbose;
 } cmdline_opts = {
@@ -998,6 +1042,7 @@ int main(int argc, char **argv)
 	test_subscr_aud();
 	test_subscr_aud_invalid_len();
 	test_subscr_sqn();
+	test_ind();
 
 	printf("Done\n");
 	db_close(dbc);

tests/db/db_test.err

@@ -1613,3 +1613,83 @@ db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> -ENOENT
 
 ===== test_subscr_sqn: SUCCESS
 
+
+===== test_ind
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-23\0" ind = 1
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-11\0" ind = 2
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-42\0" ind = 3
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-22\0" ind = 4
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-0x17\0" ind = 5
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-0xaa\0" ind = 6
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-42\0" ind = 3
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-22\0" ind = 4
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-0x17\0" ind = 5
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-0xaa\0" ind = 6
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-0xbb\0" ind = 7
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-0x2a\0" ind = 8
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-42\0" ind = 3
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-22\0" ind = 4
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-23\0" ind = 1
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"sgsn-11\0" ind = 2
+
+db_ind_del(dbc, &vlr) --> 0
+
+"msc-0x17\0" ind deleted
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"msc-0x2a\0" ind = 8
+
+db_ind(dbc, &vlr, &ind) --> 0
+
+"any-unknown\0" ind = 9
+
+===== test_ind: SUCCESS
+

tests/db_upgrade/db_upgrade_test.ok

@@ -85,6 +85,7 @@ DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 2
 DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 3
 DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 4
 DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 5
+DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 6
 DMAIN Cmdline option --db-check: Database was opened successfully, quitting.
 
 Resulting db:
@@ -117,6 +118,13 @@ algo_id_3g|ind_bitlen|k|op|opc|sqn|subscriber_id
 5|5|44444444444444444444444444444444|44444444444444444444444444444444||0|5
 5|5|55555555555555555555555555555555||55555555555555555555555555555555|0|6
 
+Table: ind
+name|type|notnull|dflt_value|pk
+ind|INTEGER|0||1
+vlr|TEXT|1||0
+
+Table ind contents:
+
 Table: subscriber
 name|type|notnull|dflt_value|pk
 ggsn_number|VARCHAR(15)|0||0
@@ -171,5 +179,5 @@ osmo-hlr --database $db --db-check --config-file $srcdir/osmo-hlr.cfg
 rc = 0
 DMAIN hlr starting
 DDB using database: <PATH>test.db
-DDB Database <PATH>test.db' has HLR DB schema version 5
+DDB Database <PATH>test.db' has HLR DB schema version 6
 DMAIN Cmdline option --db-check: Database was opened successfully, quitting.

tests/gsup_server/Makefile.am

@@ -32,7 +32,7 @@ gsup_server_test_LDADD = \
 	$(top_srcdir)/src/gsup_server.c \
 	$(top_srcdir)/src/gsup_router.c \
 	$(top_srcdir)/src/gsup_send.c \
-	$(top_srcdir)/src/gsupclient/cni_peer_id.c \
+	$(top_srcdir)/src/gsupclient/gsup_peer_id.c \
 	$(top_srcdir)/src/gsupclient/gsup_req.c \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \

tests/mslookup/Makefile.am

@@ -24,6 +24,7 @@ EXTRA_DIST = \
 
 check_PROGRAMS = \
 	mdns_test \
+	mslookup_client_mdns_test \
 	mslookup_client_test \
 	mslookup_test \
 	$(NULL)
@@ -44,6 +45,14 @@ mslookup_client_test_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
 
+mslookup_client_mdns_test_SOURCES = \
+	mslookup_client_mdns_test.c \
+	$(NULL)
+mslookup_client_mdns_test_LDADD = \
+	$(top_builddir)/src/mslookup/libosmo-mslookup.la \
+	$(LIBOSMOGSM_LIBS) \
+	$(NULL)
+
 mdns_test_SOURCES = \
 	mdns_test.c \
 	$(NULL)
@@ -52,18 +61,6 @@ mdns_test_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
 
-if ENABLE_MSLOOKUP_CLIENT_MDNS_TEST
-check_PROGRAMS += mslookup_client_mdns_test
-
-mslookup_client_mdns_test_SOURCES = \
-	mslookup_client_mdns_test.c \
-	$(NULL)
-mslookup_client_mdns_test_LDADD = \
-	$(top_builddir)/src/mslookup/libosmo-mslookup.la \
-	$(LIBOSMOGSM_LIBS) \
-	$(NULL)
-endif
-
 .PHONY: update_exp
 update_exp:
 	for i in $(check_PROGRAMS); do \

tests/mslookup/mslookup_client_mdns_test.c

@@ -17,7 +17,6 @@
  *
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <string.h>
 #include <unistd.h>
@@ -190,45 +189,11 @@ static void test_server_client()
 	client_stop();
 }
 
-bool is_multicast_enabled()
-{
-	bool ret = true;
-	struct addrinfo *ai;
-	int sock;
-	struct addrinfo hints = {0};
-	struct ip_mreq multicast_req = {0};
-	in_addr_t iface = INADDR_ANY;
-
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST);
-	assert(getaddrinfo("239.192.23.42", "4266", &hints, &ai) == 0);
-
-	sock = socket(ai->ai_family, ai->ai_socktype, 0);
-	assert(sock != -1);
-	assert(setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)) != -1);
-
-	memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ai->ai_addr))->sin_addr,
-	       sizeof(multicast_req.imr_multiaddr));
-	multicast_req.imr_interface.s_addr = htonl(INADDR_ANY);
-
-	if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)) == -1)
-		ret = false;
-
-	freeaddrinfo(ai);
-	return ret;
-}
-
 /*
  * Run all tests
  */
 int main()
 {
-	if (!is_multicast_enabled()) {
-		fprintf(stderr, "ERROR: multicast is disabled! (OS#4361)");
-		return 1;
-	}
-
 	talloc_enable_null_tracking();
 	ctx = talloc_named_const(NULL, 0, "main");
 	osmo_init_logging2(ctx, NULL);

tests/test_nodes.vty

@@ -116,7 +116,7 @@ OsmoHLR(config-mslookup)# list
 ...
   mdns bind [IP] [<1-65535>]
   mdns domain-suffix DOMAIN_SUFFIX
-  no mdns bind
+  no mdns
   server
   no server
   client
@@ -155,7 +155,7 @@ OsmoHLR(config-mslookup-server)# list
 ...
   mdns bind [IP] [<1-65535>]
   mdns domain-suffix DOMAIN_SUFFIX
-  no mdns bind
+  no mdns
   service NAME at IP <1-65535>
   no service NAME
   no service NAME at IP <1-65535>
@@ -248,7 +248,7 @@ OsmoHLR(config-mslookup-client)# list
   timeout <1-100000>
   mdns bind [IP] [<1-65535>]
   mdns domain-suffix DOMAIN_SUFFIX
-  no mdns bind
+  no mdns
   gateway-proxy IP [<1-65535>]
   no gateway-proxy
 
@@ -351,7 +351,7 @@ mslookup
   service baz.bar at 2222:2222:2222::2 2222
  client
   gateway-proxy 1.2.3.4 4222
-  mdns bind 239.192.23.42 4266
+  mdns to 239.192.23.42 4266
 ...
 
 OsmoHLR(config-mslookup-server-msc)# no service baz.bar
@@ -402,7 +402,7 @@ mslookup
  msc msc-901-70-42
   service foo.bar at 1.1.1.1 1111
  client
-  mdns bind 239.192.23.42 4266
+  mdns to 239.192.23.42 4266
 ...
 
 OsmoHLR(config-mslookup-client)# exit
@@ -435,5 +435,5 @@ mslookup
  msc msc-901-70-42
   service foo.bar at 1.1.1.1 1111
  client
-  mdns bind 239.192.23.42 4266
+  mdns to 239.192.23.42 4266
 ...

tests/testsuite.at

@@ -65,9 +65,7 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr
 AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr])
 AT_CLEANUP
 
-# AT_SKIP_IF: disable without --enable-mslookup-client-mdns-test (OS#4385)
 AT_SETUP([mslookup_client_mdns])
-AT_SKIP_IF([! test -e $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test ])
 AT_KEYWORDS([mslookup_client_mdns])
 cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr
 AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr])