test_subscriber.ctrl: test against octal/hex interpretation of id

Add a large enough subscriber id and add a test that ensures a leading zero is
not interpreted as octal, and that a leading 0x is invalid and not interpreted
as hexadecimal.

Change-Id: Ib468b7cb595cf52331ebb41e6de0e8f57f69e173

.gitignore

@@ -1,11 +1,8 @@
 *.o
-*.lo
-*.la
 *.db
 *.pyc
 .*.sw?
 .version
-.tarball-version
 Makefile
 Makefile.in
 aclocal.m4
@@ -25,35 +22,10 @@ m4
 missing
 .deps
 
-*.pc
-.libs
-
-src/db_test
-src/db_bootstrap.h
 src/osmo-hlr
-src/osmo-hlr-db-tool
-src/osmo-euse-demo
-src/gsupclient/gsup-test-client
+src/db_test
 
-tests/atconfig
 tests/testsuite
-tests/testsuite.log
-
 tests/auc/auc_3g_test
 tests/auc/auc_ts_55_205_test_sets.c
 tests/auc/auc_ts_55_205_test_sets
-tests/auc/auc_test
-tests/gsup_server/gsup_server_test
-tests/gsup/gsup_test
-tests/db/db_test
-
-# manuals
-doc/manuals/*.html
-doc/manuals/*.svg
-doc/manuals/*.pdf
-doc/manuals/*__*.png
-doc/manuals/*.check
-doc/manuals/generated/
-doc/manuals/osmomsc-usermanual.xml
-doc/manuals/common
-doc/manuals/build

Makefile.am

@@ -1,11 +1,8 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 
 SUBDIRS = \
-	doc \
 	src \
-	include \
 	sql \
-	contrib \
 	tests \
 	$(NULL)
 
@@ -13,12 +10,6 @@ EXTRA_DIST = \
 	.version \
 	$(NULL)
 
-AM_DISTCHECK_CONFIGURE_FLAGS = \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmo-gsup-client.pc
-
 @RELMAKE@
 
 BUILT_SOURCES = $(top_srcdir)/.version

configure.ac

@@ -34,11 +34,11 @@ PKG_PROG_PKG_CONFIG([0.20])
 
 PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1])
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0)
-PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.9.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl)
+PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2)
 
 PKG_CHECK_MODULES(SQLITE3, sqlite3)
 
@@ -47,36 +47,6 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl checks for header files
 AC_HEADER_STDC
 
-AC_ARG_ENABLE(sanitize,
-	[AS_HELP_STRING(
-		[--enable-sanitize],
-		[Compile with address sanitizer enabled],
-	)],
-	[sanitize=$enableval], [sanitize="no"])
-if test x"$sanitize" = x"yes"
-then
-	CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined"
-	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
-fi
-
-AC_ARG_ENABLE(werror,
-	[AS_HELP_STRING(
-		[--enable-werror],
-		[Turn all compiler warnings into errors, with exceptions:
-		 a) deprecation (allow upstream to mark deprecation without breaking builds);
-		 b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds)
-		]
-	)],
-	[werror=$enableval], [werror="no"])
-if test x"$werror" = x"yes"
-then
-	WERROR_FLAGS="-Werror"
-	WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations"
-	WERROR_FLAGS+=" -Wno-error=cpp" # "#warning"
-	CFLAGS="$CFLAGS $WERROR_FLAGS"
-	CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
-fi
-
 AC_ARG_ENABLE([external_tests],
 		AC_HELP_STRING([--enable-external-tests],
 				[Include the VTY/CTRL tests in make check [default=no]]),
@@ -92,83 +62,13 @@ 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")
 
-# Generate manuals
-AC_ARG_ENABLE(manuals,
-	[AS_HELP_STRING(
-		[--enable-manuals],
-		[Generate manual PDFs [default=no]],
-	)],
-	[osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"])
-AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"])
-AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals"
-	fallback])
-if test x"$osmo_ac_build_manuals" = x"yes"
-then
-	# Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback)
-	if test -n "$OSMO_GSM_MANUALS_DIR"; then
-		echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)"
-	else
-		OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null)"
-		if test -n "$OSMO_GSM_MANUALS_DIR"; then
-			echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from pkg-conf)"
-		else
-			OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals"
-			echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (fallback)"
-		fi
-	fi
-	if ! test -d "$OSMO_GSM_MANUALS_DIR"; then
-		AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.")
-	fi
-
-	# Find and run check-depends
-	CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh"
-	if ! test -x "$CHECK_DEPENDS"; then
-		CHECK_DEPENDS="osmo-gsm-manuals-check-depends"
-	fi
-	if ! $CHECK_DEPENDS; then
-		AC_MSG_ERROR("missing dependencies for --enable-manuals")
-	fi
-
-	# Put in Makefile with absolute path
-	OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")"
-	AC_SUBST([OSMO_GSM_MANUALS_DIR])
-fi
-
-# https://www.freedesktop.org/software/systemd/man/daemon.html
-AC_ARG_WITH([systemdsystemunitdir],
-     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
-     [with_systemdsystemunitdir=auto])
-AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
-     def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-
-     AS_IF([test "x$def_systemdsystemunitdir" = "x"],
-   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
-    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
-    with_systemdsystemunitdir=no],
-   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
-AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
-      [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
-
-AC_MSG_RESULT([CFLAGS="$CFLAGS"])
-AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
-
 AC_OUTPUT(
 	Makefile
-	doc/Makefile
-	doc/examples/Makefile
 	src/Makefile
-	src/gsupclient/Makefile
-	include/Makefile
-	libosmo-gsup-client.pc
 	sql/Makefile
-	doc/manuals/Makefile
-	contrib/Makefile
-	contrib/systemd/Makefile
 	tests/Makefile
 	tests/auc/Makefile
 	tests/auc/gen_ts_55_205_test_sets/Makefile
 	tests/gsup_server/Makefile
-	tests/gsup/Makefile
 	tests/db/Makefile
 	)

contrib/Makefile.am

@@ -1 +0,0 @@
-SUBDIRS = systemd

contrib/ipa.py

@@ -0,0 +1,278 @@
+#!/usr/bin/python3
+# -*- mode: python-mode; py-indent-tabs-mode: nil -*-
+"""
+/*
+ * Copyright (C) 2016 sysmocom s.f.m.c. GmbH
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+"""
+
+import struct, random, sys
+
+class IPA(object):
+    """
+    Stateless IPA protocol multiplexer: add/remove/parse (extended) header
+    """
+    version = "0.0.5"
+    TCP_PORT_OML = 3002
+    TCP_PORT_RSL = 3003
+    # OpenBSC extensions: OSMO, MGCP_OLD
+    PROTO = dict(RSL=0x00, CCM=0xFE, SCCP=0xFD, OML=0xFF, OSMO=0xEE, MGCP_OLD=0xFC)
+    # ...OML Router Control, GSUP GPRS extension, Osmocom Authn Protocol
+    EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6)
+    # OpenBSC extension: SCCP_OLD
+    MSGT = dict(PING=0x00, PONG=0x01, ID_GET=0x04, ID_RESP=0x05, ID_ACK=0x06, SCCP_OLD=0xFF)
+    _IDTAG = dict(SERNR=0, UNITNAME=1, LOCATION=2, TYPE=3, EQUIPVERS=4, SWVERSION=5, IPADDR=6, MACADDR=7, UNIT=8)
+    CTRL_GET = 'GET'
+    CTRL_SET = 'SET'
+    CTRL_REP = 'REPLY'
+    CTRL_ERR = 'ERR'
+    CTRL_TRAP = 'TRAP'
+
+    def _l(self, d, p):
+        """
+        Reverse dictionary lookup: return key for a given value
+        """
+        if p is None:
+            return 'UNKNOWN'
+        return list(d.keys())[list(d.values()).index(p)]
+
+    def _tag(self, t, v):
+        """
+        Create TAG as TLV data
+        """
+        return struct.pack(">HB", len(v) + 1, t) + v
+
+    def proto(self, p):
+        """
+        Lookup protocol name
+        """
+        return self._l(self.PROTO, p)
+
+    def ext(self, p):
+        """
+        Lookup protocol extension name
+        """
+        return self._l(self.EXT, p)
+
+    def msgt(self, p):
+        """
+        Lookup message type name
+        """
+        return self._l(self.MSGT, p)
+
+    def idtag(self, p):
+        """
+        Lookup ID tag name
+        """
+        return self._l(self._IDTAG, p)
+
+    def ext_name(self, proto, exten):
+        """
+        Return proper extension byte name depending on the protocol used
+        """
+        if self.PROTO['CCM'] == proto:
+            return self.msgt(exten)
+        if self.PROTO['OSMO'] == proto:
+            return self.ext(exten)
+        return None
+
+    def add_header(self, data, proto, ext=None):
+        """
+        Add IPA header (with extension if necessary), data must be represented as bytes
+        """
+        if ext is None:
+            return struct.pack(">HB", len(data) + 1, proto) + data
+        return struct.pack(">HBB", len(data) + 1, proto, ext) + data
+
+    def del_header(self, data):
+        """
+        Strip IPA protocol header correctly removing extension if present
+        Returns data length, IPA protocol, extension (or None if not defined for a give protocol) and the data without header
+        """
+        if not len(data):
+            return None, None, None, None
+        (dlen, proto) = struct.unpack('>HB', data[:3])
+        if self.PROTO['OSMO'] == proto or self.PROTO['CCM'] == proto: # there's extension which we have to unpack
+            return struct.unpack('>HBB', data[:4]) + (data[4:], ) # length, protocol, extension, data
+        return dlen, proto, None, data[3:] # length, protocol, _, data
+
+    def split_combined(self, data):
+        """
+        Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where rest contains remaining messages, first is the single IPA message
+        """
+        (length, _, _, _) = self.del_header(data)
+        return data[:(length + 3)], data[(length + 3):]
+
+    def tag_serial(self, data):
+        """
+        Make TAG for serial number
+        """
+        return self._tag(self._IDTAG['SERNR'], data)
+
+    def tag_name(self, data):
+        """
+        Make TAG for unit name
+        """
+        return self._tag(self._IDTAG['UNITNAME'], data)
+
+    def tag_loc(self, data):
+        """
+        Make TAG for location
+        """
+        return self._tag(self._IDTAG['LOCATION'], data)
+
+    def tag_type(self, data):
+        """
+        Make TAG for unit type
+        """
+        return self._tag(self._IDTAG['TYPE'], data)
+
+    def tag_equip(self, data):
+        """
+        Make TAG for equipment version
+        """
+        return self._tag(self._IDTAG['EQUIPVERS'], data)
+
+    def tag_sw(self, data):
+        """
+        Make TAG for software version
+        """
+        return self._tag(self._IDTAG['SWVERSION'], data)
+
+    def tag_ip(self, data):
+        """
+        Make TAG for IP address
+        """
+        return self._tag(self._IDTAG['IPADDR'], data)
+
+    def tag_mac(self, data):
+        """
+        Make TAG for MAC address
+        """
+        return self._tag(self._IDTAG['MACADDR'], data)
+
+    def tag_unit(self, data):
+        """
+        Make TAG for unit ID
+        """
+        return self._tag(self._IDTAG['UNIT'], data)
+
+    def identity(self, unit=b'', mac=b'', location=b'', utype=b'', equip=b'', sw=b'', name=b'', serial=b''):
+        """
+        Make IPA IDENTITY tag list, by default returns empty concatenated bytes of tag list
+        """
+        return self.tag_unit(unit) + self.tag_mac(mac) + self.tag_loc(location) + self.tag_type(utype) + self.tag_equip(equip) + self.tag_sw(sw) + self.tag_name(name) + self.tag_serial(serial)
+
+    def ping(self):
+        """
+        Make PING message
+        """
+        return self.add_header(b'', self.PROTO['CCM'], self.MSGT['PING'])
+
+    def pong(self):
+        """
+        Make PONG message
+        """
+        return self.add_header(b'', self.PROTO['CCM'], self.MSGT['PONG'])
+
+    def id_ack(self):
+        """
+        Make ID_ACK CCM message
+        """
+        return self.add_header(b'', self.PROTO['CCM'], self.MSGT['ID_ACK'])
+
+    def id_get(self):
+        """
+        Make ID_GET CCM message
+        """
+        return self.add_header(self.identity(), self.PROTO['CCM'], self.MSGT['ID_GET'])
+
+    def id_resp(self, data):
+        """
+        Make ID_RESP CCM message
+        """
+        return self.add_header(data, self.PROTO['CCM'], self.MSGT['ID_RESP'])
+
+class Ctrl(IPA):
+    """
+    Osmocom CTRL protocol implemented on top of IPA multiplexer
+    """
+    def __init__(self):
+        random.seed()
+
+    def add_header(self, data):
+        """
+        Add CTRL header
+        """
+        return super(Ctrl, self).add_header(data.encode('utf-8'), IPA.PROTO['OSMO'], IPA.EXT['CTRL'])
+
+    def rem_header(self, data):
+        """
+        Remove CTRL header, check for appropriate protocol and extension
+        """
+        (_, proto, ext, d) = super(Ctrl, self).del_header(data)
+        if self.PROTO['OSMO'] != proto or self.EXT['CTRL'] != ext:
+            return None
+        return d
+
+    def parse(self, data, op=None):
+        """
+        Parse Ctrl string returning (var, value) pair
+        var could be None in case of ERROR message
+        value could be None in case of GET message
+        """
+        (s, i, v) = data.split(' ', 2)
+        if s == self.CTRL_ERR:
+            return None, v
+        if s == self.CTRL_GET:
+            return v, None
+        (s, i, var, val) = data.split(' ', 3)
+        if s == self.CTRL_TRAP and i != '0':
+            return None, '%s with non-zero id %s' % (s, i)
+        if op is not None and i != op:
+            if s == self.CTRL_GET + '_' + self.CTRL_REP or s == self.CTRL_SET + '_' + self.CTRL_REP:
+                return None, '%s with unexpected id %s' % (s, i)
+        return var, val
+
+    def trap(self, var, val):
+        """
+        Make TRAP message with given (vak, val) pair
+        """
+        return self.add_header("%s 0 %s %s" % (self.CTRL_TRAP, var, val))
+
+    def cmd(self, var, val=None):
+        """
+        Make SET/GET command message: returns (r, m) tuple where r is random operation id and m is assembled message
+        """
+        r = random.randint(1, sys.maxsize)
+        if val is not None:
+            return r, self.add_header("%s %s %s %s" % (self.CTRL_SET, r, var, val))
+        return r, self.add_header("%s %s %s" % (self.CTRL_GET, r, var))
+
+    def verify(self, reply, r, var, val=None):
+        """
+        Verify reply to SET/GET command: returns (b, v) tuple where v is True/False verification result and v is the variable value
+        """
+        (k, v) = self.parse(reply)
+        if k != var or (val is not None and v != val):
+            return False, v
+        return True, v
+
+if __name__ == '__main__':
+    print("IPA multiplexer v%s loaded." % IPA.version)

contrib/jenkins.sh

@@ -1,10 +1,5 @@
 #!/bin/sh
 # jenkins build helper script for osmo-hlr.  This is how we build on jenkins.osmocom.org
-#
-# environment variables:
-# * WITH_MANUALS: build manual PDFs if set to "1"
-# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")
-#
 
 if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
 	echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"
@@ -19,26 +14,17 @@ deps="$base/deps"
 inst="$deps/install"
 export deps inst
 
-osmo-clean-workspace.sh
-
 mkdir "$deps" || true
+rm -rf "$inst"
 
 verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
 
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
-export PATH="$inst/bin:$PATH"
 
 osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
 osmo-build-dep.sh libosmo-abis
 
-# Additional configure options and depends
-CONFIG=""
-if [ "$WITH_MANUALS" = "1" ]; then
-	osmo-build-dep.sh osmo-gsm-manuals
-	CONFIG="--enable-manuals"
-fi
-
 set +x
 echo
 echo
@@ -49,13 +35,9 @@ set -x
 
 cd "$base"
 autoreconf --install --force
-./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG
+./configure --enable-external-tests
 $MAKE $PARALLEL_MAKE
-$MAKE check || cat-testlogs.sh
-DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh
-
-if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
-	make -C "$base/doc/manuals" publish
+if [ "x$label" != "xFreeBSD_amd64" ]; then
+    $MAKE check || cat-testlogs.sh
+    $MAKE distcheck || cat-testlogs.sh
 fi
-
-osmo-clean-workspace.sh

contrib/systemd/Makefile.am

@@ -1,6 +0,0 @@
-EXTRA_DIST = osmo-hlr.service
-
-if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
-  osmo-hlr.service
-endif

debian/changelog

@@ -1,205 +1,3 @@
-osmo-hlr (0.2.1) unstable; urgency=medium
-
-  [ Neels Hofmeyr ]
-  * fix luop crash: use buffer for APN that remains valid
-  * add gsup_test to catch OS#3231
-  * add error handling to osmo_gsup_configure_wildcard_apn()
-
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Fri, 04 May 2018 18:41:35 +0200
-
-osmo-hlr (0.2.0) unstable; urgency=medium
-
-  [ Neels Hofmeyr ]
-  * vty: skip installing cmds now always installed by default
-  * hlr_db_tool: fix error log strerror invocation
-  * cosmetic: add comment on ignored return value
-  * db-tool: add command 'create'
-  * db-tool: cosmetic: tweak printf output
-  * db-tool: error-exit on too many arguments
-  * add --enable-sanitize config option
-  * db_test: don't verify SQLite issued error messages, they might change
-  * cosmetic: rx_send_auth_info(): decide error cause with switch()
-  * return GMM_CAUSE_IMSI_UNKNOWN if there is no auth data
-  * db_get_auth_data / db_get_auc: clarify return values
-  * osmo-hlr: log details for unknown IMSI / no auth data / db error
-  * db_test: also test db_get_auc() return values
-  * fix test_subscriber_errors.ctrl after libosmocore change
-  * fix debug log: put 'deriving 2G from 3G' in proper place
-  * ctrl test: fix: adjust expectations after stricter ctrl parsing
-  * fix build: db_test: missing LIBOSMOABIS_CFLAGS and _LIBS
-  * configure: add --enable-werror
-  * jenkins.sh: use --enable-werror configure flag, not CFLAGS
-
-  [ Harald Welte ]
-  * hlr.c: Avoid overflow of lu_operation.subscr.imsi
-  * Fix expected test output after new 'logging print file 1' vty command
-  * osmo-hlr: Add talloc context introspection via VTY
-  * vty: Don't print error if removing auth data while none present
-  * Fix responses to PURGE MS
-
-  [ Alexander Couzens ]
-  * debian: include systemd service osmo-hlr.service
-  * doc: install example .cfg files to $(docdir)/examples/
-  * debian: install osmo-hlr.cfg to /etc/osmocom
-
-  [ Max ]
-  * Remove unused check
-  * Remove unused ipa.py
-  * Enable sanitize for CI tests
-
-  [ Pau Espin Pedrol ]
-  * luop.c: Transform FIXME from warning to pragma message
-  * contrib:jenkins.sh: Enable Werror
-  * use osmo_init_logging2
-  * Remove unused src/db_test.c
-
-  [ Alexander Huemer ]
-  * Add missing build products in .gitignore
-
-  [ Stefan Sperling ]
-  * more robust usage of osmo_timer API for osmo-hlr luop timer
-  * notify GSUP clients when HLR subscriber information changes
-  * rewrite subscriber_update_notify() without calls into luop
-  * don't forget to mark luop as a packet switched connection
-
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Thu, 03 May 2018 16:27:13 +0200
-
-osmo-hlr (0.1.0) unstable; urgency=medium
-
-  [ Neels Hofmeyr ]
-  * build with autoconf/automake, add jenkins.sh script
-  * fix build on FreeBSD: eliminate implicitly declared functions
-  * fix various compiler warnings
-  * fix DLGSUP logging cat after change in libosmocore
-  * build: recoin db_test as non-installable program
-  * build: actually make sqlite mandatory
-  * bump required libosmocore version to 0.9.5
-  * gsup: send subscriber MSISDN
-  * debug log: log computed vector kinds
-  * log: move a log from info to debug level
-  * hlr.sql: typo in comment
-  * auc.c: typo in comment
-  * main: add and use root talloc ctx
-  * main: add option parsing with db file and default options
-  * main: add VTY and '-c config-file' option
-  * sql: fix 3g_auc's column K data type
-  * cosmetic: sql: indicate VARCHAR size of key columns as 32
-  * sql: auc_3g: set sqn NOT NULL DEFAULT 0
-  * comment: sql: describe auc_2g and auc_3g columns
-  * Add test suite skeleton with empty test (auc_3g_test)
-  * tests: auc_3g_test: implement vector generation test
-  * auth: verify test sets from 3GPP TS 55.205
-  * sql: add unique constraints to IMSI and MSISDN
-  * UMTS AKA resync: fix argument ordering
-  * auc_3g_test: add AUTS resync test
-  * auc_gen_vectors(): ensure sane arguments, test
-  * auc_3g_test: allow to inc fake rand bytes upon rand request
-  * auc_3g_test: add AUTS test with N vectors, to show bug
-  * cosmetic: refactor auc_compute_vectors(), add debug log
-  * auc_compute_vectors(): fix AUTS resync for multiple vectors
-  * cosmetic: auc_3g_test: improve test debugging tools
-  * cosmetic: rename auc_3g_test.c to auc_test.c
-  * fix: properly handle error rc by osmo_gsup_conn_ccm_get()
-  * auc tests: adjust cosmetically to prepare for SQN changes
-  * auc tests: fix after SQN scheme changes from libosmocore
-  * fix debug log: adjust to new SQN increment scheme
-  * UMTS AKA: implement SQN increment according to SEQ and IND
-  * debug log: output ind slot, previous sqn, and sqn db update
-  * jenkins: add value_string termination check
-  * fix db_subscr_ps error handling
-  * add config example (mostly empty)
-  * install hlr.sql in prefix/doc/osmo-hlr/
-  * use OSMO_GSUP_PORT == 4222 instead of hardcoded 2222
-  * add basic CTRL interface tests
-  * add CTRL tests for enable-/disable-/status-ps
-  * cosmetic: prepend DB_STMT_ to enum stmt_idx entries
-  * cosmetic: rename db_subscr_get() to db_subscr_get_by_imsi()
-  * cosmetic: refactor db_bind_imsi() as db_bind_text()
-  * cosmetic: multi-line DB_STMT_AUC_BY_IMSI
-  * cosmetic: log IMSI='<imsi>', log "no such subscriber"
-  * cosmetic: log: "SQLite" with capital L
-  * cosmetic: db_hlr: SL3_TXT: clarify indenting
-  * ctrl_test_runner.py: use proper constant as test db path
-  * gitignore: tests/package.m4
-  * cosmetic: don't log about missing SQLite log cb
-  * add db_bind_int() and db_bind_int64()
-  * add db_subscr_create(), db_subscr_delete(), db_subscr_update_msisdn_by_imsi()
-  * add initial db_test: creating and deleting subscribers
-  * less noise: simplify db_remove_reset()
-  * db: use int64_t as subscriber id
-  * add db_subscr_get_by_msisdn() and db_subscr_get_by_id()
-  * refactor db_subscr_ps() to db_subscr_nam()
-  * refactor db_subscr_lu()
-  * refactor db_subscr_purge
-  * add db_subscr_update_aud_by_id(), complete db_subscr_delete_by_id()
-  * refactor db_get_auth_data return val
-  * code undup: use db_remove_reset() in db_auc.c
-  * fix db_update_sqn(): reset stmt in all error cases
-  * code undup: use db_bind_text() in db_get_auth_data()
-  * debian: 'make check' needs sqlite3, add to Build-Depends
-  * fix db_subscr_get_by_*(): clear output data; test in db_test.c
-  * implement subscriber vty interface, tests
-  * add test_nodes.vty
-  * replace ctrl_test_runner.py with transcript test_subscriber.ctrl
-  * add lu_op_free(), use in luop.c
-  * luop: fix mem leak upon error in lu_op_alloc_conn()
-  * fix mem leak in handle_cmd_ps(): free luop
-  * api doc: say that lu_op_tx_del_subscr_data() doesn't free
-  * add hlr_subsrc_nam to put GSUP client notification in proper API
-  * vty: fix output of empty IMSI
-  * db api: fix/add API docs
-  * cosmetic: tweak params of hlr_controlif_setup()
-  * ctrl: completely replace all CTRL commands
-  * test_subscriber.ctrl: test against octal/hex interpretation of id
-  * jenkins: use osmo-clean-workspace.sh before and after build
-  * tests/Makefile: use test db var instead of repeating the path
-  * db_test: fix *FLAGS
-  * automatically create db tables on osmo-hlr invocation
-  * cosmetic: sql/hlr.sql: move comments
-  * cosmetic: rename SL3_TXT macro, use osmo_strlcpy()
-  * fix default logging levels to NOTICE, not DEBUG
-  * add osmo-hlr-db-tool, program to migrate from osmo-nitb db
-
-  [ Max ]
-  * Add gerrit settings
-  * Add hardcoded APN
-  * Log error cause as a string
-  * Move GSUP msg init into separate function
-  * Use strings for GSUP message type
-  * Move lu_operation into separate file
-  * db: move duplicated code into helper functions
-  * Fix compiler's warning about printf security
-  * Add routines to update nam_ps
-  * Add global HLR struct
-  * Make subscr parameter to db_subscr_get() optional
-  * Add CTRL interface
-  * CTRL: add enable/disable packet service cmds
-  * Add .deb packaging
-  * deb: fix OBS build
-  * debian: remove obsolete dependency
-  * Attempt to fix .deb package
-  * deb: use python in shebang
-  * Another attempt at fixing .deb
-  * Use release helper from libosmocore
-  * Use value string check from osmo-ci
-
-  [ Daniel Willmann ]
-  * Add systemd service file
-  * hlr_data.sql: Insert ki and opc instead of op to example data
-  * tests/auc: Don't require python3
-
-  [ Pau Espin Pedrol ]
-  * VTY: Add hlr node and bind ip field
-  * debian: remove unneeded dependency libdbd-sqlite3
-
-  [ Harald Welte ]
-  * jenkins.sh: Proper error message if local environment isn't set up
-
-  [ Alexander Couzens ]
-  * debian/rules: show testsuite.log when tests are failing
-
- -- Harald Welte <laforge@gnumonks.org>  Sat, 28 Oct 2017 20:37:33 +0200
-
 osmo-hlr (0.0.1) UNRELEASED; urgency=low
 
      * Initial release (Closes: OS#1948)

debian/control

@@ -32,28 +32,3 @@ Priority: extra
 Depends: osmo-hlr (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the osmo-hlr
  Make debugging possible
-
-Package: libosmo-gsup-client0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends},
-	 ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: Osmocom GSUP (General Subscriber Update Protocol) client library
-  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: libosmo-gsup-client-dev
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends},
-	 libosmo-gsup-client0 (= ${binary:Version}),
-	 libosmocore-dev
-Description: Development headers of Osmocom GSUP client library
-  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 package contains the development headers.

debian/libosmo-gsup-client-dev.install

@@ -1,5 +0,0 @@
-usr/include/osmocom/gsupclient
-usr/lib/*/libosmo-gsup-client*.a
-usr/lib/*/libosmo-gsup-client*.so
-usr/lib/*/libosmo-gsup-client*.la
-usr/lib/*/pkgconfig/libosmo-gsup-client.pc

debian/libosmo-gsup-client0.install

@@ -1 +0,0 @@
-usr/lib/*/libosmo-gsup-client*.so.*

debian/osmo-hlr.install

@@ -1,8 +1,2 @@
-/etc/osmocom/osmo-hlr.cfg
-/lib/systemd/system/osmo-hlr.service
 /usr/bin/osmo-hlr
-/usr/bin/osmo-hlr-db-tool
-/usr/share/doc/osmo-hlr/sql/hlr.sql
-/usr/share/doc/osmo-hlr/sql/hlr_data.sql
-/usr/share/doc/osmo-hlr/examples/osmo-hlr.cfg
-/var/lib/osmocom
+/usr/share/doc/osmo-hlr/hlr.sql

debian/rules

@@ -15,6 +15,3 @@ override_dh_strip:
 # Print test results in case of a failure
 override_dh_auto_test:
 	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
-
-override_dh_auto_configure:
-	dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system

doc/Makefile.am

@@ -1,4 +0,0 @@
-SUBDIRS = \
-	examples \
-	manuals \
-	$(NULL)

doc/examples/Makefile.am

@@ -1,27 +0,0 @@
-osmoconfdir = $(sysconfdir)/osmocom
-osmoconf_DATA = osmo-hlr.cfg
-
-EXTRA_DIST = osmo-hlr.cfg
-
-CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,'
-
-dist-hook:
-	for f in $$($(CFG_FILES)); do \
-		j="$(distdir)/$$f" && \
-		mkdir -p "$$(dirname $$j)" && \
-		$(INSTALL_DATA) $(srcdir)/$$f $$j; \
-	done
-
-install-data-hook:
-	for f in $$($(CFG_FILES)); do \
-		j="$(DESTDIR)$(docdir)/examples/$$f" && \
-		mkdir -p "$$(dirname $$j)" && \
-		$(INSTALL_DATA) $(srcdir)/$$f $$j; \
-	done
-
-uninstall-hook:
-	@$(PRE_UNINSTALL)
-	for f in $$($(CFG_FILES)); do \
-		j="$(DESTDIR)$(docdir)/examples/$$f" && \
-		$(RM) $$j; \
-	done

doc/examples/osmo-hlr.cfg

@@ -2,18 +2,13 @@
 ! OsmoHLR example configuration
 !
 log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging print category-hex 0
- logging print level 1
- logging print file basename last
- logging print extended-timestamp 1
- logging level main notice
- logging level db notice
- logging level auc notice
- logging level ss info
- logging level linp error
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging print extended-timestamp 1
+  logging level all debug
+  logging level linp error
 !
 line vty
  bind 127.0.0.1
@@ -22,8 +17,3 @@ ctrl
 hlr
  gsup
   bind ip 127.0.0.1
- ussd route prefix *#100# internal own-msisdn
- ussd route prefix *#101# internal own-imsi
- ussd route prefix *#102# internal get-ran
- ussd route prefix *#300# internal umts-off
- ussd route prefix *#301# internal umts-on

doc/manuals/Makefile.am

@@ -1,59 +0,0 @@
-EXTRA_DIST = example_subscriber_add_update_delete.vty \
-    example_subscriber_cs_ps_enabled.ctrl \
-    example_subscriber_info.ctrl \
-    osmohlr-usermanual.adoc \
-    osmohlr-usermanual-docinfo.xml \
-    osmohlr-vty-reference.xml \
-    chapters \
-    vty
-
-if BUILD_MANUALS
-  ASCIIDOC = osmohlr-usermanual.adoc
-  ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl
-  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
-
-  VTY_REFERENCE = osmohlr-vty-reference.xml
-  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
-
-  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
-endif
-
-TMP_DB = generated/hlr.db
-
-update-examples: update-examples-ctrl update-examples-vty
-
-.PHONY: found-update-deps
-found-update-deps:
-	@if [ ! -f "$(top_srcdir)/sql/hlr.sql" ]; then \
-		echo "You need to define OSMO_HLR_PATH to point at an osmo-hlr.git"; \
-		exit 1; \
-	fi
-	@if [ -z "$(shell which osmo-hlr)" ]; then \
-		echo "osmo-hlr needs to be installed / available in the PATH"; \
-		exit 1; \
-	fi
-	@if [ -z "$(shell which osmo_verify_transcript_ctrl.py)" ]; then \
-		echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \
-		exit 1; \
-	fi
-	@if [ -z "$(shell which osmo_verify_transcript_vty.py)" ]; then \
-		echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \
-		exit 1; \
-	fi
-
-update-examples-ctrl: found-update-deps
-	mkdir -p generated
-	rm -f "$(TMP_DB)"
-	sqlite3 "$(TMP_DB)" < "$(top_srcdir)/sql/hlr.sql"
-	sqlite3 "$(TMP_DB)" < "$(top_srcdir)/tests/test_subscriber.sql"
-	osmo_verify_transcript_ctrl.py \
-		-r "osmo-hlr -l $(TMP_DB) -c $(top_srcdir)/doc/examples/osmo-hlr.cfg" \
-		-p 4259 --update *.ctrl
-
-update-examples-vty: found-update-deps
-	mkdir -p generated
-	rm -f "$(TMP_DB)"
-	sqlite3 "$(TMP_DB)" < "$(top_srcdir)/sql/hlr.sql"
-	osmo_verify_transcript_vty.py \
-		-r "osmo-hlr -l $(TMP_DB) -c $(top_srcdir)/doc/examples/osmo-hlr.cfg" \
-		-p 4258 --update *.vty

doc/manuals/chapters/control.adoc

@@ -1,106 +0,0 @@
-[[hlr-ctrl]]
-== Control interface
-
-The actual protocol is described in <<common-control-if>>, the variables common
-to all programs using it are described in <<ctrl_common_vars>>. This section
-describes the CTRL interface variables specific to OsmoHLR.
-
-All subscriber variables are available by different selectors, which are freely
-interchangeable:
-
-.Subscriber selectors available on OsmoHLR's Control interface
-[options="header",width="100%",cols="35%,65%"]
-|===
-|Selector|Comment
-|subscriber.*by-imsi-*'123456'.*|Subscriber selector by IMSI, replace "123456" with the actual IMSI
-|subscriber.*by-msisdn-*'123456'.*|Subscriber selector by MSISDN
-|subscriber.*by-id-*'123456'.*|Subscriber selector by database ID
-|===
-
-Each of the above selectors feature all of these control variables:
-
-.Subscriber variables available on OsmoHLR's Control interface
-[options="header",width="100%",cols="35%,8%,8%,8%,41%"]
-|===
-|Name|Access|Trap|Value|Comment
-|subscriber.by-\*.*info*|R|No||List (short) subscriber information
-|subscriber.by-\*.*info-aud*|R|No||List subscriber authentication tokens
-|subscriber.by-\*.*info-all*|R|No||List both 'info' and 'info-aud' in one
-|subscriber.by-\*.*cs-enabled*|RW|No|'1' or '0'|Enable/disable circuit-switched access
-|subscriber.by-\*.*ps-enabled*|RW|No|'1' or '0'|Enable/disable packet-switched access
-|===
-
-=== subscriber.by-*.info, info-aud, info-all
-
-Query the HLR database and return current subscriber record, in multiple lines
-of the format
-
-----
-name<tab>value
-----
-
-To keep the reply as short as possible, some values are omitted if they are
-empty. These are the returned values and their presence
-modalities; for their meaning, see <<subscriber-params>>:
-
-.Returned values by OsmoHLR's 'info', 'info-all' and 'info-aud' commands
-[options="header",width="100%",cols="15%,15%,30%,40%"]
-|===
-|Returned by 'info-all' and|Name|Format|Presence
-|'info'|id|-9223372036854775808 .. 9223372036854775807 (usually not negative)|always
-|'info'|imsi|6 to 15 decimal digits|always
-|'info'|msisdn|1 to 15 decimal digits|when non-empty
-|'info'|nam_cs|'1' if CS is enabled, or '0'|always
-|'info'|nam_ps|'1' if PS is enabled, or '0'|always
-|'info'|vlr_number|up to 15 decimal digits|when non-empty
-|'info'|sgsn_number|up to 15 decimal digits|when non-empty
-|'info'|sgsn_address||when non-empty
-|'info'|ms_purged_cs|'1' if CS is purged, or '0'|always
-|'info'|ms_purged_ps|'1' if PS is purged, or '0'|always
-|'info'|periodic_lu_timer|0..4294967295|always
-|'info'|periodic_rau_tau_timer|0..4294967295|always
-|'info'|lmsi|8 hex digits|always
-|'info-aud'|aud2g.algo|one of 'comp128v1', 'comp128v2', 'comp128v3' or 'xor'|when valid 2G auth data is set
-|'info-aud'|aud2g.ki|32 hexadecimal digits|when valid 2G auth data is set
-|'info-aud'|aud3g.algo|so far always 'milenage'|when valid 3G auth data is set
-|'info-aud'|aud3g.k|32 hexadecimal digits|when valid 3G auth data is set
-|'info-aud'|aud3g.op|32 hexadecimal digits|when valid 3G auth data is set, *not* when OPC is set
-|'info-aud'|aud3g.opc|32 hexadecimal digits|when valid 3G auth data is set, *not* when OP is set
-|'info-aud'|aud3g.ind_bitlen|0..28|when valid 3G auth data is set
-|'info-aud'|aud3g.sqn|0 .. 18446744073709551615|when valid 3G auth data is set
-|===
-
-This is an example Control Interface transcript that illustrates the various
-'info' commands:
-
-----
-include::../example_subscriber_info.ctrl[]
-----
-
-=== subscriber.by-*.ps-enabled, cs-enabled
-
-Disable or enable packet-/circuit-switched access for the given IMSI;
-
-* 'ps-enabled' switches access to GPRS or UMTS data services,
-* 'cs-enabled' switches access to voice services.
-
-When disabled, the next time this subscriber attempts to do a Location Updating
-GSUP operation for the given domain (i.e. from the SGSN for 'ps-enabled', from
-the MSC/VLR for 'cs-enabled'), it will be rejected by OsmoHLR. Currently
-connected GSUP clients will be notified via GSUP when a subscriber is being
-disabled, so that the subscriber can be dropped in case it is currently
-attached.
-
-The current 'ps-enabled'/'cs-enabled' status can be queried by 'GET' commands,
-and also by looking at 'nam_ps' and 'nam_cs' in a 'subscriber.by-*.info'
-response.
-
-A value of "1" indicates that the given domain is enabled, which is the
-default; a value of "0" disables access.
-
-This is an example transcript that illustrates 'ps-enabled' and 'cs-enabled'
-commands:
-
-----
-include::../example_subscriber_cs_ps_enabled.ctrl[]
-----

doc/manuals/chapters/overview.adoc

@@ -1,69 +0,0 @@
-[[overview]]
-== Overview
-
-This manual should help you getting started with OsmoHLR. It will cover
-aspects of configuring and running the OsmoHLR.
-
-[[intro_overview]]
-=== About OsmoHLR
-
-OsmoHLR is Osmocom's minimal implementation of a Home Location Register (HLR)
-for 2G and 3G GSM and UMTS mobile core networks. Its interfaces are:
-
-- GSUP, serving towards OsmoMSC and OsmoSGSN;
-- A local SQLite database;
-- The Osmocom typical telnet VTY and CTRL interfaces.
-
-Originally, the OpenBSC project's OsmoNITB all-in-one implementation had an
-integrated HLR, managing subscribers and SMS in the same local database. Along
-with the separate OsmoMSC and its new VLR component, OsmoHLR was implemented
-from scratch to alleviate various shortcomings of the internal HLR:
-
-- The separate HLR allows using centralized subscriber management for both
-  circuit-switched and packet-switched domains (i.e. one OsmoHLR for both
-  OsmoMSC and OsmoSGSN).
-
-- VLR and HLR brought full UMTS AKA (Authentication and Key Agreement) support,
-  i.e. Milenage authentication in both the full 3G variant as well as the
-  backwards compatible 2G variant.
-
-- In contrast to the OsmoNITB, the specific way the new OsmoMSC's VLR accesses
-  OsmoHLR brings fully asynchronous subscriber database access.
-
-Find the OsmoHLR issue tracker and wiki online at
-
-- https://osmocom.org/projects/osmo-hlr
-- https://osmocom.org/projects/osmo-hlr/wiki
-
-
-[[fig-gsm]]
-.Typical GSM network architecture used with OsmoHLR
-[graphviz]
-----
-digraph G {
-	rankdir=LR;
-	subgraph cluster_hlr {
-		label = "OsmoHLR";
-		GSUP [label="GSUP server"]
-		DB [label="SQLite DB"]
-		GSUP->DB
-		DB->CTRL [dir="back"]
-		DB->VTY [dir="back"]
-	}
-
-	Admin [label="Admin and\nMaintenance"]
-	SW [label="3rd party software\nintegration"]
-	VTY->Admin [dir="back"]
-	CTRL->SW [dir="back"]
-		
-	MSC [label="MSC/VLR"]
-	MSC->GSUP  [label="GSUP"]
-	SGSN->GSUP [label="GSUP"]
-
-	BSC->MSC
-	HNBGW->MSC
-	HNBGW->SGSN
-	PCU->SGSN
-}
-----
-

doc/manuals/chapters/running.adoc

@@ -1,80 +0,0 @@
-== Running OsmoHLR
-
-The OsmoHLR executable (`osmo-hlr`) offers the following command-line
-arguments:
-
-=== SYNOPSIS
-
-*osmo-hlr* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE']
-
-=== OPTIONS
-
-*-h, --help*::
-	Print a short help message about the supported options
-*-V, --version*::
-	Print the compile-time version number of the OsmoBTS program
-*-d, --debug 'DBGMASK','DBGLEVELS'*::
-	Set the log subsystems and levels for logging to stderr. This
-	has mostly been superseded by VTY-based logging configuration,
-	see <<logging>> for further information.
-*-D, --daemonize*::
-	Fork the process as a daemon into background.
-*-c, --config-file 'CONFIGFILE'*::
-	Specify the file and path name of the configuration file to be
-	used. If none is specified, use `osmo-hlr.cfg` in the current
-	working directory.
-*-s, --disable-color*::
-	Disable colors for logging to stderr. This has mostly been
-	deprecated by VTY based logging configuration, see <<logging>>
-	for more information.
-*-T, --timestamp*::
-	Enable time-stamping of log messages to stderr. This has mostly
-	been deprecated by VTY based logging configuration, see
-	<<logging>> for more information.
-*-e, --log-level 'LOGLEVEL'*::
-	Set the global log level for logging to stderr. This has mostly
-	been deprecated by VTY based logging configuration, see
-	<<logging>> for more information.
-*-l, --database 'DATABASE'*::
-	Specify the file name of the SQLite3 database to use as HLR/AUC
-	storage
-
-=== Bootstrap the Database
-
-If no database exists yet, OsmoHLR will automatically create and bootstrap a
-database file with empty tables. If no `-l` command-line option is provided,
-this database file will be created in the current working directory.
-
-Alternatively, you may use the `osmo-hlr-db-tool`, which is installed along
-with `osmo-hlr`, to bootstrap an empty database, or to migrate subscriber data
-from an old 'OsmoNITB' database. See `osmo-hlr-db-tool --help`.
-
-=== Multiple instances
-
-Running multiple instances of `osmo-hlr` on the same computer is possible if
-all interfaces (VTY, CTRL) are separated using the appropriate configuration
-options. The IP based interfaces are binding to local host by default. In order
-to separate the processes, the user has to bind those services to specific but
-different IP addresses and/or ports.
-
-The VTY and the Control interface can be bound to IP addresses from the loopback
-address range, for example:
-
-----
-line vty
- bind 127.0.0.2
-ctrl
- bind 127.0.0.2
-----
-
-The GSUP interface can be bound to a specific IP address by the following
-configuration options:
-
-----
-hlr
- gsup
-  bind ip 10.23.42.1
-----
-
-NOTE: At the time of writing, OsmoHLR lacks a config option to change the GSUP
-port, which is by default TCP port 4222.

doc/manuals/chapters/subscribers.adoc

@@ -1,69 +0,0 @@
-== Managing Subscribers
-
-Subscribers are kept in a local SQLite database file and can be managed via VTY
-and CTRL interfaces.
-
-This section provides some examples; also refer to the OsmoHLR VTY reference
-manual <<vty-ref-osmohlr>> as well as the Control interface described in
-<<hlr-ctrl>>.
-
-=== Example: Add/Update/Delete Subscriber via VTY
-
-The following telnet VTY session adds a subscriber complete with GSM (2G) and
-UMTS (3G and 2G) authentication tokens, and finally removes the subscriber
-again; it assumes that osmo-hlr is running and listening for telnet VTY
-connections on localhost:
-
-----
-$ telnet localhost 4258
-include::../example_subscriber_add_update_delete.vty[]
-----
-
-[[subscriber-params]]
-=== Subscriber Parameters
-
-The following parameters are managed for each subscriber of the HLR, modelled
-roughly after 3GPP TS 23.008, version 13.3.0; note that not all of these
-parameters are necessarily in active use.
-
-The `aud3g` table also applies to 2G networks: it provides UMTS AKA tokens for
-Milenage authentication, which is available both on 3G and 2G networks. On 2G,
-when both MS and network are R99 capable (like OsmoMSC and OsmoSGSN are), the
-full UMTS AKA with Milenage keys from `aud_3g`, using AUTN and extended RES
-tokens, is available. With pre-R99 MS or network configurations, the GSM AKA
-compatible variant of Milenage, still using the Milenage keys from `aud_3g` but
-transceiving only RAND and SRES, may be applicable. (See 3GPP TS 33.102, chapter
-6.8.1, Authentication and key agreement of UMTS subscribers.)
-
-.OsmoHLR's subscriber parameters
-[options="header",width="100%",cols="20%,20%,60%"]
-|===
-|Name|Example|Description
-|imsi|901700000014701|identity of the SIM/USIM, 3GPP TS 23.008 chapter 2.1.1.1
-|msisdn|2342123|number to dial to reach this subscriber (multiple MSISDNs can be stored per subscriber), 3GPP TS 23.008 chapter 2.1.2
-|imeisv|4234234234234275|identity of the mobile device and software version, 3GPP TS 23.008 chapter 2.2.3
-|aud2g.algo|comp128v3|Authentication algorithm ID for GSM AKA, corresponds to enum osmo_auth_algo
-|aud2g.ki||Subscriber's secret key (128bit)
-|aud3g.algo|milenage|Authentication algorithm ID for UMTS AKA (applies to both 3G and 2G networks), corresponds to enum osmo_auth_algo
-|aud3g.k|(32 hexadecimal digits)|Subscriber's secret key (128bit)
-|aud3g.op|(32 hexadecimal digits)|Operator's secret key (128bit)
-|aud3g.opc|(32 hexadecimal digits)|Secret key derived from OP and K (128bit), alternative to using OP which does not disclose OP to subscribers
-|aud3g.sqn|123|Sequence number of last used key (64bit unsigned)
-|aud3g.ind_bitlen|5|Nr of index bits at lower SQN end
-|apn||
-|vlr_number||3GPP TS 23.008 chapter 2.4.5
-|hlr_number||3GPP TS 23.008 chapter 2.4.6
-|sgsn_number||3GPP TS 23.008 chapter 2.4.8.1
-|sgsn_address||3GPP TS 23.008 chapter 2.13.10
-|ggsn_number||3GPP TS 23.008 chapter 2.4.8.2
-|gmlc_number||3GPP TS 23.008 chapter 2.4.9.2
-|smsc_number||3GPP TS 23.008 chapter 2.4.23
-|periodic_lu_tmr||3GPP TS 23.008 chapter 2.4.24
-|periodic_rau_tau_tmr||3GPP TS 23.008 chapter 2.13.115
-|nam_cs|1|Enable/disable voice access (3GPP TS 23.008 chapter 2.1.1.2: network access mode)
-|nam_ps|0|Enable/disable data access (3GPP TS 23.008 chapter 2.1.1.2: network access mode)
-|lmsi||3GPP TS 23.008 chapter 2.1.8
-|ms_purged_cs|0|3GPP TS 23.008 chapter 2.7.5
-|ms_purged_ps|1|3GPP TS 23.008 chapter 2.7.6
-|===
-

doc/manuals/chapters/ussd.adoc

@@ -1,78 +0,0 @@
-[[ussd]]
-== Unstructured Supplementary Services Data (USSD)
-
-The _Unstructured Supplementary Services Data (USSD)_ is one service within
-2G/3G networks next to other services such as circuit-switched voice, packet-switched
-data and SMS (Short Message Service).
-
-It is on an abstract level quite similar to SMS in that USSD can be used to send
-textual messages.  However, there are the following differences:
-
-* USSD is between the MS (phone) and an USSD application on the network, while
-  SMS is primarily between two subscribers identified by their MSISDN
-* USSD is faster, as it doesn't suffer from the complicated three-layer CP/RP/TP
-  protocol stack of SMS with it's acknowledgement of the acknowledged acknowledgement.
-* USSD is session-oriented, i.e. a dialogue/session between subscriber and application
-  can persist for the transfer of more than one message.  The dedicated radio channel
-  on the RAN remains established throughout that dialogue.
-
-=== USSD in Osmocom
-
-Until August 2018, OsmoMSC contained some minimalistic internal USSD
-handling with no
-ability to attach/extend it with external USSD applications.
-
-From August 2018 onwards, OsmoMSC doesn't contain any internal USSD
-handlers/applications anymore.  Instead, all USSD is transported to/from
-OsmoHLR via the GSUP protocol.
-
-OsmoHLR contains some intenal USSD handlers and can route USSD messages
-to any number of external USSD entities (EUSEs).  The EUSE also use GSUP
-to communicate USSD from/to OsmoHLR.
-
-Each EUSE is identified by its name.  The name consists of a single-word
-string preceding a currently fixed ("-00-00-00-00-00-00") suffix.
-There is no authentication between EUSE and OsmoHLR: Any client program
-able to connect to the GSUP port of OsmoHLR can register as any EUSE
-(name).
-
-NOTE:: We plan to remove the requirement for this suffix as soon as we
-are done resolving all more important issues.
-
-=== USSD Configuration
-
-USSD configuration in OsmoHLR happens within the `hlr` VTY node.
-
-`euse foobar-00-00-00-00-00-00` defines an EUSE with the given name `foobar`
-
-`ussd route prefix *123 external foobar-00-00-00-00-00-00` installs a
-prefix route to the named EUSE.  All USSD short codes starting with *123 will be
-routed to the named EUSE.
-
-`ussd route prefix *#100# internal own-msisdn` installs a prefix route
-to the named internal USSD handler.  There above command will restore
-the old behavior, in which *#100# will return a text message containing
-the subscribers own phone number.  There is one other handler called
-`own-imsi` which will return the IMSI instead of the MSISDN.
-
-`ussd default-route external foobar-00-00-00-00-00-00` installs a
-default route to the named EUSE.  This means that all USSD codes for
-which no more specific route exists will be routed to the named EUSE.
-
-=== Example EUSE program
-
-We have provided an example EUSE developed in C language using existing
-Osmocom libraries for GSUP protocol handling and USSD encoding/decoding.
-It will register as `foobar` EUSE to OsmoHLR on localhost.  You can run
-it on a different machine by specifying e.g. `osmo-euse-demo 1.2.3.4 5678`
-to make it connect to OsmoHLR on IP address 1.2.3.4 and GSUP/TCP port
-5678.
-
-The idea is that you can use this as a template to develop your own USSD
-applications, or any gateways to other protocols or interfaces.
-
-You can find it in `osmo-hlr/src/osmo-euse-demo.c` or online by
-following the link to http://git.osmocom.org/osmo-hlr/tree/src/osmo-euse-demo.c
-
-This demonstration program will echo back any USSD message sent/routed
-to it, quoted like _You sent "..."_.

doc/manuals/example_subscriber_add_update_delete.vty

@@ -1,34 +0,0 @@
-OsmoHLR> enable
-OsmoHLR# subscriber imsi 123456789023000 create
-% Created subscriber 123456789023000
-    ID: 1
-    IMSI: 123456789023000
-    MSISDN: none
-
-OsmoHLR# subscriber imsi 123456789023000 update msisdn 423
-% Updated subscriber IMSI='123456789023000' to MSISDN='423'
-
-OsmoHLR# subscriber msisdn 423 update aud3g milenage k deaf0ff1ced0d0dabbedd1ced1cef00d opc cededeffacedacefacedbadfadedbeef
-OsmoHLR# subscriber msisdn 423 show
-    ID: 1
-    IMSI: 123456789023000
-    MSISDN: 423
-    3G auth: MILENAGE
-             K=deaf0ff1ced0d0dabbedd1ced1cef00d
-             OPC=cededeffacedacefacedbadfadedbeef
-             IND-bitlen=5
-
-OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki beefedcafefaceacedaddeddecadefee
-OsmoHLR# subscriber msisdn 423 show
-    ID: 1
-    IMSI: 123456789023000
-    MSISDN: 423
-    2G auth: COMP128v3
-             KI=beefedcafefaceacedaddeddecadefee
-    3G auth: MILENAGE
-             K=deaf0ff1ced0d0dabbedd1ced1cef00d
-             OPC=cededeffacedacefacedbadfadedbeef
-             IND-bitlen=5
-
-OsmoHLR# subscriber imsi 123456789023000 delete
-% Deleted subscriber for IMSI '123456789023000'

doc/manuals/example_subscriber_cs_ps_enabled.ctrl

@@ -1,71 +0,0 @@
-GET 1 subscriber.by-msisdn-103.info
-GET_REPLY 1 subscriber.by-msisdn-103.info 
-id	3
-imsi	901990000000003
-msisdn	103
-nam_cs	1
-nam_ps	1
-ms_purged_cs	0
-ms_purged_ps	0
-periodic_lu_timer	0
-periodic_rau_tau_timer	0
-lmsi	00000000
-
-GET 2 subscriber.by-msisdn-103.ps-enabled
-GET_REPLY 2 subscriber.by-msisdn-103.ps-enabled 1
-
-SET 3 subscriber.by-msisdn-103.ps-enabled 0
-SET_REPLY 3 subscriber.by-msisdn-103.ps-enabled OK
-
-GET 4 subscriber.by-msisdn-103.ps-enabled
-GET_REPLY 4 subscriber.by-msisdn-103.ps-enabled 0
-
-GET 5 subscriber.by-msisdn-103.info
-GET_REPLY 5 subscriber.by-msisdn-103.info 
-id	3
-imsi	901990000000003
-msisdn	103
-nam_cs	1
-nam_ps	0
-ms_purged_cs	0
-ms_purged_ps	0
-periodic_lu_timer	0
-periodic_rau_tau_timer	0
-lmsi	00000000
-
-SET 6 subscriber.by-msisdn-103.cs-enabled 0
-SET_REPLY 6 subscriber.by-msisdn-103.cs-enabled OK
-
-GET 7 subscriber.by-msisdn-103.cs-enabled
-GET_REPLY 7 subscriber.by-msisdn-103.cs-enabled 0
-
-GET 8 subscriber.by-msisdn-103.info
-GET_REPLY 8 subscriber.by-msisdn-103.info 
-id	3
-imsi	901990000000003
-msisdn	103
-nam_cs	0
-nam_ps	0
-ms_purged_cs	0
-ms_purged_ps	0
-periodic_lu_timer	0
-periodic_rau_tau_timer	0
-lmsi	00000000
-
-SET 9 subscriber.by-msisdn-103.cs-enabled 1
-SET_REPLY 9 subscriber.by-msisdn-103.cs-enabled OK
-SET 10 subscriber.by-msisdn-103.ps-enabled 1
-SET_REPLY 10 subscriber.by-msisdn-103.ps-enabled OK
-
-GET 11 subscriber.by-msisdn-103.info
-GET_REPLY 11 subscriber.by-msisdn-103.info 
-id	3
-imsi	901990000000003
-msisdn	103
-nam_cs	1
-nam_ps	1
-ms_purged_cs	0
-ms_purged_ps	0
-periodic_lu_timer	0
-periodic_rau_tau_timer	0
-lmsi	00000000

doc/manuals/example_subscriber_info.ctrl

@@ -1,42 +0,0 @@
-GET 1 subscriber.by-imsi-901990000000003.info
-GET_REPLY 1 subscriber.by-imsi-901990000000003.info 
-id	3
-imsi	901990000000003
-msisdn	103
-nam_cs	1
-nam_ps	1
-ms_purged_cs	0
-ms_purged_ps	0
-periodic_lu_timer	0
-periodic_rau_tau_timer	0
-lmsi	00000000
-
-GET 2 subscriber.by-msisdn-103.info-aud
-GET_REPLY 2 subscriber.by-msisdn-103.info-aud 
-aud2g.algo	COMP128v1
-aud2g.ki	000102030405060708090a0b0c0d0e0f
-aud3g.algo	MILENAGE
-aud3g.k	000102030405060708090a0b0c0d0e0f
-aud3g.opc	101112131415161718191a1b1c1d1e1f
-aud3g.ind_bitlen	5
-aud3g.sqn	0
-
-GET 3 subscriber.by-id-3.info-all
-GET_REPLY 3 subscriber.by-id-3.info-all 
-id	3
-imsi	901990000000003
-msisdn	103
-nam_cs	1
-nam_ps	1
-ms_purged_cs	0
-ms_purged_ps	0
-periodic_lu_timer	0
-periodic_rau_tau_timer	0
-lmsi	00000000
-aud2g.algo	COMP128v1
-aud2g.ki	000102030405060708090a0b0c0d0e0f
-aud3g.algo	MILENAGE
-aud3g.k	000102030405060708090a0b0c0d0e0f
-aud3g.opc	101112131415161718191a1b1c1d1e1f
-aud3g.ind_bitlen	5
-aud3g.sqn	0

doc/manuals/osmohlr-usermanual-docinfo.xml

@@ -1,47 +0,0 @@
-<revhistory>
-  <revision>
-    <revnumber>1</revnumber>
-    <date>September 18th, 2017</date>
-    <authorinitials>NH</authorinitials>
-    <revremark>
-      Initial version; based on OsmoNITB manual version 2.
-    </revremark>
-  </revision>
-</revhistory>
-
-<authorgroup>
-  <author>
-    <firstname>Neels</firstname>
-    <surname>Hofmeyr</surname>
-    <email>nhofmeyr@sysmocom.de</email>
-    <authorinitials>NH</authorinitials>
-    <affiliation>
-      <shortaffil>sysmocom</shortaffil>
-      <orgname>sysmocom - s.f.m.c. GmbH</orgname>
-      <jobtitle>Senior Developer</jobtitle>
-    </affiliation>
-  </author>
-</authorgroup>
-
-<copyright>
-  <year>2017</year>
-  <holder>sysmocom - s.f.m.c. GmbH</holder>
-</copyright>
-
-<legalnotice>
-  <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the GNU Free Documentation License,
-	Version 1.3 or any later version published by the Free Software
-	Foundation; with the Invariant Sections being just 'Foreword',
-	'Acknowledgements' and 'Preface', with no Front-Cover Texts,
-	and no Back-Cover Texts.  A copy of the license is included in
-	the section entitled "GNU Free Documentation License".
-  </para>
-  <para>
-	The Asciidoc source code of this manual can be found at
-	<ulink url="http://git.osmocom.org/osmo-gsm-manuals/">
-		http://git.osmocom.org/osmo-gsm-manuals/
-	</ulink>
-  </para>
-</legalnotice>

doc/manuals/osmohlr-usermanual.adoc

@@ -1,36 +0,0 @@
-:gfdl-enabled:
-:program-name: OsmoHLR
-
-OsmoHLR User Manual
-====================
-Neels Hofmeyr <nhofmeyr@sysmocom.de>
-
-
-include::./common/chapters/preface.adoc[]
-
-include::{srcdir}/chapters/overview.adoc[]
-
-include::{srcdir}/chapters/running.adoc[]
-
-include::{srcdir}/chapters/subscribers.adoc[]
-
-include::{srcdir}/chapters/ussd.adoc[]
-
-include::./common/chapters/vty.adoc[]
-
-include::./common/chapters/logging.adoc[]
-
-include::{srcdir}/chapters/control.adoc[]
-
-include::./common/chapters/control_if.adoc[]
-
-include::./common/chapters/gsup.adoc[]
-
-include::./common/chapters/port_numbers.adoc[]
-
-include::./common/chapters/bibliography.adoc[]
-
-include::./common/chapters/glossary.adoc[]
-
-include::./common/chapters/gfdl.adoc[]
-

doc/manuals/osmohlr-vty-reference.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ex:ts=2:sw=42sts=2:et
-  -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
--->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
-"http://docbook.org/xml/5.0/dtd/docbook.dtd" [
-<!ENTITY chapter-vty      SYSTEM      "./common/chapters/vty.xml" >
-<!ENTITY sections-vty     SYSTEM      "generated/docbook_vty.xml"  >
-]>
-
-<book>
-  <info>
-    <revhistory>
-        <revision>
-            <revnumber>v1</revnumber>
-            <date>18th September 2017</date>
-            <authorinitials>nh</authorinitials>
-            <revremark>Initial</revremark>
-        </revision>
-    </revhistory>
-
-    <title>OsmoHLR VTY Reference</title>
-
-    <copyright>
-      <year>2017</year>
-    </copyright>
-
-    <legalnotice>
-      <para>This work is copyright by <orgname>sysmocom - s.f.m.c. GmbH</orgname>. All rights reserved.
-      </para>
-    </legalnotice>
-  </info>
-
-  <!-- Main chapters-->
-  &chapter-vty;
-</book>
-

doc/manuals/vty/hlr_vty_additions.xml

@@ -1,2 +0,0 @@
-<vtydoc xmlns='urn:osmocom:xml:libosmocore:vty:doc:1.0'>
-</vtydoc>

include/Makefile.am

@@ -1,2 +0,0 @@
-nobase_include_HEADERS = osmocom/gsupclient/gsup_client.h
-

include/osmocom/gsupclient/gsup_client.h

@@ -1,77 +0,0 @@
-/* GPRS Subscriber Update Protocol client */
-
-/* (C) 2014 by Sysmocom s.f.m.c. GmbH
- * All Rights Reserved
- *
- * Author: Jacob Erlbeck
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include <osmocom/core/timer.h>
-#include <osmocom/gsm/oap_client.h>
-#include <osmocom/gsm/ipa.h>
-#include <osmocom/gsm/gsup.h>
-
-/* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as
- * possible.  Even one new connection attempt per second should be quite acceptable until the link is
- * re-established */
-#define OSMO_GSUP_CLIENT_RECONNECT_INTERVAL 1
-#define OSMO_GSUP_CLIENT_PING_INTERVAL 20
-
-struct msgb;
-struct ipa_client_conn;
-struct osmo_gsup_client;
-
-/* Expects message in msg->l2h */
-typedef int (*osmo_gsup_client_read_cb_t)(struct osmo_gsup_client *gsupc, struct msgb *msg);
-
-struct osmo_gsup_client {
-	const char *unit_name; /* same as ipa_dev->unit_name, for backwards compat */
-
-	struct ipa_client_conn *link;
-	osmo_gsup_client_read_cb_t read_cb;
-	void *data;
-
-	struct osmo_oap_client_state oap_state;
-
-	struct osmo_timer_list ping_timer;
-	struct osmo_timer_list connect_timer;
-	int is_connected;
-	int got_ipa_pong;
-
-	struct ipaccess_unit *ipa_dev; /* identification information sent to IPA server */
-};
-
-struct osmo_gsup_client *osmo_gsup_client_create2(void *talloc_ctx,
-						  struct ipaccess_unit *ipa_dev,
-						  const char *ip_addr,
-						  unsigned int tcp_port,
-						  osmo_gsup_client_read_cb_t read_cb,
-						  struct osmo_oap_client_config *oapc_config);
-struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx,
-						 const char *unit_name,
-						 const char *ip_addr,
-						 unsigned int tcp_port,
-						 osmo_gsup_client_read_cb_t read_cb,
-						 struct osmo_oap_client_config *oapc_config);
-
-void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc);
-int osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg);
-int osmo_gsup_client_enc_send(struct osmo_gsup_client *gsupc,
-			      const struct osmo_gsup_message *gsup_msg);
-struct msgb *osmo_gsup_client_msgb_alloc(void);
-

libosmo-gsup-client.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Osmocom GSUP Client Library
-Description: C Utility Library
-Version: @VERSION@
-Libs: -L${libdir} -losmo-gsup-client
-Cflags: -I${includedir}/
-

sql/Makefile.am

@@ -3,12 +3,5 @@ EXTRA_DIST = \
 	hlr.sql \
 	$(NULL)
 
-sqldir = $(docdir)/sql
-sql_DATA = $(srcdir)/hlr.sql $(srcdir)/hlr_data.sql
-
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/osmocom
-
-uninstall-hook:
-	rm -rf $(DESTDIR)$(localstatedir)/lib/osmocom
+docsdir = $(datadir)/doc/osmo-hlr
+docs_DATA = $(srcdir)/hlr.sql

sql/hlr.sql

@@ -1,5 +1,6 @@
+--modelled roughly after TS 23.008 version 13.3.0
+
 CREATE TABLE subscriber (
--- OsmoHLR's DB scheme is modelled roughly after TS 23.008 version 13.3.0
 	id		INTEGER PRIMARY KEY,
 	-- Chapter 2.1.1.1
 	imsi		VARCHAR(15) UNIQUE NOT NULL,
@@ -36,11 +37,7 @@ CREATE TABLE subscriber (
 	-- Chapter 2.7.5
 	ms_purged_cs	BOOLEAN NOT NULL DEFAULT 0,
 	-- Chapter 2.7.6
-	ms_purged_ps	BOOLEAN NOT NULL DEFAULT 0,
-
-	-- Timestamp of last location update seen from subscriber
-	-- The value is a string which encodes a UTC timestamp in granularity of seconds.
-	last_lu_seen TIMESTAMP default NULL
+	ms_purged_ps	BOOLEAN NOT NULL DEFAULT 0
 );
 
 CREATE TABLE subscriber_apn (
@@ -48,8 +45,8 @@ CREATE TABLE subscriber_apn (
 	apn		VARCHAR(256) NOT NULL
 );
 
-CREATE TABLE subscriber_multi_msisdn (
 -- Chapter 2.1.3
+CREATE TABLE subscriber_multi_msisdn (
 	subscriber_id	INTEGER,		-- subscriber.id
 	msisdn		VARCHAR(15) NOT NULL
 );
@@ -70,17 +67,5 @@ CREATE TABLE auc_3g (
 	ind_bitlen	INTEGER NOT NULL DEFAULT 5	-- nr of index bits at lower SQN end
 );
 
--- Optional: add subscriber entries to allow or disallow specific RATs (2G or 3G or ...).
--- If a subscriber has no entry, that means that all RATs are allowed (backwards compat).
-CREATE TABLE subscriber_rat (
-	subscriber_id	INTEGER,		-- subscriber.id
-	rat		TEXT CHECK(rat in ('GERAN-A', 'UTRAN-Iu')) NOT NULL,	-- Radio Access Technology, see enum ran_type
-	allowed		BOOLEAN CHECK(allowed in (0, 1)) NOT NULL DEFAULT 0
-);
-
-CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi);
-CREATE UNIQUE INDEX idx_subscr_rat_flag ON subscriber_rat (subscriber_id, rat);
-
--- 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 = 2;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_subscr_imsi ON subscriber (imsi);
+-- SELECT algo_id_2g, ki, algo_id_3g, k, op, opc, sqn FROM subscriber LEFT JOIN auc_2g ON auc_2g.subscriber_id = subscriber.id LEFT JOIN auc_3g ON auc_3g.subscriber_id = subscriber.id WHERE imsi = ?

sql/upgrade_v1_to_v2.sql

@@ -1,8 +0,0 @@
-
-CREATE TABLE subscriber_rat (
-	subscriber_id	INTEGER,		-- subscriber.id
-	rat		TEXT CHECK(rat in ('GERAN-A', 'UTRAN-Iu')) NOT NULL,	-- Radio Access Technology, see enum ran_type
-	allowed		BOOLEAN NOT NULL DEFAULT 0,
-);
-
-PRAGMA user_version = 2;

src/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = gsupclient
-
 AM_CFLAGS = \
 	-Wall \
 	$(LIBOSMOCORE_CFLAGS) \
@@ -10,19 +8,10 @@ AM_CFLAGS = \
 	$(SQLITE3_CFLAGS) \
 	$(NULL)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include \
-	$(NULL)
-
 EXTRA_DIST = \
 	populate_hlr_db.pl \
-	db_sql2c.sed \
 	$(NULL)
 
-BUILT_SOURCES = \
-	db_bootstrap.h \
-	$(NULL)
-CLEANFILES = $(BUILT_SOURCES)
-
 noinst_HEADERS = \
 	auc.h \
 	db.h \
@@ -35,14 +24,14 @@ noinst_HEADERS = \
 	ctrl.h \
 	hlr_vty.h \
 	hlr_vty_subscr.h \
-	hlr_ussd.h \
-	db_bootstrap.h \
 	$(NULL)
 
 bin_PROGRAMS = \
 	osmo-hlr \
-	osmo-hlr-db-tool \
-	osmo-euse-demo \
+	$(NULL)
+
+noinst_PROGRAMS = \
+	db_test \
 	$(NULL)
 
 osmo_hlr_SOURCES = \
@@ -59,8 +48,6 @@ osmo_hlr_SOURCES = \
 	rand_urandom.c \
 	hlr_vty.c \
 	hlr_vty_subscr.c \
-	gsup_send.c \
-	hlr_ussd.c \
 	$(NULL)
 
 osmo_hlr_LDADD = \
@@ -72,21 +59,6 @@ osmo_hlr_LDADD = \
 	$(SQLITE3_LIBS) \
 	$(NULL)
 
-osmo_hlr_db_tool_SOURCES = \
-	hlr_db_tool.c \
-	db.c \
-	db_hlr.c \
-	logging.c \
-	rand_urandom.c \
-	dbd_decode_binary.c \
-	$(NULL)
-
-osmo_hlr_db_tool_LDADD = \
-	$(LIBOSMOCORE_LIBS) \
-	$(LIBOSMOGSM_LIBS) \
-	$(SQLITE3_LIBS) \
-	$(NULL)
-
 db_test_SOURCES = \
 	auc.c \
 	db.c \
@@ -101,24 +73,3 @@ db_test_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(NULL)
-
-osmo_euse_demo_SOURCES = \
-	osmo-euse-demo.c \
-	$(NULL)
-
-osmo_euse_demo_LDADD = \
-	$(top_builddir)/src/gsupclient/libosmo-gsup-client.la \
-	$(LIBOSMOCORE_LIBS) \
-	$(LIBOSMOGSM_LIBS) \
-	$(NULL)
-
-BOOTSTRAP_SQL = $(top_srcdir)/sql/hlr.sql
-
-db_bootstrap.h: $(BOOTSTRAP_SQL) $(srcdir)/db_sql2c.sed
-	echo "/* DO NOT EDIT THIS FILE. It is generated from files in osmo-hlr.git/sql/ */" > "$@"
-	echo "#pragma once" >> "$@"
-	echo "static const char *stmt_bootstrap_sql[] = {" >> "$@"
-	cat "$(BOOTSTRAP_SQL)" \
-		| sed -f "$(srcdir)/db_sql2c.sed" \
-		>> "$@"
-	echo "};" >> "$@"

src/auc.c

@@ -144,7 +144,6 @@ int auc_compute_vectors(struct osmo_auth_vector *vec, unsigned int num_vec,
 
 			if (!aud2g) {
 				/* use the 2G tokens from 3G keys */
-				DBGP("vector [%u]: deriving 2G from 3G\n", i);
 				DBGVB(kc);
 				DBGVB(sres);
 				DBGVV("0x%x", auth_types);
@@ -152,7 +151,7 @@ int auc_compute_vectors(struct osmo_auth_vector *vec, unsigned int num_vec,
 			}
 			/* calculate 2G separately */
 
-			DBGP("vector [%u]: calculating 2G separately\n", i);
+			DBGP("vector [%u]: deriving 2G from 3G\n", i);
 
 			rc = osmo_auth_gen_vec(&vtmp, aud2g, rand);
 			if (rc < 0) {

src/ctrl.c

@@ -132,7 +132,7 @@ static void print_subscr_info(struct ctrl_cmd *cmd,
 			      struct hlr_subscriber *subscr)
 {
 	ctrl_cmd_reply_printf(cmd,
-		"\nid\t%" PRIu64
+		"\nid\t%"PRIu64
 		FMT_S
 		FMT_S
 		FMT_BOOL
@@ -189,7 +189,7 @@ static void print_subscr_info_aud3g(struct ctrl_cmd *cmd, struct osmo_sub_auth_d
 	ctrl_cmd_reply_printf(cmd,
 		"\naud3g.%s\t%s"
 		"\naud3g.ind_bitlen\t%u"
-		"\naud3g.sqn\t%" PRIu64
+		"\naud3g.sqn\t%"PRIu64
 		,
 		aud->u.umts.opc_is_op? "op" : "opc",
 		hexdump_buf(aud->u.umts.opc),
@@ -228,16 +228,10 @@ static int get_subscr_info_aud(struct ctrl_cmd *cmd, void *data)
 
 	rc = db_get_auth_data(hlr->dbc, imsi, &aud2g, &aud3g, NULL);
 
-	switch (rc) {
-	case 0:
-		break;
-	case -ENOENT:
-	case -ENOKEY:
-		/* No auth data found, tell the print*() functions about it. */
+	if (rc == -ENOENT) {
 		aud2g.algo = OSMO_AUTH_ALG_NONE;
 		aud3g.algo = OSMO_AUTH_ALG_NONE;
-		break;
-	default:
+	} else if (rc) {
 		cmd->reply = "Error retrieving authentication data.";
 		return CTRL_CMD_ERROR;
 	}
@@ -263,16 +257,10 @@ static int get_subscr_info_all(struct ctrl_cmd *cmd, void *data)
 
 	rc = db_get_auth_data(hlr->dbc, subscr.imsi, &aud2g, &aud3g, NULL);
 
-	switch (rc) {
-	case 0:
-		break;
-	case -ENOENT:
-	case -ENOKEY:
-		/* No auth data found, tell the print*() functions about it. */
+	if (rc == -ENOENT) {
 		aud2g.algo = OSMO_AUTH_ALG_NONE;
 		aud3g.algo = OSMO_AUTH_ALG_NONE;
-		break;
-	default:
+	} else if (rc) {
 		cmd->reply = "Error retrieving authentication data.";
 		return CTRL_CMD_ERROR;
 	}

src/db.c

@@ -25,10 +25,6 @@
 
 #include "logging.h"
 #include "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	2
 
 #define SEL_COLUMNS \
 	"id," \
@@ -43,8 +39,7 @@
 	"nam_ps," \
 	"lmsi," \
 	"ms_purged_cs," \
-	"ms_purged_ps," \
-	"last_lu_seen"
+	"ms_purged_ps"
 
 static const char *stmt_sql[] = {
 	[DB_STMT_SEL_BY_IMSI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imsi = ?",
@@ -66,7 +61,6 @@ static const char *stmt_sql[] = {
 	[DB_STMT_SUBSCR_CREATE] = "INSERT INTO subscriber (imsi) VALUES ($imsi)",
 	[DB_STMT_DEL_BY_ID] = "DELETE FROM subscriber WHERE id = $subscriber_id",
 	[DB_STMT_SET_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = $msisdn WHERE imsi = $imsi",
-	[DB_STMT_DELETE_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = NULL WHERE imsi = $imsi",
 	[DB_STMT_AUC_2G_INSERT] =
 		"INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki)"
 		" VALUES($subscriber_id, $algo_id_2g, $ki)",
@@ -75,13 +69,6 @@ static const char *stmt_sql[] = {
 		"INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, op, opc, ind_bitlen)"
 		" VALUES($subscriber_id, $algo_id_3g, $k, $op, $opc, $ind_bitlen)",
 	[DB_STMT_AUC_3G_DELETE] = "DELETE FROM auc_3g WHERE subscriber_id = $subscriber_id",
-	[DB_STMT_SET_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = datetime($val, 'unixepoch') WHERE id = $subscriber_id",
-	[DB_STMT_UPD_RAT_FLAG] = "INSERT OR REPLACE INTO subscriber_rat (subscriber_id, rat, allowed)"
-		" VALUES ($subscriber_id, $rat, $allowed)",
-	[DB_STMT_RAT_BY_ID] =
-		"SELECT rat, allowed"
-		" FROM subscriber_rat"
-		" WHERE subscriber_id = $subscriber_id",
 };
 
 static void sql3_error_log_cb(void *arg, int err_code, const char *msg)
@@ -111,8 +98,6 @@ static void sql3_sql_log_cb(void *arg, sqlite3 *s3, const char *stmt, int type)
 void db_remove_reset(sqlite3_stmt *stmt)
 {
 	sqlite3_clear_bindings(stmt);
-	/* sqlite3_reset() just repeats an error code already evaluated during sqlite3_step(). */
-	/* coverity[CHECKED_RETURN] */
 	sqlite3_reset(stmt);
 }
 
@@ -185,193 +170,21 @@ bool db_bind_int64(sqlite3_stmt *stmt, const char *param_name, int64_t nr)
 void db_close(struct db_context *dbc)
 {
 	unsigned int i;
-	int rc;
 
 	for (i = 0; i < ARRAY_SIZE(dbc->stmt); i++) {
 		/* it is ok to call finalize on NULL */
 		sqlite3_finalize(dbc->stmt[i]);
 	}
-
-	/* Ask sqlite3 to close DB */
-	rc = sqlite3_close(dbc->db);
-	if (rc != SQLITE_OK) { /* Make sure it's actually closed! */
-		LOGP(DDB, LOGL_ERROR, "Couldn't close database: (rc=%d) %s\n",
-			rc, sqlite3_errmsg(dbc->db));
-	}
-
+	sqlite3_close(dbc->db);
 	talloc_free(dbc);
 }
 
-static int db_bootstrap(struct db_context *dbc)
-{
-	int i;
-	for (i = 0; i < ARRAY_SIZE(stmt_bootstrap_sql); i++) {
-		int rc;
-		sqlite3_stmt *stmt;
-		rc = sqlite3_prepare_v2(dbc->db, stmt_bootstrap_sql[i], -1, &stmt, NULL);
-		if (rc != SQLITE_OK) {
-			LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", stmt_bootstrap_sql[i]);
-			return rc;
-		}
-
-		rc = sqlite3_step(stmt);
-		db_remove_reset(stmt);
-		sqlite3_finalize(stmt);
-		if (rc != SQLITE_DONE) {
-			LOGP(DDB, LOGL_ERROR, "Cannot bootstrap database: SQL error: (%d) %s,"
-			     " during stmt '%s'",
-			     rc, sqlite3_errmsg(dbc->db), stmt_bootstrap_sql[i]);
-			return rc;
-		}
-	}
-	return SQLITE_OK;
-}
-
-/* https://www.sqlite.org/fileformat2.html#storage_of_the_sql_database_schema */
-static bool db_table_exists(struct db_context *dbc, const char *table_name)
-{
-	const char *table_exists_sql = "SELECT name FROM sqlite_master WHERE type='table' AND name=?";
-	sqlite3_stmt *stmt;
-	int rc;
-
-	rc = sqlite3_prepare_v2(dbc->db, table_exists_sql, -1, &stmt, NULL);
-	if (rc != SQLITE_OK) {
-		LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", table_exists_sql);
-		return false;
-	}
-
-	if (!db_bind_text(stmt, NULL, table_name))
-		return false;
-
-	rc = sqlite3_step(stmt);
-	db_remove_reset(stmt);
-	sqlite3_finalize(stmt);
-	return (rc == SQLITE_ROW);
-}
-
-/* Indicate whether the database is initialized with tables for schema version 0.
- * We only check for the 'subscriber' table here because Neels said so. */
-static bool db_is_bootstrapped_v0(struct db_context *dbc)
-{
-	if (!db_table_exists(dbc, "subscriber")) {
-		LOGP(DDB, LOGL_DEBUG, "Table 'subscriber' not found in database '%s'\n", dbc->fname);
-		return false;
-	}
-
-	return true;
-}
-
-static int
-db_upgrade_v1(struct db_context *dbc)
-{
-	sqlite3_stmt *stmt;
-	int rc;
-	const char *update_stmt_sql = "ALTER TABLE subscriber ADD COLUMN last_lu_seen TIMESTAMP default NULL";
-	const char *set_schema_version_sql = "PRAGMA user_version = 1";
-
-	rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL);
-	if (rc != SQLITE_OK) {
-		LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", update_stmt_sql);
-		return rc;
-	}
-	rc = sqlite3_step(stmt);
-	db_remove_reset(stmt);
-	sqlite3_finalize(stmt);
-	if (rc != SQLITE_DONE) {
-		LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1);
-		return rc;
-	}
-
-	rc = sqlite3_prepare_v2(dbc->db, set_schema_version_sql, -1, &stmt, NULL);
-	if (rc != SQLITE_OK) {
-		LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", set_schema_version_sql);
-		return rc;
-	}
-	rc = sqlite3_step(stmt);
-	if (rc != SQLITE_DONE)
-		LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1);
-
-	db_remove_reset(stmt);
-	sqlite3_finalize(stmt);
-	return rc;
-}
-
-static int db_upgrade_v2(struct db_context *dbc)
-{
-	int i;
-	const char *stmts[] = {
-		"CREATE TABLE subscriber_rat",
-		"CREATE UNIQUE INDEX idx_subscr_rat_flag",
-		NULL
-	};
-	sqlite3_stmt *stmt = NULL;
-
-	for (i = 0; i < ARRAY_SIZE(stmts); i++) {
-		int rc;
-		int j;
-		const char *stmt_sql = NULL;
-
-		if (stmts[i] != NULL) {
-			for (j = 0; j < ARRAY_SIZE(stmt_bootstrap_sql); j++) {
-				if (strstr(stmt_bootstrap_sql[j], stmts[i])) {
-					/* make sure we have a unique match, hence also not break; here */
-					OSMO_ASSERT(!stmt_sql);
-					stmt_sql = stmt_bootstrap_sql[j];
-				}
-			}
-		} else
-			stmt_sql = "PRAGMA user_version = 2";
-		OSMO_ASSERT(stmt_sql);
-
-		rc = sqlite3_prepare_v2(dbc->db, stmt_sql, -1, &stmt, NULL);
-		if (rc != SQLITE_OK) {
-			LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", stmt_sql);
-			return rc;
-		}
-		rc = sqlite3_step(stmt);
-		db_remove_reset(stmt);
-		sqlite3_finalize(stmt);
-		if (rc != SQLITE_DONE) {
-			LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version 2: '%s'\n",
-			     stmt_sql);
-			return rc;
-		}
-	}
-
-	return SQLITE_DONE;
-}
-
-static int db_get_user_version(struct db_context *dbc)
-{
-	const char *user_version_sql = "PRAGMA user_version";
-	sqlite3_stmt *stmt;
-	int version, rc;
-
-	rc = sqlite3_prepare_v2(dbc->db, user_version_sql, -1, &stmt, NULL);
-	if (rc != SQLITE_OK) {
-		LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", user_version_sql);
-		return -1;
-	}
-	rc = sqlite3_step(stmt);
-	if (rc == SQLITE_ROW) {
-		version = sqlite3_column_int(stmt, 0);
-	} else {
-		LOGP(DDB, LOGL_ERROR, "SQL statement '%s' failed: %d\n", user_version_sql, rc);
-		version = -1;
-	}
-
-	db_remove_reset(stmt);
-	sqlite3_finalize(stmt);
-	return version;
-}
-
-struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logging, bool allow_upgrade)
+struct db_context *db_open(void *ctx, const char *fname)
 {
 	struct db_context *dbc = talloc_zero(ctx, struct db_context);
 	unsigned int i;
 	int rc;
 	bool has_sqlite_config_sqllog = false;
-	int version;
 
 	LOGP(DDB, LOGL_NOTICE, "using database: %s\n", fname);
 	LOGP(DDB, LOGL_INFO, "Compiled against SQLite3 lib version %s\n", SQLITE_VERSION);
@@ -388,11 +201,9 @@ struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logg
 			has_sqlite_config_sqllog = true;
 	}
 
-	if (enable_sqlite_logging) {
-		rc = sqlite3_config(SQLITE_CONFIG_LOG, sql3_error_log_cb, NULL);
-		if (rc != SQLITE_OK)
-			LOGP(DDB, LOGL_NOTICE, "Unable to set SQLite3 error log callback\n");
-	}
+	rc = sqlite3_config(SQLITE_CONFIG_LOG, sql3_error_log_cb, NULL);
+	if (rc != SQLITE_OK)
+		LOGP(DDB, LOGL_NOTICE, "Unable to set SQLite3 error log callback\n");
 
 	if (has_sqlite_config_sqllog) {
 		rc = sqlite3_config(SQLITE_CONFIG_SQLLOG, sql3_sql_log_cb, NULL);
@@ -420,70 +231,6 @@ struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logg
 		LOGP(DDB, LOGL_ERROR, "Unable to set Write-Ahead Logging: %s\n",
 			err_msg);
 
-	version = db_get_user_version(dbc);
-	if (version < 0) {
-		LOGP(DDB, LOGL_ERROR, "Unable to read user version number from database '%s'\n", dbc->fname);
-		goto out_free;
-	}
-
-	/* An empty database will always report version zero. */
-	if (version == 0 && !db_is_bootstrapped_v0(dbc)) {
-		LOGP(DDB, LOGL_NOTICE, "Missing database tables detected; Bootstrapping database '%s'\n", dbc->fname);
-		rc = db_bootstrap(dbc);
-		if (rc != SQLITE_OK) {
-			LOGP(DDB, LOGL_ERROR, "Failed to bootstrap DB: (rc=%d) %s\n",
-			     rc, sqlite3_errmsg(dbc->db));
-			goto out_free;
-		}
-		version = CURRENT_SCHEMA_VERSION;
-	}
-
-	LOGP(DDB, LOGL_NOTICE, "Database '%s' has HLR DB schema version %d\n", dbc->fname, version);
-
-	if (version < CURRENT_SCHEMA_VERSION && allow_upgrade) {
-		int orig_version = version;
-
-		switch (version) {
-		case 0:
-			rc = db_upgrade_v1(dbc);
-			if (rc != SQLITE_DONE) {
-				LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 1: (rc=%d) %s\n",
-				     rc, sqlite3_errmsg(dbc->db));
-				goto out_free;
-			}
-			version = 1;
-			/* fall through */
-		case 1:
-			rc = db_upgrade_v2(dbc);
-			if (rc != SQLITE_DONE) {
-				LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 2: (rc=%d) %s\n",
-				     rc, sqlite3_errmsg(dbc->db));
-				goto out_free;
-			}
-			version = 2;
-			/* fall through */
-		/* case N: ... */
-		default:
-			break;
-		}
-		LOGP(DDB, LOGL_NOTICE, "Database '%s' has been upgraded from HLR DB schema version %d to %d\n",
-		     dbc->fname, orig_version, version);
-	}
-
-	if (version != CURRENT_SCHEMA_VERSION) {
-		if (version < CURRENT_SCHEMA_VERSION) {
-			LOGP(DDB, LOGL_NOTICE, "HLR DB schema version %d is outdated\n", version);
-			if (!allow_upgrade) {
-				LOGP(DDB, LOGL_ERROR, "Not upgrading HLR database from schema version %d to %d; "
-				     "use the --db-upgrade option to allow HLR database upgrades\n",
-				     version, CURRENT_SCHEMA_VERSION);
-			}
-		} else
-			LOGP(DDB, LOGL_ERROR, "HLR DB schema version %d is unknown\n", version);
-
-		goto out_free;
-	}
-
 	/* prepare all SQL statements */
 	for (i = 0; i < ARRAY_SIZE(dbc->stmt); i++) {
 		rc = sqlite3_prepare_v2(dbc->db, stmt_sql[i], -1,

src/db.h

@@ -3,8 +3,6 @@
 #include <stdbool.h>
 #include <sqlite3.h>
 
-#include <osmocom/gsm/gsm_utils.h>
-
 struct hlr;
 
 enum stmt_idx {
@@ -22,14 +20,10 @@ enum stmt_idx {
 	DB_STMT_SUBSCR_CREATE,
 	DB_STMT_DEL_BY_ID,
 	DB_STMT_SET_MSISDN_BY_IMSI,
-	DB_STMT_DELETE_MSISDN_BY_IMSI,
 	DB_STMT_AUC_2G_INSERT,
 	DB_STMT_AUC_2G_DELETE,
 	DB_STMT_AUC_3G_INSERT,
 	DB_STMT_AUC_3G_DELETE,
-	DB_STMT_SET_LAST_LU_SEEN,
-	DB_STMT_UPD_RAT_FLAG,
-	DB_STMT_RAT_BY_ID,
 	_NUM_DB_STMT
 };
 
@@ -44,7 +38,7 @@ bool db_bind_text(sqlite3_stmt *stmt, const char *param_name, const char *text);
 bool db_bind_int(sqlite3_stmt *stmt, const char *param_name, int nr);
 bool db_bind_int64(sqlite3_stmt *stmt, const char *param_name, int64_t nr);
 void db_close(struct db_context *dbc);
-struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite3_logging, bool allow_upgrades);
+struct db_context *db_open(void *ctx, const char *fname);
 
 #include <osmocom/crypt/auth.h>
 
@@ -75,8 +69,8 @@ struct hlr_subscriber {
 	char		imsi[GSM23003_IMSI_MAX_DIGITS+1];
 	char		msisdn[GT_MAX_DIGITS+1];
 	/* imeisv? */
-	char		vlr_number[32];
-	char		sgsn_number[32];
+	char		vlr_number[GT_MAX_DIGITS+1];
+	char		sgsn_number[GT_MAX_DIGITS+1];
 	char		sgsn_address[GT_MAX_DIGITS+1];
 	/* ggsn number + address */
 	/* gmlc number */
@@ -88,19 +82,8 @@ struct hlr_subscriber {
 	uint32_t	lmsi;
 	bool		ms_purged_cs;
 	bool		ms_purged_ps;
-	time_t		last_lu_seen;
-	bool		rat_types[OSMO_RAT_COUNT];
 };
 
-static const struct hlr_subscriber hlr_subscriber_empty = {
-		.rat_types = { true, true, true },
-	};
-
-/* A format string for use with strptime(3). This format string is
- * used to parse the last_lu_seen column stored in the HLR database.
- * See https://sqlite.org/lang_datefunc.html, function datetime(). */
-#define DB_LAST_LU_SEEN_FMT "%Y-%m-%d %H:%M:%S"
-
 /* Like struct osmo_sub_auth_data, but the keys are in hexdump representation.
  * This is useful because SQLite requires them in hexdump format, and callers
  * like the VTY and CTRL interface also have them available as hexdump to begin
@@ -146,18 +129,3 @@ int db_subscr_purge(struct db_context *dbc, const char *by_imsi,
 		    bool purge_val, bool is_ps);
 
 int hlr_subscr_nam(struct hlr *hlr, struct hlr_subscriber *subscr, bool nam_val, bool is_ps);
-
-int db_subscr_set_rat_type_flag(struct db_context *dbc, int64_t subscr_id, enum osmo_rat_type rat, bool allowed);
-int db_subscr_get_rat_types(struct db_context *dbc, struct hlr_subscriber *subscr);
-int hlr_subscr_rat_flag(struct hlr *hlr, struct hlr_subscriber *subscr, enum osmo_rat_type rat, bool allowed);
-
-/*! 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*.
- * \param[in] idx   Index in stmt's returned columns.
- */
-#define copy_sqlite3_text_to_buf(buf, stmt, idx) \
-	do { \
-		const char *_txt = (const char *) sqlite3_column_text(stmt, idx); \
-		osmo_strlcpy(buf, _txt, sizeof(buf)); \
-	} while (0)

src/db_auc.c

@@ -49,7 +49,7 @@ int db_update_sqn(struct db_context *dbc, int64_t subscr_id, uint64_t new_sqn)
 	/* execute the statement */
 	rc = sqlite3_step(stmt);
 	if (rc != SQLITE_DONE) {
-		LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64
+		LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64
 		     ": SQL error: (%d) %s\n",
 		     subscr_id, rc, sqlite3_errmsg(dbc->db));
 		ret = -EIO;
@@ -59,11 +59,11 @@ int db_update_sqn(struct db_context *dbc, int64_t subscr_id, uint64_t new_sqn)
 	/* verify execution result */
 	rc = sqlite3_changes(dbc->db);
 	if (!rc) {
-		LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64
+		LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64
 		     ": no auc_3g entry for such subscriber\n", subscr_id);
 		ret = -ENOENT;
 	} else if (rc != 1) {
-		LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%" PRId64
+		LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%"PRId64
 		     ": SQL modified %d rows (expected 1)\n", subscr_id, rc);
 		ret = -EIO;
 	}
@@ -74,9 +74,7 @@ out:
 }
 
 /* obtain the authentication data for a given imsi
- * returns 0 for success, negative value on error:
- * -ENOENT if the IMSI is not known, -ENOKEY if the IMSI is known but has no auth data,
- * -EIO on db failure */
+ * returns -1 in case of error, 0 for unknown IMSI, 1 for success */
 int db_get_auth_data(struct db_context *dbc, const char *imsi,
 		     struct osmo_sub_auth_data *aud2g,
 		     struct osmo_sub_auth_data *aud3g,
@@ -165,16 +163,15 @@ int db_get_auth_data(struct db_context *dbc, const char *imsi,
 		LOGAUC(imsi, LOGL_DEBUG, "No 3G Auth Data\n");
 
 	if (aud2g->type == 0 && aud3g->type == 0)
-		ret = -ENOKEY;
+		ret = -ENOENT;
 
 out:
 	db_remove_reset(stmt);
 	return ret;
 }
 
-/* return number of vectors generated, negative value on error:
- * -ENOENT if the IMSI is not known, -ENOKEY if the IMSI is known but has no auth data,
- * -EIO on db failure */
+/* return -1 in case of error, 0 for unknown imsi, positive for number
+ * of vectors generated */
 int db_get_auc(struct db_context *dbc, const char *imsi,
 	       unsigned int auc_3g_ind, struct osmo_auth_vector *vec,
 	       unsigned int num_vec, const uint8_t *rand_auts,

src/db_hlr.c

@@ -17,15 +17,9 @@
  *
  */
 
-#define _POSIX_C_SOURCE 200809L /* for strptime(3) */
-/* These are needed as well due to the above _POSIX_C_SOURCE definition: */
-#define _DEFAULT_SOURCE		/* for struct timezone */
-#define _XOPEN_SOURCE		/* for clockid_t */
-
 #include <string.h>
 #include <errno.h>
 #include <inttypes.h>
-#include <time.h>
 
 #include <osmocom/core/utils.h>
 #include <osmocom/crypt/auth.h>
@@ -41,11 +35,14 @@
 
 #define LOGHLR(imsi, level, fmt, args ...)	LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args)
 
-/*! Add new subscriber record to the HLR database.
- * \param[in,out] dbc  database context.
- * \param[in] imsi  ASCII string of IMSI digits, is validated.
- * \returns 0 on success, -EINVAL on invalid IMSI, -EIO on database error.
- */
+#define SL3_TXT(x, stmt, idx) 					\
+	do {							\
+		const char *_txt = (const char *) sqlite3_column_text(stmt, idx);\
+		if (_txt)					\
+			strncpy(x, _txt, sizeof(x));		\
+		x[sizeof(x)-1] = '\0';				\
+	} while (0)
+
 int db_subscr_create(struct db_context *dbc, const char *imsi)
 {
 	sqlite3_stmt *stmt;
@@ -74,15 +71,6 @@ int db_subscr_create(struct db_context *dbc, const char *imsi)
 	return 0;
 }
 
-/*! Completely delete a subscriber record from the HLR database.
- * Also remove authentication data.
- * Future todo: also drop from all other database tables, which aren't used yet
- * at the time of writing this.
- * \param[in,out] dbc  database context.
- * \param[in] subscr_id  ID of the subscriber in the HLR db.
- * \returns if the subscriber was found and removed, -EIO on database error,
- *          -ENOENT if no such subscriber data exists.
- */
 int db_subscr_delete_by_id(struct db_context *dbc, int64_t subscr_id)
 {
 	int rc;
@@ -98,7 +86,7 @@ int db_subscr_delete_by_id(struct db_context *dbc, int64_t subscr_id)
 	rc = sqlite3_step(stmt);
 	if (rc != SQLITE_DONE) {
 		LOGP(DAUC, LOGL_ERROR,
-		       "Cannot delete subscriber ID=%" PRId64 ": SQL error: (%d) %s\n",
+		       "Cannot delete subscriber ID=%"PRId64": SQL error: (%d) %s\n",
 		       subscr_id, rc, sqlite3_errmsg(dbc->db));
 		db_remove_reset(stmt);
 		return -EIO;
@@ -107,11 +95,11 @@ int db_subscr_delete_by_id(struct db_context *dbc, int64_t subscr_id)
 	/* verify execution result */
 	rc = sqlite3_changes(dbc->db);
 	if (!rc) {
-		LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%" PRId64 "\n",
+		LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%"PRId64"\n",
 		     subscr_id);
 		ret = -ENOENT;
 	} else if (rc != 1) {
-		LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64
+		LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64
 		     ": SQL modified %d rows (expected 1)\n", subscr_id, rc);
 		ret = -EIO;
 	}
@@ -139,35 +127,25 @@ int db_subscr_delete_by_id(struct db_context *dbc, int64_t subscr_id)
 	return ret;
 }
 
-/*! Set a subscriber's MSISDN in the HLR database.
- * \param[in,out] dbc  database context.
- * \param[in] imsi  ASCII string of IMSI digits, or NULL to remove the MSISDN.
- * \param[in] msisdn  ASCII string of MSISDN digits.
- * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on
- *          database failure, -ENOENT if no such subscriber exists.
- */
 int db_subscr_update_msisdn_by_imsi(struct db_context *dbc, const char *imsi,
 				    const char *msisdn)
 {
 	int rc;
 	int ret = 0;
 
-	if (msisdn && !osmo_msisdn_str_valid(msisdn)) {
+	if (!osmo_msisdn_str_valid(msisdn)) {
 		LOGHLR(imsi, LOGL_ERROR,
 		       "Cannot update subscriber: invalid MSISDN: '%s'\n",
 		       msisdn);
 		return -EINVAL;
 	}
 
-	sqlite3_stmt *stmt = dbc->stmt[
-		msisdn ? DB_STMT_SET_MSISDN_BY_IMSI : DB_STMT_DELETE_MSISDN_BY_IMSI];
+	sqlite3_stmt *stmt = dbc->stmt[DB_STMT_SET_MSISDN_BY_IMSI];
 
 	if (!db_bind_text(stmt, "$imsi", imsi))
 		return -EIO;
-	if (msisdn) {
-		if (!db_bind_text(stmt, "$msisdn", msisdn))
-			return -EIO;
-	}
+	if (!db_bind_text(stmt, "$msisdn", msisdn))
+		return -EIO;
 
 	/* execute the statement */
 	rc = sqlite3_step(stmt);
@@ -197,17 +175,14 @@ out:
 
 }
 
-/*! Insert or update 2G or 3G authentication tokens in the database.
+/* Insert or update 2G or 3G authentication tokens in the database.
  * If aud->type is OSMO_AUTH_TYPE_GSM, the auc_2g table entry for the
  * subscriber will be added or modified; if aud->algo is OSMO_AUTH_ALG_NONE,
  * however, the auc_2g entry for the subscriber is deleted. If aud->type is
  * OSMO_AUTH_TYPE_UMTS, the auc_3g table is updated; again, if aud->algo is
  * OSMO_AUTH_ALG_NONE, the auc_3g entry is deleted.
- * \param[in,out] dbc  database context.
- * \param[in] subscr_id  DB ID of the subscriber.
- * \param[in] aud  Pointer to new auth data (in ASCII string form).
- * \returns 0 on success, -EINVAL for invalid aud, -ENOENT for unknown
- *          subscr_id, -EIO for database errors.
+ * Returns 0 if successful, -EINVAL for unknown aud->type, -ENOENT for unknown
+ * subscr_id, -EIO for SQL errors.
  */
 int db_subscr_update_aud_by_id(struct db_context *dbc, int64_t subscr_id,
 			       const struct sub_auth_data_str *aud)
@@ -321,7 +296,7 @@ int db_subscr_update_aud_by_id(struct db_context *dbc, int64_t subscr_id,
 		 * empty, and no entry is not an error then.*/
 		ret = -ENOENT;
 	else if (rc != 1) {
-		LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64
+		LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64
 		     " from %s: SQL modified %d rows (expected 1)\n",
 		     subscr_id, label, rc);
 		ret = -EIO;
@@ -392,8 +367,6 @@ static int db_sel(struct db_context *dbc, sqlite3_stmt *stmt, struct hlr_subscri
 {
 	int rc;
 	int ret = 0;
-	const char *last_lu_seen_str;
-	struct tm tm;
 
 	/* execute the statement */
 	rc = sqlite3_step(stmt);
@@ -409,16 +382,16 @@ static int db_sel(struct db_context *dbc, sqlite3_stmt *stmt, struct hlr_subscri
 	if (!subscr)
 		goto out;
 
-	*subscr = hlr_subscriber_empty;
+	*subscr = (struct hlr_subscriber){};
 
 	/* obtain the various columns */
 	subscr->id = sqlite3_column_int64(stmt, 0);
-	copy_sqlite3_text_to_buf(subscr->imsi, stmt, 1);
-	copy_sqlite3_text_to_buf(subscr->msisdn, stmt, 2);
+	SL3_TXT(subscr->imsi, stmt, 1);
+	SL3_TXT(subscr->msisdn, stmt, 2);
 	/* FIXME: These should all be BLOBs as they might contain NUL */
-	copy_sqlite3_text_to_buf(subscr->vlr_number, stmt, 3);
-	copy_sqlite3_text_to_buf(subscr->sgsn_number, stmt, 4);
-	copy_sqlite3_text_to_buf(subscr->sgsn_address, stmt, 5);
+	SL3_TXT(subscr->vlr_number, stmt, 3);
+	SL3_TXT(subscr->sgsn_number, stmt, 4);
+	SL3_TXT(subscr->sgsn_address, stmt, 5);
 	subscr->periodic_lu_timer = sqlite3_column_int(stmt, 6);
 	subscr->periodic_rau_tau_timer = sqlite3_column_int(stmt, 7);
 	subscr->nam_cs = sqlite3_column_int(stmt, 8);
@@ -426,27 +399,10 @@ static int db_sel(struct db_context *dbc, sqlite3_stmt *stmt, struct hlr_subscri
 	subscr->lmsi = sqlite3_column_int(stmt, 10);
 	subscr->ms_purged_cs = sqlite3_column_int(stmt, 11);
 	subscr->ms_purged_ps = sqlite3_column_int(stmt, 12);
-	last_lu_seen_str = (const char *)sqlite3_column_text(stmt, 13);
-	if (last_lu_seen_str && last_lu_seen_str[0] != '\0') {
-		if (strptime(last_lu_seen_str, DB_LAST_LU_SEEN_FMT, &tm) == NULL) {
-			LOGP(DAUC, LOGL_ERROR, "Cannot parse last LU timestamp '%s' of subscriber with IMSI='%s': %s\n",
-			     last_lu_seen_str, subscr->imsi, strerror(errno));
-		} else {
-			subscr->last_lu_seen = mktime(&tm);
-			if (subscr->last_lu_seen == -1) {
-				LOGP(DAUC, LOGL_ERROR, "Cannot convert LU timestamp '%s' to time_t: %s\n",
-				     last_lu_seen_str, strerror(errno));
-				subscr->last_lu_seen = 0;
-			}
-		}
-	}
 
 out:
 	db_remove_reset(stmt);
 
-	if (ret == 0)
-		db_subscr_get_rat_types(dbc, subscr);
-
 	switch (ret) {
 	case 0:
 		*err = NULL;
@@ -461,13 +417,6 @@ out:
 	return ret;
 }
 
-/*! Retrieve subscriber data from the HLR database.
- * \param[in,out] dbc  database context.
- * \param[in] imsi  ASCII string of IMSI digits.
- * \param[out] subscr  place retrieved data in this struct.
- * \returns 0 on success, -ENOENT if no such subscriber was found, -EIO on
- *          database error.
- */
 int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi,
 			  struct hlr_subscriber *subscr)
 {
@@ -485,13 +434,6 @@ int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi,
 	return rc;
 }
 
-/*! Retrieve subscriber data from the HLR database.
- * \param[in,out] dbc  database context.
- * \param[in] msisdn  ASCII string of MSISDN digits.
- * \param[out] subscr  place retrieved data in this struct.
- * \returns 0 on success, -ENOENT if no such subscriber was found, -EIO on
- *          database error.
- */
 int db_subscr_get_by_msisdn(struct db_context *dbc, const char *msisdn,
 			    struct hlr_subscriber *subscr)
 {
@@ -509,13 +451,6 @@ int db_subscr_get_by_msisdn(struct db_context *dbc, const char *msisdn,
 	return rc;
 }
 
-/*! Retrieve subscriber data from the HLR database.
- * \param[in,out] dbc  database context.
- * \param[in] id  ID of the subscriber in the HLR db.
- * \param[out] subscr  place retrieved data in this struct.
- * \returns 0 on success, -ENOENT if no such subscriber was found, -EIO on
- *          database error.
- */
 int db_subscr_get_by_id(struct db_context *dbc, int64_t id,
 			struct hlr_subscriber *subscr)
 {
@@ -528,19 +463,17 @@ int db_subscr_get_by_id(struct db_context *dbc, int64_t id,
 
 	rc = db_sel(dbc, stmt, subscr, &err);
 	if (rc)
-		LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%" PRId64 ": %s\n",
+		LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%"PRId64": %s\n",
 		     id, err);
 	return rc;
 }
 
-/*! You should use hlr_subscr_nam() instead; enable or disable PS or CS for a
- * subscriber without notifying GSUP clients.
- * \param[in,out] dbc  database context.
- * \param[in] imsi  ASCII string of IMSI digits.
- * \param[in] nam_val True to enable CS/PS, false to disable.
- * \param[in] is_ps  when true, set nam_ps, else set nam_cs.
- * \returns 0 on success, -ENOENT when the given IMSI does not exist, -EIO on
- *          database errors.
+/* Enable or disable PS or CS for a subscriber.
+ * For the subscriber with the given imsi, set nam_ps (when is_ps == true) or
+ * nam_cs (when is_ps == false) to nam_val in the database.
+ * Returns 0 on success, -ENOENT when the given IMSI does not exist, -EINVAL if
+ * the SQL statement could not be composed, -ENOEXEC if running the SQL
+ * statement failed, -EIO if the amount of rows modified is unexpected.
  */
 int db_subscr_nam(struct db_context *dbc, const char *imsi, bool nam_val, bool is_ps)
 {
@@ -589,20 +522,11 @@ out:
 	return ret;
 }
 
-/*! Record a Location Updating in the database.
- * \param[in,out] dbc  database context.
- * \param[in] subscr_id  ID of the subscriber in the HLR db.
- * \param[in] vlr_or_sgsn_number  ASCII string of identifier digits.
- * \param[in] is_ps  when true, set sgsn_number, else set vlr_number.
- * \returns 0 on success, -ENOENT when the given subscriber does not exist,
- *         -EIO on database errors.
- */
 int db_subscr_lu(struct db_context *dbc, int64_t subscr_id,
 		 const char *vlr_or_sgsn_number, bool is_ps)
 {
 	sqlite3_stmt *stmt;
 	int rc, ret = 0;
-	struct timespec localtime;
 
 	stmt = dbc->stmt[is_ps ? DB_STMT_UPD_SGSN_BY_ID
 			       : DB_STMT_UPD_VLR_BY_ID];
@@ -616,7 +540,7 @@ int db_subscr_lu(struct db_context *dbc, int64_t subscr_id,
 	/* execute the statement */
 	rc = sqlite3_step(stmt);
 	if (rc != SQLITE_DONE) {
-		LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64 ": SQL Error: %s\n",
+		LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64": SQL Error: %s\n",
 		     is_ps? "SGSN" : "VLR", subscr_id, sqlite3_errmsg(dbc->db));
 		ret = -EIO;
 		goto out;
@@ -625,71 +549,22 @@ int db_subscr_lu(struct db_context *dbc, int64_t subscr_id,
 	/* verify execution result */
 	rc = sqlite3_changes(dbc->db);
 	if (!rc) {
-		LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%" PRId64
+		LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%"PRId64
 		     ": no such subscriber\n",
 		     is_ps? "SGSN" : "VLR", subscr_id);
 		ret = -ENOENT;
-		goto out;
 	} else if (rc != 1) {
-		LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64
+		LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64
 		       ": SQL modified %d rows (expected 1)\n",
 		       is_ps? "SGSN" : "VLR", subscr_id, rc);
 		ret = -EIO;
-		goto out;
 	}
 
-	db_remove_reset(stmt);
-
-	if (osmo_clock_gettime(CLOCK_REALTIME, &localtime) != 0) {
-		LOGP(DAUC, LOGL_ERROR, "Cannot get the current time: (%d) %s\n", errno, strerror(errno));
-		ret = -errno;
-		goto out;
-	}
-
-	stmt = dbc->stmt[DB_STMT_SET_LAST_LU_SEEN];
-
-	if (!db_bind_int64(stmt, "$subscriber_id", subscr_id))
-		return -EIO;
-	/* The timestamp will be converted to UTC by SQLite. */
-	if (!db_bind_int64(stmt, "$val", (int64_t)localtime.tv_sec)) {
-		ret = -EIO;
-		goto out;
-	}
-
-	rc = sqlite3_step(stmt);
-	if (rc != SQLITE_DONE) {
-		LOGP(DAUC, LOGL_ERROR,
-		       "Cannot update LU timestamp for subscriber ID=%" PRId64 ": SQL error: (%d) %s\n",
-		       subscr_id, rc, sqlite3_errmsg(dbc->db));
-		ret = -EIO;
-		goto out;
-	}
-
-	/* verify execution result */
-	rc = sqlite3_changes(dbc->db);
-	if (!rc) {
-		LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%" PRId64
-		     ": no such subscriber\n", subscr_id);
-		ret = -ENOENT;
-		goto out;
-	} else if (rc != 1) {
-		LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%" PRId64
-		     ": SQL modified %d rows (expected 1)\n", subscr_id, rc);
-		ret = -EIO;
-	}
 out:
 	db_remove_reset(stmt);
 	return ret;
 }
 
-/*! Set the ms_purged_cs or ms_purged_ps values in the database.
- * \param[in,out] dbc  database context.
- * \param[in] by_imsi  ASCII string of IMSI digits.
- * \param[in] purge_val  true to purge, false to un-purge.
- * \param[in] is_ps  when true, set ms_purged_ps, else set ms_purged_cs.
- * \returns 0 on success, -ENOENT when the given IMSI does not exist, -EIO on
- *          database errors.
- */
 int db_subscr_purge(struct db_context *dbc, const char *by_imsi,
 		    bool purge_val, bool is_ps)
 {
@@ -739,10 +614,10 @@ out:
 }
 
 /*! Update nam_cs/nam_ps in the db and trigger notifications to GSUP clients.
- * \param[in,out] hlr  Global hlr context.
- * \param[in] subscr   Subscriber from a fresh db_subscr_get_by_*() call.
- * \param[in] nam_val  True to enable CS/PS, false to disable.
- * \param[in] is_ps    True to enable/disable PS, false for CS.
+ * \param hlr     Global hlr context.
+ * \param subscr  Subscriber from a fresh db_subscr_get_by_*() call.
+ * \param nam_val True to enable CS/PS, false to disable.
+ * \param is_ps   True to enable/disable PS, false for CS.
  * \returns 0 on success, ENOEXEC if there is no need to change, a negative
  *          value on error.
  */
@@ -785,119 +660,3 @@ int hlr_subscr_nam(struct hlr *hlr, struct hlr_subscriber *subscr, bool nam_val,
 	}
 	return 0;
 }
-
-int db_subscr_set_rat_type_flag(struct db_context *dbc, int64_t subscr_id, enum osmo_rat_type rat, bool allowed)
-{
-	int rc;
-	int ret = 0;
-	sqlite3_stmt *stmt = dbc->stmt[DB_STMT_UPD_RAT_FLAG];
-
-	if (!db_bind_int64(stmt, "$subscriber_id", subscr_id))
-		return -EIO;
-
-	OSMO_ASSERT(rat >= 0 && rat < OSMO_RAT_COUNT);
-	if (!db_bind_text(stmt, "$rat", osmo_rat_type_name(rat)))
-		return -EIO;
-
-	if (!db_bind_int(stmt, "$allowed", allowed ? 1 : 0))
-		return -EIO;
-
-	/* execute the statement */
-	rc = sqlite3_step(stmt);
-	if (rc != SQLITE_DONE) {
-		LOGP(DDB, LOGL_ERROR, "%s %s: SQL error: %s\n",
-		     allowed ? "enable" : "disable", osmo_rat_type_name(rat),
-		     sqlite3_errmsg(dbc->db));
-		ret = -EIO;
-		goto out;
-	}
-
-	/* verify execution result */
-	rc = sqlite3_changes(dbc->db);
-	if (!rc) {
-		LOGP(DDB, LOGL_ERROR, "Cannot %s %s: no such subscriber: ID=%" PRIu64 "\n",
-		     allowed ? "enable" : "disable", osmo_rat_type_name(rat),
-		     subscr_id);
-		ret = -ENOENT;
-		goto out;
-	} else if (rc != 1) {
-		LOGP(DDB, LOGL_ERROR, "%s %s: SQL modified %d rows (expected 1)\n",
-		     allowed ? "enable" : "disable", osmo_rat_type_name(rat),
-		     rc);
-		ret = -EIO;
-	}
-
-out:
-	db_remove_reset(stmt);
-	return ret;
-}
-
-int db_subscr_get_rat_types(struct db_context *dbc, struct hlr_subscriber *subscr)
-{
-	int rc;
-	int ret = 0;
-	int i;
-	sqlite3_stmt *stmt = dbc->stmt[DB_STMT_RAT_BY_ID];
-
-	if (!db_bind_int64(stmt, "$subscriber_id", subscr->id))
-		return -EIO;
-
-	for (i = 0; i < OSMO_RAT_COUNT; i++)
-		subscr->rat_types[i] = true;
-
-	/* execute the statement */
-	while (1) {
-		enum osmo_rat_type rat;
-		bool allowed;
-
-		rc = sqlite3_step(stmt);
-
-		if (rc == SQLITE_DONE)
-			break;
-		if (rc != SQLITE_ROW)
-			return -rc;
-
-		rc = get_string_value(osmo_rat_type_names, (const char*)sqlite3_column_text(stmt, 0));
-		if (rc == -EINVAL) {
-			ret = -EINVAL;
-			goto out;
-		}
-		if (rc <= 0 || rc >= OSMO_RAT_COUNT) {
-			ret = -EINVAL;
-			goto out;
-		}
-		rat = rc;
-
-		allowed = sqlite3_column_int(stmt, 1);
-
-		subscr->rat_types[rat] = allowed;
-		LOGP(DAUC, LOGL_DEBUG, "db: imsi='%s' %s %s\n",
-		     subscr->imsi, osmo_rat_type_name(rat), allowed ? "allowed" : "forbidden");
-	}
-
-out:
-	db_remove_reset(stmt);
-	return ret;
-}
-
-int hlr_subscr_rat_flag(struct hlr *hlr, struct hlr_subscriber *subscr, enum osmo_rat_type rat, bool allowed)
-{
-	int rc;
-	OSMO_ASSERT(rat >= 0 && rat < OSMO_RAT_COUNT);
-
-	db_subscr_get_rat_types(hlr->dbc, subscr);
-
-	if (subscr->rat_types[rat] == allowed) {
-		LOGHLR(subscr->imsi, LOGL_DEBUG, "Already has the requested value when asked to %s %s\n",
-		       allowed ? "enable" : "disable", osmo_rat_type_name(rat));
-		return -ENOEXEC;
-	}
-
-	rc = db_subscr_set_rat_type_flag(hlr->dbc, subscr->id, rat, allowed);
-	if (rc)
-		return rc > 0? -rc : rc;
-
-	/* FIXME: If we're disabling, send message to VLR to detach subscriber */
-
-	return 0;
-}

src/db_sql2c.sed

@@ -1,25 +0,0 @@
-# Input to this are sql/*.sql files.
-#
-# We want each SQL statement line wrapped in "...\n", and each end (";") to
-# become a comma:
-#
-#   SOME SQL COMMAND (
-#     that may span )
-#   MULTIPLE LINES;
-#   MORE;
-#
-# -->
-#
-#   "SOME SQL COMMAND (\n"
-#   "  that may span )\n"
-#   "MULTIPLE LINES\n",   <--note the comma here
-#   "MORE\n",
-#
-# just replacing ';' with '\n,' won't work, since sed is bad in printing
-# multiple lines. Also, how to input newlines to sed is not portable across
-# platforms.
-
-# Match excluding a trailing ';' as \1, keep any trailing ';' in \2
-s/^\(.*[^;]\)\(;\|\)$/"\1\\n"\2/
-# Replace trailing ';' as ','
-s/;$/,/

src/db_test.c

@@ -0,0 +1,87 @@
+#include <string.h>
+
+#include <osmocom/core/utils.h>
+#include <osmocom/core/application.h>
+
+#include "db.h"
+#include "hlr.h"
+#include "rand.h"
+#include "logging.h"
+
+static struct hlr *g_hlr;
+
+static int test(const char *imsi, struct db_context *dbc)
+{
+	struct osmo_auth_vector vec[3];
+	int rc, i;
+
+	/* initialize all vectors with a known token pattern */
+	memset(vec, 0x55, sizeof(vec));
+	for (i = 0; i < ARRAY_SIZE(vec); i++)
+		vec[i].res_len = 0;
+
+	rc = db_get_auc(dbc, imsi, 0, vec, ARRAY_SIZE(vec), NULL, NULL);
+	if (rc <= 0) {
+		LOGP(DMAIN, LOGL_ERROR, "Cannot obtain auth tuples for '%s'\n", imsi);
+		return rc;
+	}
+	LOGP(DMAIN, LOGL_INFO, "Obtained %u tuples for subscriber IMSI %s\n",
+		rc, imsi);
+
+	for (i = 0; i < rc; i++) {
+		struct osmo_auth_vector *v = vec + i;
+		LOGP(DMAIN, LOGL_DEBUG, "Tuple %u, auth_types=0x%x\n", i, v->auth_types);
+		LOGP(DMAIN, LOGL_DEBUG, "RAND=%s\n", osmo_hexdump_nospc(v->rand, sizeof(v->rand)));
+		LOGP(DMAIN, LOGL_DEBUG, "AUTN=%s\n", osmo_hexdump_nospc(v->autn, sizeof(v->autn)));
+		LOGP(DMAIN, LOGL_DEBUG, "CK=%s\n", osmo_hexdump_nospc(v->ck, sizeof(v->ck)));
+		LOGP(DMAIN, LOGL_DEBUG, "IK=%s\n", osmo_hexdump_nospc(v->ik, sizeof(v->ik)));
+		LOGP(DMAIN, LOGL_DEBUG, "RES=%s\n", osmo_hexdump_nospc(v->res, v->res_len));
+		LOGP(DMAIN, LOGL_DEBUG, "Kc=%s\n", osmo_hexdump_nospc(v->kc, sizeof(v->kc)));
+		LOGP(DMAIN, LOGL_DEBUG, "SRES=%s\n", osmo_hexdump_nospc(v->sres, sizeof(v->sres)));
+	}
+
+	return rc;
+}
+
+int main(int argc, char **argv)
+{
+	int rc;
+
+	g_hlr = talloc_zero(NULL, struct hlr);
+
+	rc = osmo_init_logging(&hlr_log_info);
+	if (rc < 0) {
+		fprintf(stderr, "Error initializing logging\n");
+		exit(1);
+	}
+	LOGP(DMAIN, LOGL_NOTICE, "hlr starting\n");
+
+	rc = rand_init();
+	if (rc < 0) {
+		LOGP(DMAIN, LOGL_ERROR, "Error initializing random source\n");
+		exit(1);
+	}
+
+	g_hlr->dbc = db_open(NULL, "hlr.db");
+	if (!g_hlr->dbc) {
+		LOGP(DMAIN, LOGL_ERROR, "Error opening database\n");
+		exit(1);
+	}
+
+	/* non-existing subscriber */
+	rc = test("901990123456789", g_hlr->dbc);
+	/* 2G only AUC data (COMP128v1 / MILENAGE) */
+	rc = test("901990000000001", g_hlr->dbc);
+	/* 2G + 3G AUC data (COMP128v1 / MILENAGE) */
+	rc = test("901990000000002", g_hlr->dbc);
+	/* 3G AUC data (MILENAGE) */
+	rc = test("901990000000003", g_hlr->dbc);
+
+	LOGP(DMAIN, LOGL_NOTICE, "Exiting\n");
+
+	db_close(g_hlr->dbc);
+
+	log_fini();
+
+	exit(0);
+}

src/dbd_decode_binary.c

@@ -1,42 +0,0 @@
-/* This function is blatantly copied from libdbi, from
- * https://sourceforge.net/p/libdbi/libdbi/ci/master/tree/src/dbd_helper.c
- * to save having to depend on the entire libdbi just for KI BLOB decoding.
- */
-
-/*
- * libdbi - database independent abstraction layer for C.
- * Copyright (C) 2001-2003, David Parker and Mark Tobenkin.
- * http://libdbi.sourceforge.net
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- * $Id: dbd_helper.c,v 1.44 2011/08/09 11:14:14 mhoenicka Exp $
- */
-
-#include <sys/types.h>
-
-size_t _dbd_decode_binary(const unsigned char *in, unsigned char *out){
-  int i, e;
-  unsigned char c;
-  e = *(in++);
-  i = 0;
-  while( (c = *(in++))!=0 ){
-    if( c==1 ){
-      c = *(in++) - 1;
-    }
-    out[i++] = c + e;
-  }
-  return (size_t)i;
-}

src/gsup_router.c

@@ -23,7 +23,6 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/talloc.h>
 
-#include "logging.h"
 #include "gsup_server.h"
 
 struct gsup_route {
@@ -61,8 +60,6 @@ int gsup_route_add(struct osmo_gsup_conn *conn, const uint8_t *addr, size_t addr
 	if (!gr)
 		return -ENOMEM;
 
-	LOGP(DMAIN, LOGL_INFO, "Adding GSUP route for %s\n", addr);
-
 	gr->addr = talloc_memdup(gr, addr, addrlen);
 	gr->conn = conn;
 	llist_add_tail(&gr->list, &conn->server->routes);
@@ -78,8 +75,6 @@ int gsup_route_del_conn(struct osmo_gsup_conn *conn)
 
 	llist_for_each_entry_safe(gr, gr2, &conn->server->routes, list) {
 		if (gr->conn == conn) {
-			LOGP(DMAIN, LOGL_INFO, "Removing GSUP route for %s (GSUP disconnect)\n",
-			     gr->addr);
 			llist_del(&gr->list);
 			talloc_free(gr);
 			num_deleted++;

src/gsup_router.h

@@ -1,8 +1,3 @@
-#pragma once
-
-#include <stdint.h>
-#include "gsup_server.h"
-
 struct osmo_gsup_conn *gsup_route_find(struct osmo_gsup_server *gs,
 					const uint8_t *addr, size_t addrlen);
 
@@ -11,7 +6,3 @@ int gsup_route_add(struct osmo_gsup_conn *conn, const uint8_t *addr, size_t addr
 
 /* delete all routes for the given connection */
 int gsup_route_del_conn(struct osmo_gsup_conn *conn);
-
-int osmo_gsup_addr_send(struct osmo_gsup_server *gs,
-			const uint8_t *addr, size_t addrlen,
-			struct msgb *msg);

src/gsup_send.c

@@ -1,45 +0,0 @@
-/* (C) 2018 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/* This is kept separate to be able to override the actual sending functions from unit tests. */
-
-#include <errno.h>
-
-#include "gsup_server.h"
-#include "gsup_router.h"
-
-#include <osmocom/core/logging.h>
-
-/* Send a msgb to a given address using routing */
-int osmo_gsup_addr_send(struct osmo_gsup_server *gs,
-			const uint8_t *addr, size_t addrlen,
-			struct msgb *msg)
-{
-	struct osmo_gsup_conn *conn;
-
-	conn = gsup_route_find(gs, addr, addrlen);
-	if (!conn) {
-		DEBUGP(DLGSUP, "Cannot find route for addr %s\n", addr);
-		msgb_free(msg);
-		return -ENODEV;
-	}
-
-	return osmo_gsup_conn_send(conn, msg);
-}
-

src/gsup_server.c

@@ -24,8 +24,6 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/abis/ipa.h>
 #include <osmocom/abis/ipaccess.h>
-#include <osmocom/gsm/gsm48_ie.h>
-#include <osmocom/gsm/apn.h>
 
 #include "gsup_server.h"
 #include "gsup_router.h"
@@ -292,7 +290,7 @@ failed:
 struct osmo_gsup_server *
 osmo_gsup_server_create(void *ctx, const char *ip_addr, uint16_t tcp_port,
 			osmo_gsup_read_cb_t read_cb,
-			struct llist_head *lu_op_lst, void *priv)
+			struct llist_head *lu_op_lst)
 {
 	struct osmo_gsup_server *gsups;
 	int rc;
@@ -312,7 +310,6 @@ osmo_gsup_server_create(void *ctx, const char *ip_addr, uint16_t tcp_port,
 		goto failed;
 
 	gsups->read_cb = read_cb;
-	gsups->priv = priv;
 
 	rc = ipa_server_link_open(gsups->link);
 	if (rc < 0)
@@ -336,79 +333,3 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups)
 	}
 	talloc_free(gsups);
 }
-
-/* Set GSUP message's pdp_infos[0] to a wildcard APN.
- * Use the provided apn_buf to store the produced APN data. This must remain valid until
- * osmo_gsup_encode() is done. Return 0 if an entry was added, -ENOMEM if the provided buffer is too
- * small. */
-int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup,
-				     uint8_t *apn_buf, size_t apn_buf_size)
-{
-	int l;
-
-	l = osmo_apn_from_str(apn_buf, apn_buf_size, "*");
-	if (l <= 0)
-		return -ENOMEM;
-
-	gsup->pdp_infos[0].apn_enc = apn_buf;
-	gsup->pdp_infos[0].apn_enc_len = l;
-	gsup->pdp_infos[0].have_info = 1;
-	gsup->num_pdp_infos = 1;
-	/* FIXME: use real value: */
-	gsup->pdp_infos[0].context_id = 1;
-
-	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
- * must be allocated by the caller and should have the same lifetime as the gsup parameter.
- *
- * \param[out] gsup  The gsup message to populate.
- * \param[in] imsi  The subscriber's IMSI.
- * \param[in] msisdn The subscriber's MSISDN.
- * \param[out] msisdn_enc A buffer large enough to store the MSISDN in encoded form.
- * \param[in] msisdn_enc_size Size of the buffer (must be >= OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN).
- * \param[out] apn_buf A buffer large enough to store an APN (required if cn_domain is OSMO_GSUP_CN_DOMAIN_PS).
- * \param[in] apn_buf_size Size of APN buffer (must be >= APN_MAXLEN).
- * \param[in] cn_domain The CN Domain of the subscriber connection.
- * \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)
-{
-	int len;
-
-	OSMO_ASSERT(gsup);
-
-	gsup->message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST;
-	osmo_strlcpy(gsup->imsi, imsi, sizeof(gsup->imsi));
-
-	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;
-
-	#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);
-	}
-
-	return 0;
-}

src/gsup_server.h

@@ -4,11 +4,6 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/abis/ipa.h>
 #include <osmocom/abis/ipaccess.h>
-#include <osmocom/gsm/gsup.h>
-
-#ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN
-#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN	43 /* TS 24.008 10.5.4.7 */
-#endif
 
 struct osmo_gsup_conn;
 
@@ -16,9 +11,6 @@ struct osmo_gsup_conn;
 typedef int (*osmo_gsup_read_cb_t)(struct osmo_gsup_conn *conn, struct msgb *msg);
 
 struct osmo_gsup_server {
-	/* private data of the application/user */
-	void *priv;
-
 	/* list of osmo_gsup_conn */
 	struct llist_head clients;
 
@@ -41,10 +33,6 @@ struct osmo_gsup_conn {
 	struct tlv_parsed ccm;
 
 	unsigned int auc_3g_ind; /*!< IND index used for UMTS AKA SQN */
-
-	/* Set when Location Update is received: */
-	bool supports_cs; /* client supports OSMO_GSUP_CN_DOMAIN_CS */
-	bool supports_ps; /* client supports OSMO_GSUP_CN_DOMAIN_PS */
 };
 
 
@@ -56,14 +44,7 @@ struct osmo_gsup_server *osmo_gsup_server_create(void *ctx,
 						 const char *ip_addr,
 						 uint16_t tcp_port,
 						 osmo_gsup_read_cb_t read_cb,
-						 struct llist_head *lu_op_lst,
-						 void *priv);
+						 struct llist_head *lu_op_lst);
 
 void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups);
 
-int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup,
-				     uint8_t *apn_buf, size_t apn_buf_size);
-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);

src/gsupclient/Makefile.am

@@ -1,20 +0,0 @@
-# This is _NOT_ the library release version, it's an API version.
-# Please read chapter "Library interface versions" of the libtool documentation
-# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=0:0:0
-
-AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include \
-	    $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-
-lib_LTLIBRARIES = libosmo-gsup-client.la
-
-libosmo_gsup_client_la_SOURCES = gsup_client.c
-
-libosmo_gsup_client_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
-libosmo_gsup_client_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOABIS_LIBS)
-
-noinst_PROGRAMS = gsup-test-client
-
-gsup_test_client_SOURCES = gsup_test_client.c
-gsup_test_client_LDADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
-			 libosmo-gsup-client.la

src/gsupclient/gsup_client.c

@@ -1,402 +0,0 @@
-/* Generic Subscriber Update Protocol client */
-
-/* (C) 2014-2016 by Sysmocom s.f.m.c. GmbH
- * All Rights Reserved
- *
- * Author: Jacob Erlbeck
- * Author: Neels Hofmeyr
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <osmocom/gsupclient/gsup_client.h>
-
-#include <osmocom/abis/ipa.h>
-#include <osmocom/gsm/oap_client.h>
-#include <osmocom/gsm/protocol/ipaccess.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/logging.h>
-
-#include <errno.h>
-#include <string.h>
-
-static void start_test_procedure(struct osmo_gsup_client *gsupc);
-
-static void gsup_client_send_ping(struct osmo_gsup_client *gsupc)
-{
-	struct msgb *msg = osmo_gsup_client_msgb_alloc();
-
-	msg->l2h = msgb_put(msg, 1);
-	msg->l2h[0] = IPAC_MSGT_PING;
-	ipa_msg_push_header(msg, IPAC_PROTO_IPACCESS);
-	ipa_client_conn_send(gsupc->link, msg);
-}
-
-static int gsup_client_connect(struct osmo_gsup_client *gsupc)
-{
-	int rc;
-
-	if (gsupc->is_connected)
-		return 0;
-
-	if (osmo_timer_pending(&gsupc->connect_timer)) {
-		LOGP(DLGSUP, LOGL_DEBUG,
-		     "GSUP connect: connect timer already running\n");
-		osmo_timer_del(&gsupc->connect_timer);
-	}
-
-	if (osmo_timer_pending(&gsupc->ping_timer)) {
-		LOGP(DLGSUP, LOGL_DEBUG,
-		     "GSUP connect: ping timer already running\n");
-		osmo_timer_del(&gsupc->ping_timer);
-	}
-
-	if (ipa_client_conn_clear_queue(gsupc->link) > 0)
-		LOGP(DLGSUP, LOGL_DEBUG, "GSUP connect: discarded stored messages\n");
-
-	rc = ipa_client_conn_open(gsupc->link);
-
-	if (rc >= 0) {
-		LOGP(DLGSUP, LOGL_NOTICE, "GSUP connecting to %s:%d\n",
-		     gsupc->link->addr, gsupc->link->port);
-		return 0;
-	}
-
-	LOGP(DLGSUP, LOGL_ERROR, "GSUP failed to connect to %s:%d: %s\n",
-	     gsupc->link->addr, gsupc->link->port, strerror(-rc));
-
-	if (rc == -EBADF || rc == -ENOTSOCK || rc == -EAFNOSUPPORT ||
-	    rc == -EINVAL)
-		return rc;
-
-	osmo_timer_schedule(&gsupc->connect_timer,
-			    OSMO_GSUP_CLIENT_RECONNECT_INTERVAL, 0);
-
-	LOGP(DLGSUP, LOGL_INFO, "Scheduled timer to retry GSUP connect to %s:%d\n",
-	     gsupc->link->addr, gsupc->link->port);
-
-	return 0;
-}
-
-static void connect_timer_cb(void *gsupc_)
-{
-	struct osmo_gsup_client *gsupc = gsupc_;
-
-	if (gsupc->is_connected)
-		return;
-
-	gsup_client_connect(gsupc);
-}
-
-static void client_send(struct osmo_gsup_client *gsupc, int proto_ext,
-			struct msgb *msg_tx)
-{
-	ipa_prepend_header_ext(msg_tx, proto_ext);
-	ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO);
-	ipa_client_conn_send(gsupc->link, msg_tx);
-	/* msg_tx is now queued and will be freed. */
-}
-
-static void gsup_client_oap_register(struct osmo_gsup_client *gsupc)
-{
-	struct msgb *msg_tx;
-	int rc;
-	rc = osmo_oap_client_register(&gsupc->oap_state, &msg_tx);
-
-	if ((rc < 0) || (!msg_tx)) {
-		LOGP(DLGSUP, LOGL_ERROR, "GSUP OAP set up, but cannot register.\n");
-		return;
-	}
-
-	client_send(gsupc, IPAC_PROTO_EXT_OAP, msg_tx);
-}
-
-static void gsup_client_updown_cb(struct ipa_client_conn *link, int up)
-{
-	struct osmo_gsup_client *gsupc = link->data;
-
-	LOGP(DLGSUP, LOGL_INFO, "GSUP link to %s:%d %s\n",
-		     link->addr, link->port, up ? "UP" : "DOWN");
-
-	gsupc->is_connected = up;
-
-	if (up) {
-		start_test_procedure(gsupc);
-
-		if (gsupc->oap_state.state == OSMO_OAP_INITIALIZED)
-			gsup_client_oap_register(gsupc);
-
-		osmo_timer_del(&gsupc->connect_timer);
-	} else {
-		osmo_timer_del(&gsupc->ping_timer);
-
-		osmo_timer_schedule(&gsupc->connect_timer,
-				    OSMO_GSUP_CLIENT_RECONNECT_INTERVAL, 0);
-	}
-}
-
-static int gsup_client_oap_handle(struct osmo_gsup_client *gsupc, struct msgb *msg_rx)
-{
-	int rc;
-	struct msgb *msg_tx;
-
-	/* If the oap_state is disabled, this will reject the messages. */
-	rc = osmo_oap_client_handle(&gsupc->oap_state, msg_rx, &msg_tx);
-	msgb_free(msg_rx);
-	if (rc < 0)
-		return rc;
-
-	if (msg_tx)
-		client_send(gsupc, IPAC_PROTO_EXT_OAP, msg_tx);
-
-	return 0;
-}
-
-static int gsup_client_read_cb(struct ipa_client_conn *link, struct msgb *msg)
-{
-	struct ipaccess_head *hh = (struct ipaccess_head *) msg->data;
-	struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg);
-	struct osmo_gsup_client *gsupc = (struct osmo_gsup_client *)link->data;
-	int rc;
-
-	OSMO_ASSERT(gsupc->unit_name);
-
-	msg->l2h = &hh->data[0];
-
-	rc = ipaccess_bts_handle_ccm(link, gsupc->ipa_dev, msg);
-
-	if (rc < 0) {
-		LOGP(DLGSUP, LOGL_NOTICE,
-		     "GSUP received an invalid IPA/CCM message from %s:%d\n",
-		     link->addr, link->port);
-		/* Link has been closed */
-		gsupc->is_connected = 0;
-		msgb_free(msg);
-		return -1;
-	}
-
-	if (rc == 1) {
-		uint8_t msg_type = *(msg->l2h);
-		/* CCM message */
-		if (msg_type == IPAC_MSGT_PONG) {
-			LOGP(DLGSUP, LOGL_DEBUG, "GSUP receiving PONG\n");
-			gsupc->got_ipa_pong = 1;
-		}
-
-		msgb_free(msg);
-		return 0;
-	}
-
-	if (hh->proto != IPAC_PROTO_OSMO)
-		goto invalid;
-
-	if (!he || msgb_l2len(msg) < sizeof(*he))
-		goto invalid;
-
-	msg->l2h = &he->data[0];
-
-	if (he->proto == IPAC_PROTO_EXT_GSUP) {
-		OSMO_ASSERT(gsupc->read_cb != NULL);
-		gsupc->read_cb(gsupc, msg);
-		/* expecting read_cb() to free msg */
-	} else if (he->proto == IPAC_PROTO_EXT_OAP) {
-		return gsup_client_oap_handle(gsupc, msg);
-		/* gsup_client_oap_handle frees msg */
-	} else
-		goto invalid;
-
-	return 0;
-
-invalid:
-	LOGP(DLGSUP, LOGL_NOTICE,
-	     "GSUP received an invalid IPA message from %s:%d, size = %d\n",
-	     link->addr, link->port, msgb_length(msg));
-
-	msgb_free(msg);
-	return -1;
-}
-
-static void ping_timer_cb(void *gsupc_)
-{
-	struct osmo_gsup_client *gsupc = gsupc_;
-
-	LOGP(DLGSUP, LOGL_INFO, "GSUP ping callback (%s, %s PONG)\n",
-	     gsupc->is_connected ? "connected" : "not connected",
-	     gsupc->got_ipa_pong ? "got" : "didn't get");
-
-	if (gsupc->got_ipa_pong) {
-		start_test_procedure(gsupc);
-		return;
-	}
-
-	LOGP(DLGSUP, LOGL_NOTICE, "GSUP ping timed out, reconnecting\n");
-	ipa_client_conn_close(gsupc->link);
-	gsupc->is_connected = 0;
-
-	gsup_client_connect(gsupc);
-}
-
-static void start_test_procedure(struct osmo_gsup_client *gsupc)
-{
-	osmo_timer_setup(&gsupc->ping_timer, ping_timer_cb, gsupc);
-
-	gsupc->got_ipa_pong = 0;
-	osmo_timer_schedule(&gsupc->ping_timer, OSMO_GSUP_CLIENT_PING_INTERVAL, 0);
-	LOGP(DLGSUP, LOGL_DEBUG, "GSUP sending PING\n");
-	gsup_client_send_ping(gsupc);
-}
-
-/*!
- * Create a gsup client connecting to the specified IP address and TCP port.
- * Use the provided ipaccess unit as the client-side identifier; ipa_dev should
- * be allocated in talloc_ctx talloc_ctx as well.
- * \param[in] talloc_ctx talloc context.
- * \param[in] ipa_dev IP access unit which contains client identification information; must be allocated
- *                    in talloc_ctx as well to ensure it lives throughout the lifetime of the connection.
- * \param[in] ip_addr GSUP server IP address.
- * \param[in] tcp_port GSUP server TCP port.
- * \param[in] read_cb callback for reading from the GSUP connection.
- * \param[in] oapc_config OPA client configuration.
- *  \returns a GSUP client connection or NULL on failure.
- */
-struct osmo_gsup_client *osmo_gsup_client_create2(void *talloc_ctx,
-						  struct ipaccess_unit *ipa_dev,
-						  const char *ip_addr,
-						  unsigned int tcp_port,
-						  osmo_gsup_client_read_cb_t read_cb,
-						  struct osmo_oap_client_config *oapc_config)
-{
-	struct osmo_gsup_client *gsupc;
-	int rc;
-
-	gsupc = talloc_zero(talloc_ctx, struct osmo_gsup_client);
-	OSMO_ASSERT(gsupc);
-	gsupc->unit_name = (const char *)ipa_dev->unit_name; /* API backwards compat */
-	gsupc->ipa_dev = ipa_dev;
-
-	/* a NULL oapc_config will mark oap_state disabled. */
-	rc = osmo_oap_client_init(oapc_config, &gsupc->oap_state);
-	if (rc != 0)
-		goto failed;
-
-	gsupc->link = ipa_client_conn_create(gsupc,
-					     /* no e1inp */ NULL,
-					     0,
-					     ip_addr, tcp_port,
-					     gsup_client_updown_cb,
-					     gsup_client_read_cb,
-					     /* default write_cb */ NULL,
-					     gsupc);
-	if (!gsupc->link)
-		goto failed;
-
-	osmo_timer_setup(&gsupc->connect_timer, connect_timer_cb, gsupc);
-
-	rc = gsup_client_connect(gsupc);
-
-	if (rc < 0)
-		goto failed;
-
-	gsupc->read_cb = read_cb;
-
-	return gsupc;
-
-failed:
-	osmo_gsup_client_destroy(gsupc);
-	return NULL;
-}
-
-/**
- * Like osmo_gsup_client_create2() except it expects a unit name instead
- * of a full-blown ipacess_unit as the client-side identifier.
- */
-struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx,
-						 const char *unit_name,
-						 const char *ip_addr,
-						 unsigned int tcp_port,
-						 osmo_gsup_client_read_cb_t read_cb,
-						 struct osmo_oap_client_config *oapc_config)
-{
-	struct ipaccess_unit *ipa_dev = talloc_zero(talloc_ctx, struct ipaccess_unit);
-	ipa_dev->unit_name = talloc_strdup(ipa_dev, unit_name);
-	return osmo_gsup_client_create2(talloc_ctx, ipa_dev, ip_addr, tcp_port, read_cb, oapc_config);
-}
-
-void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc)
-{
-	osmo_timer_del(&gsupc->connect_timer);
-	osmo_timer_del(&gsupc->ping_timer);
-
-	if (gsupc->link) {
-		ipa_client_conn_close(gsupc->link);
-		ipa_client_conn_destroy(gsupc->link);
-		gsupc->link = NULL;
-	}
-	talloc_free(gsupc);
-}
-
-int osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg)
-{
-	if (!gsupc || !gsupc->is_connected) {
-		LOGP(DLGSUP, LOGL_ERROR, "GSUP not connected, unable to send %s\n", msgb_hexdump(msg));
-		msgb_free(msg);
-		return -ENOTCONN;
-	}
-
-	client_send(gsupc, IPAC_PROTO_EXT_GSUP, msg);
-
-	return 0;
-}
-
-/*! Encode and send a GSUP message.
- * \param[in] gsupc    GSUP client.
- * \param[in] gsup_msg GSUP message to be sent.
- * \returns 0 in case of success, negative on error.
- */
-int osmo_gsup_client_enc_send(struct osmo_gsup_client *gsupc,
-			      const struct osmo_gsup_message *gsup_msg)
-{
-	struct msgb *gsup_msgb;
-	int rc;
-
-	gsup_msgb = osmo_gsup_client_msgb_alloc();
-	if (!gsup_msgb) {
-		LOGP(DLGSUP, LOGL_ERROR, "Couldn't allocate GSUP message\n");
-		return -ENOMEM;
-	}
-
-	rc = osmo_gsup_encode(gsup_msgb, gsup_msg);
-	if (rc) {
-		LOGP(DLGSUP, LOGL_ERROR, "Couldn't encode GSUP message\n");
-		goto error;
-	}
-
-	rc = osmo_gsup_client_send(gsupc, gsup_msgb);
-	if (rc) {
-		LOGP(DLGSUP, LOGL_ERROR, "Couldn't send GSUP message\n");
-		goto error;
-	}
-
-	return 0;
-
-error:
-	talloc_free(gsup_msgb);
-	return rc;
-}
-
-struct msgb *osmo_gsup_client_msgb_alloc(void)
-{
-	return msgb_alloc_headroom(4000, 64, __func__);
-}

src/gsupclient/gsup_test_client.c

@@ -1,321 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/application.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/logging.h>
-#include <osmocom/gsm/gsup.h>
-
-#include <osmocom/gsupclient/gsup_client.h>
-
-static struct osmo_gsup_client *g_gc;
-
-
-/***********************************************************************
- * IMSI Operation
- ***********************************************************************/
-static LLIST_HEAD(g_imsi_ops);
-
-struct imsi_op_stats {
-	uint32_t num_alloc;
-	uint32_t num_released;
-	uint32_t num_rx_success;
-	uint32_t num_rx_error;
-	uint32_t num_timeout;
-};
-
-enum imsi_op_type {
-	IMSI_OP_SAI,
-	IMSI_OP_LU,
-	IMSI_OP_ISD,
-	_NUM_IMSI_OP
-};
-
-static const struct value_string imsi_op_names[] = {
-	{ IMSI_OP_SAI, "SAI" },
-	{ IMSI_OP_LU, "LU" },
-	{ IMSI_OP_ISD, "ISD" },
-	{ 0, NULL }
-};
-
-static struct imsi_op_stats imsi_op_stats[_NUM_IMSI_OP];
-
-struct imsi_op {
-	struct llist_head list;
-	char imsi[17];
-	enum imsi_op_type type;
-	struct osmo_timer_list timer;
-};
-
-static struct imsi_op *imsi_op_find(const char *imsi,
-			     enum imsi_op_type type)
-{
-	struct imsi_op *io;
-
-	llist_for_each_entry(io, &g_imsi_ops, list) {
-		if (!strcmp(io->imsi, imsi) && io->type == type)
-			return io;
-	}
-	return NULL;
-}
-
-static void imsi_op_timer_cb(void *data);
-
-static struct imsi_op *imsi_op_alloc(void *ctx, const char *imsi,
-				enum imsi_op_type type)
-{
-	struct imsi_op *io;
-
-	if (imsi_op_find(imsi, type))
-		return NULL;
-
-	io = talloc_zero(ctx, struct imsi_op);
-	OSMO_STRLCPY_ARRAY(io->imsi, imsi);
-	io->type = type;
-	osmo_timer_setup(&io->timer, imsi_op_timer_cb, io);
-	llist_add(&io->list, &g_imsi_ops);
-	imsi_op_stats[type].num_alloc++;
-
-	return io;
-}
-
-static void imsi_op_release(struct imsi_op *io)
-{
-	osmo_timer_del(&io->timer);
-	llist_del(&io->list);
-	imsi_op_stats[io->type].num_released++;
-	talloc_free(io);
-}
-
-static void imsi_op_timer_cb(void *data)
-{
-	struct imsi_op *io = data;
-	printf("%s: Timer expiration\n", io->imsi);
-	imsi_op_stats[io->type].num_timeout++;
-	imsi_op_release(io);
-}
-
-/* allocate + generate + send Send-Auth-Info */
-static int req_auth_info(const char *imsi)
-{
-	struct imsi_op *io = imsi_op_alloc(g_gc, imsi, IMSI_OP_SAI);
-	struct osmo_gsup_message gsup = {0};
-	struct msgb *msg = msgb_alloc_headroom(1200, 200, __func__);
-	int rc;
-
-	OSMO_STRLCPY_ARRAY(gsup.imsi, io->imsi);
-	gsup.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST;
-
-	rc = osmo_gsup_encode(msg, &gsup);
-	if (rc < 0) {
-		printf("%s: encoding failure (%s)\n", imsi, strerror(-rc));
-		return rc;
-	}
-
-	return osmo_gsup_client_send(g_gc, msg);
-}
-
-/* allocate + generate + send Send-Auth-Info */
-static int req_loc_upd(const char *imsi)
-{
-	struct imsi_op *io = imsi_op_alloc(g_gc, imsi, IMSI_OP_LU);
-	struct osmo_gsup_message gsup = {0};
-	struct msgb *msg = msgb_alloc_headroom(1200, 200, __func__);
-	int rc;
-
-	OSMO_STRLCPY_ARRAY(gsup.imsi, io->imsi);
-	gsup.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST;
-
-	rc = osmo_gsup_encode(msg, &gsup);
-	if (rc < 0) {
-		printf("%s: encoding failure (%s)\n", imsi, strerror(-rc));
-		return rc;
-	}
-
-	return osmo_gsup_client_send(g_gc, msg);
-}
-
-static int resp_isd(struct imsi_op *io)
-{
-	struct osmo_gsup_message gsup = {0};
-	struct msgb *msg = msgb_alloc_headroom(1200, 200, __func__);
-	int rc;
-
-	OSMO_STRLCPY_ARRAY(gsup.imsi, io->imsi);
-	gsup.message_type = OSMO_GSUP_MSGT_INSERT_DATA_RESULT;
-
-	rc = osmo_gsup_encode(msg, &gsup);
-	if (rc < 0) {
-		printf("%s: encoding failure (%s)\n", io->imsi, strerror(-rc));
-		return rc;
-	}
-
-	imsi_op_release(io);
-
-	return osmo_gsup_client_send(g_gc, msg);
-}
-
-/* receive an incoming GSUP message */
-static void imsi_op_rx_gsup(struct imsi_op *io, const struct osmo_gsup_message *gsup)
-{
-	int is_error = 0, rc;
-
-	if (OSMO_GSUP_IS_MSGT_ERROR(gsup->message_type)) {
-		imsi_op_stats[io->type].num_rx_error++;
-		is_error = 1;
-	} else
-		imsi_op_stats[io->type].num_rx_success++;
-
-	switch (io->type) {
-	case IMSI_OP_SAI:
-		printf("%s; SAI Response%s\n", io->imsi, is_error ? ": ERROR" : "");
-		/* now that we have auth tuples, request LU */
-		rc = req_loc_upd(io->imsi);
-		if (rc < 0)
-			printf("Failed to request Location Update for %s\n", io->imsi);
-		imsi_op_release(io);
-		break;
-	case IMSI_OP_LU:
-		printf("%s; LU Response%s\n", io->imsi, is_error ? ": ERROR" : "");
-		imsi_op_release(io);
-		break;
-	case IMSI_OP_ISD:
-		printf("%s; ISD Request%s\n", io->imsi, is_error ? ": ERROR" : "");
-		rc = resp_isd(io);
-		if (rc < 0)
-			printf("Failed to insert subscriber data for %s\n", io->imsi);
-		break;
-	default:
-		printf("%s: Unknown\n", io->imsi);
-		imsi_op_release(io);
-		break;
-	}
-}
-
-static int op_type_by_gsup_msgt(enum osmo_gsup_message_type msg_type)
-{
-	switch (msg_type) {
-	case OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT:
-	case OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR:
-		return IMSI_OP_SAI;
-	case OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT:
-	case OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR:
-		return IMSI_OP_LU;
-	case OSMO_GSUP_MSGT_INSERT_DATA_REQUEST:
-		return IMSI_OP_ISD;
-	default:
-		printf("Unknown GSUP msg_type %u\n", msg_type);
-		return -1;
-	}
-}
-
-static int gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg)
-{
-	struct osmo_gsup_message gsup_msg = {0};
-	struct imsi_op *io = NULL;
-	int rc;
-
-	DEBUGP(DLGSUP, "Rx GSUP %s\n", msgb_hexdump(msg));
-
-	rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup_msg);
-	if (rc < 0)
-		return rc;
-
-	if (!gsup_msg.imsi[0])
-		return -1;
-
-	rc = op_type_by_gsup_msgt(gsup_msg.message_type);
-	if (rc < 0)
-		return rc;
-
-	switch (rc) {
-	case IMSI_OP_SAI:
-	case IMSI_OP_LU:
-		io = imsi_op_find(gsup_msg.imsi, rc);
-		break;
-	case IMSI_OP_ISD:
-		/* ISD is an inbound transaction */
-		io = imsi_op_alloc(g_gc, gsup_msg.imsi, IMSI_OP_ISD);
-		break;
-	}
-	if (!io)
-		return -1;
-
-	imsi_op_rx_gsup(io, &gsup_msg);
-	msgb_free(msg);
-
-	return 0;
-}
-
-static void print_report(void)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(imsi_op_stats); i++) {
-		struct imsi_op_stats *st = &imsi_op_stats[i];
-		const char *name = get_value_string(imsi_op_names, i);
-		printf("%s: %u alloc, %u released, %u success, %u error , %u tout\n",
-			name, st->num_alloc, st->num_released, st->num_rx_success,
-			st->num_rx_error, st->num_timeout);
-	}
-}
-
-static void sig_cb(int sig)
-{
-	switch (sig) {
-	case SIGINT:
-		print_report();
-		exit(0);
-		break;
-	}
-}
-
-/* default categories */
-static struct log_info_cat default_categories[] = {
-};
-
-static const struct log_info gsup_test_client_log_info = {
-	.cat = default_categories,
-	.num_cat = ARRAY_SIZE(default_categories),
-};
-
-int main(int argc, char **argv)
-{
-	unsigned long long i;
-	char *server_host = "127.0.0.1";
-	uint16_t server_port = OSMO_GSUP_PORT;
-	void *ctx = talloc_named_const(NULL, 0, "gsup_test_client");
-
-	osmo_init_logging2(ctx, &gsup_test_client_log_info);
-
-	g_gc = osmo_gsup_client_create(ctx, "GSUPTEST", server_host, server_port,
-					gsupc_read_cb, NULL);
-
-
-	signal(SIGINT, sig_cb);
-
-	for (i = 0; i < 10000; i++) {
-		unsigned long long imsi = 901790000000000 + i;
-		char imsi_buf[17] = { 0 };
-		int rc;
-
-		snprintf(imsi_buf, sizeof(imsi_buf), "%015llu", imsi);
-		rc = req_auth_info(imsi_buf);
-		if (rc < 0)
-			printf("Failed to request Auth Info for %s\n", imsi_buf);
-
-		osmo_select_main(0);
-	}
-
-	while (1) {
-		osmo_select_main(0);
-	}
-
-	print_report();
-	exit(0);
-}

src/hlr.c

@@ -26,12 +26,13 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/core/application.h>
 #include <osmocom/gsm/gsup.h>
+#include <osmocom/gsm/apn.h>
+#include <osmocom/gsm/gsm48_ie.h>
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/ports.h>
 #include <osmocom/ctrl/control_vty.h>
-#include <osmocom/gsm/apn.h>
 
 #include "db.h"
 #include "hlr.h"
@@ -42,108 +43,8 @@
 #include "rand.h"
 #include "luop.h"
 #include "hlr_vty.h"
-#include "hlr_ussd.h"
 
-struct hlr *g_hlr;
-static int quit = 0;
-
-/* Trigger 'Insert Subscriber Data' messages to all connected GSUP clients.
- *
- * \param[in] subscr  A subscriber we have new data to send for.
- */
-void
-osmo_hlr_subscriber_update_notify(struct hlr_subscriber *subscr)
-{
-        struct osmo_gsup_conn *co;
-
-	if (g_hlr->gs == NULL) {
-		LOGP(DLGSUP, LOGL_DEBUG,
-		     "IMSI %s: NOT Notifying peers of subscriber data change,"
-		     " there is no GSUP server\n",
-		     subscr->imsi);
-		return;
-	}
-
-	llist_for_each_entry(co, &g_hlr->gs->clients, list) {
-		struct osmo_gsup_message gsup = { };
-		uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN];
-		uint8_t apn[APN_MAXLEN];
-		struct msgb *msg_out;
-		uint8_t *peer;
-		int peer_len;
-		size_t peer_strlen;
-		const char *peer_compare;
-		enum osmo_gsup_cn_domain cn_domain;
-
-		if (co->supports_ps) {
-			cn_domain = OSMO_GSUP_CN_DOMAIN_PS;
-			peer_compare = subscr->sgsn_number;
-		} else if (co->supports_cs) {
-			cn_domain = OSMO_GSUP_CN_DOMAIN_CS;
-			peer_compare = subscr->vlr_number;
-		} else {
-			/* We have not yet received a location update from this GSUP client.*/
-			continue;
-		}
-
-		peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR);
-		if (peer_len < 0) {
-			LOGP(DLGSUP, LOGL_ERROR,
-			       "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi,
-			       co && co->conn && co->conn->server? co->conn->server->addr : "unset",
-			       co && co->conn && co->conn->server? co->conn->server->port : 0);
-			continue;
-		}
-
-		peer_strlen = strnlen((const char*)peer, peer_len);
-		if (strlen(peer_compare) != peer_strlen || strncmp(peer_compare, (const char *)peer, peer_len)) {
-			/* Mismatch. The subscriber is not subscribed with this GSUP client. */
-			/* I hope peer is always nul terminated... */
-			if (peer_strlen < peer_len)
-				LOGP(DLGSUP, LOGL_DEBUG,
-				     "IMSI %s: subscriber change: skipping %s peer %s\n",
-				     subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS",
-				     osmo_quote_str((char*)peer, -1));
-			continue;
-		}
-
-		LOGP(DLGSUP, LOGL_DEBUG,
-		     "IMSI %s: subscriber change: notifying %s peer %s\n",
-		     subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS",
-		     osmo_quote_str(peer_compare, -1));
-
-		if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc,
-								sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) {
-			LOGP(DLGSUP, LOGL_ERROR,
-			       "IMSI='%s': Cannot notify GSUP client; could not create gsup message "
-			       "for %s:%u\n", subscr->imsi,
-			       co && co->conn && co->conn->server? co->conn->server->addr : "unset",
-			       co && co->conn && co->conn->server? co->conn->server->port : 0);
-			continue;
-		}
-
-		/* Send ISD to MSC/SGSN */
-		msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE");
-		if (msg_out == NULL) {
-			LOGP(DLGSUP, LOGL_ERROR,
-			       "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer "
-			       "for %s:%u\n", subscr->imsi,
-			       co && co->conn && co->conn->server? co->conn->server->addr : "unset",
-			       co && co->conn && co->conn->server? co->conn->server->port : 0);
-			continue;
-		}
-		osmo_gsup_encode(msg_out, &gsup);
-
-		if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) {
-			LOGP(DMAIN, LOGL_ERROR,
-			       "IMSI='%s': Cannot notify GSUP client; send operation failed "
-			       "for %s:%u\n", subscr->imsi,
-			       co && co->conn && co->conn->server? co->conn->server->addr : "unset",
-			       co && co->conn && co->conn->server? co->conn->server->port : 0);
-			continue;
-		}
-	}
-}
+static struct hlr *g_hlr;
 
 /***********************************************************************
  * Send Auth Info handling
@@ -166,27 +67,12 @@ static int rx_send_auth_info(struct osmo_gsup_conn *conn,
 			gsup_out.auth_vectors,
 			ARRAY_SIZE(gsup_out.auth_vectors),
 			gsup->rand, gsup->auts);
-	if (rc <= 0) {
+	if (rc < 0) {
 		gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR;
-		switch (rc) {
-		case 0:
-			/* 0 means "0 tuples generated", which shouldn't happen.
-			 * Treat the same as "no auth data". */
-		case -ENOKEY:
-			LOGP(DAUC, LOGL_NOTICE, "%s: IMSI known, but has no auth data;"
-			     " Returning slightly inaccurate cause 'IMSI Unknown' via GSUP\n",
-			     gsup->imsi);
-			gsup_out.cause = GMM_CAUSE_IMSI_UNKNOWN;
-			break;
-		case -ENOENT:
-			LOGP(DAUC, LOGL_NOTICE, "%s: IMSI not known\n", gsup->imsi);
-			gsup_out.cause = GMM_CAUSE_IMSI_UNKNOWN;
-			break;
-		default:
-			LOGP(DAUC, LOGL_ERROR, "%s: failure to look up IMSI in db\n", gsup->imsi);
-			gsup_out.cause = GMM_CAUSE_NET_FAIL;
-			break;
-		}
+		gsup_out.cause = GMM_CAUSE_NET_FAIL;
+	} else if (rc == 0) {
+		gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR;
+		gsup_out.cause = GMM_CAUSE_IMSI_UNKNOWN;
 	} else {
 		gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT;
 		gsup_out.num_auth_vectors = rc;
@@ -261,34 +147,16 @@ void lu_op_rx_gsup(struct lu_operation *luop,
 static int rx_upd_loc_req(struct osmo_gsup_conn *conn,
 			  const struct osmo_gsup_message *gsup)
 {
-	struct hlr_subscriber *subscr;
 	struct lu_operation *luop = lu_op_alloc_conn(conn);
-	int i;
-	bool allowed;
-
 	if (!luop) {
 		LOGP(DMAIN, LOGL_ERROR, "LU REQ from conn without addr?\n");
 		return -EINVAL;
 	}
 
-	subscr = &luop->subscr;
-
 	lu_op_statechg(luop, LU_S_LU_RECEIVED);
 
-	switch (gsup->cn_domain) {
-	case OSMO_GSUP_CN_DOMAIN_CS:
-		conn->supports_cs = true;
-		break;
-	default:
-		/* The client didn't send a CN_DOMAIN IE; assume packet-switched in
-		 * accordance with the GSUP spec in osmo-hlr's user manual (section
-		 * 11.6.15 "CN Domain" says "if no CN Domain IE is present within
-		 * a request, the PS Domain is assumed." */
-	case OSMO_GSUP_CN_DOMAIN_PS:
-		conn->supports_ps = true;
+	if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS)
 		luop->is_ps = true;
-		break;
-	}
 	llist_add(&luop->list, &g_lu_ops);
 
 	/* Roughly follwing "Process Update_Location_HLR" of TS 09.02 */
@@ -296,7 +164,7 @@ static int rx_upd_loc_req(struct osmo_gsup_conn *conn,
 	/* check if subscriber is known at all */
 	if (!lu_op_fill_subscr(luop, g_hlr->dbc, gsup->imsi)) {
 		/* Send Error back: Subscriber Unknown in HLR */
-		osmo_strlcpy(luop->subscr.imsi, gsup->imsi, sizeof(luop->subscr.imsi));
+		strcpy(luop->subscr.imsi, gsup->imsi);
 		lu_op_tx_error(luop, GMM_CAUSE_IMSI_UNKNOWN);
 		return 0;
 	}
@@ -311,34 +179,6 @@ static int rx_upd_loc_req(struct osmo_gsup_conn *conn,
 		return 0;
 	}
 
-	/* Check if any available RAT type is allowed. See 3GPP TS 29.010 3.2 'Routeing area updating' and 3.8 'Location
-	 * update' for the "No Suitable cells in location area" error code. */
-	allowed = false;
-	LOGP(DAUC, LOGL_DEBUG, "LU: IMSI='%s' on %s sent RAT types: %zu\n", subscr->imsi,
-	     gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_CS ? "CS" : "PS", gsup->rat_types_len);
-	for (i = 0; i < gsup->rat_types_len; i++) {
-		enum osmo_rat_type rat = gsup->rat_types[i];
-		if (rat <= 0 || rat >= OSMO_RAT_COUNT) {
-			lu_op_tx_error(luop, GMM_CAUSE_COND_IE_ERR);
-			return 0;
-		}
-		if (luop->subscr.rat_types[rat]) {
-			allowed = true;
-			LOGP(DAUC, LOGL_DEBUG, "LU: IMSI='%s' allowed on %s\n",
-			     subscr->imsi, osmo_rat_type_name(rat));
-		} else {
-			LOGP(DAUC, LOGL_DEBUG, "LU: IMSI='%s' not allowed on %s\n",
-			     subscr->imsi, osmo_rat_type_name(rat));
-		}
-	}
-	if (!allowed && gsup->rat_types_len > 0) {
-		LOGP(DAUC, LOGL_DEBUG, "ISMI='%s' not allowed on %s%s\n",
-		     subscr->imsi, osmo_rat_type_name(gsup->rat_types[0]),
-		     gsup->rat_types_len > 1 ? " (nor on the other available RAT types)" : "");
-		lu_op_tx_error(luop, GMM_CAUSE_NO_SUIT_CELL_IN_LA);
-		return 0;
-	}
-
 	/* TODO: Set subscriber tracing = deactive in VLR/SGSN */
 
 #if 0
@@ -351,15 +191,6 @@ static int rx_upd_loc_req(struct osmo_gsup_conn *conn,
 		lu_op_tx_cancel_old(luop);
 	} else
 #endif
-
-	/* Store the VLR / SGSN number with the subscriber, so we know where it was last seen. */
-	LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing %s = %s\n",
-	     subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number",
-	     osmo_quote_str((const char*)luop->peer, -1));
-	if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer, luop->is_ps))
-		LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the database\n",
-		     subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number");
-
 	{
 		/* TODO: Subscriber allowed to roam in PLMN? */
 		/* TODO: Update RoutingInfo */
@@ -392,9 +223,9 @@ static int rx_purge_ms_req(struct osmo_gsup_conn *conn,
 	/* Perform the actual update of the DB */
 	rc = db_subscr_purge(g_hlr->dbc, gsup->imsi, true, is_ps);
 
-	if (rc == 0)
+	if (rc == 1)
 		gsup_reply.message_type = OSMO_GSUP_MSGT_PURGE_MS_RESULT;
-	else if (rc == -ENOENT) {
+	else if (rc == 0) {
 		gsup_reply.message_type = OSMO_GSUP_MSGT_PURGE_MS_ERROR;
 		gsup_reply.cause = GMM_CAUSE_IMSI_UNKNOWN;
 	} else {
@@ -407,29 +238,6 @@ static int rx_purge_ms_req(struct osmo_gsup_conn *conn,
 	return osmo_gsup_conn_send(conn, msg_out);
 }
 
-static int gsup_send_err_reply(struct osmo_gsup_conn *conn, const char *imsi,
-				enum osmo_gsup_message_type type_in, uint8_t err_cause)
-{
-	int type_err = osmo_gsup_get_err_msg_type(type_in);
-	struct osmo_gsup_message gsup_reply = {0};
-	struct msgb *msg_out;
-
-	if (type_err < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "unable to determine error response for %s\n",
-			osmo_gsup_message_type_name(type_in));
-		return type_err;
-	}
-
-	OSMO_STRLCPY_ARRAY(gsup_reply.imsi, imsi);
-	gsup_reply.message_type = type_err;
-	gsup_reply.cause = err_cause;
-	msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ERR response");
-	OSMO_ASSERT(msg_out);
-	osmo_gsup_encode(msg_out, &gsup_reply);
-	LOGP(DMAIN, LOGL_NOTICE, "Tx %s\n", osmo_gsup_message_type_name(type_err));
-	return osmo_gsup_conn_send(conn, msg_out);
-}
-
 static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg)
 {
 	static struct osmo_gsup_message gsup;
@@ -441,11 +249,6 @@ static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg)
 		return rc;
 	}
 
-	/* 3GPP TS 23.003 Section 2.2 clearly states that an IMSI with less than 5
-	 * digits is impossible.  Even 5 digits is a highly theoretical case */
-	if (strlen(gsup.imsi) < 5)
-		return gsup_send_err_reply(conn, gsup.imsi, gsup.message_type, GMM_CAUSE_INV_MAND_INFO);
-
 	switch (gsup.message_type) {
 	/* requests sent to us */
 	case OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST:
@@ -466,13 +269,6 @@ static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg)
 		LOGP(DMAIN, LOGL_ERROR, "Deleting subscriber data for IMSI %s\n",
 		     gsup.imsi);
 		break;
-	case OSMO_GSUP_MSGT_PROC_SS_REQUEST:
-	case OSMO_GSUP_MSGT_PROC_SS_RESULT:
-		rx_proc_ss_req(conn, &gsup);
-		break;
-	case OSMO_GSUP_MSGT_PROC_SS_ERROR:
-		rx_proc_ss_error(conn, &gsup);
-		break;
 	case OSMO_GSUP_MSGT_INSERT_DATA_ERROR:
 	case OSMO_GSUP_MSGT_INSERT_DATA_RESULT:
 	case OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR:
@@ -514,7 +310,6 @@ static void print_help()
 	printf("  -s --disable-color         Do not print ANSI colors in the log\n");
 	printf("  -T --timestamp             Prefix every log line with a timestamp.\n");
 	printf("  -e --log-level number      Set a global loglevel.\n");
-	printf("  -U --db-upgrade            Allow HLR database schema upgrades.\n");
 	printf("  -V --version               Print the version of OsmoHLR.\n");
 }
 
@@ -522,12 +317,10 @@ static struct {
 	const char *config_file;
 	const char *db_file;
 	bool daemonize;
-	bool db_upgrade;
 } cmdline_opts = {
 	.config_file = "osmo-hlr.cfg",
 	.db_file = "hlr.db",
 	.daemonize = false,
-	.db_upgrade = false,
 };
 
 static void handle_options(int argc, char **argv)
@@ -543,12 +336,11 @@ static void handle_options(int argc, char **argv)
 			{"disable-color", 0, 0, 's'},
 			{"log-level", 1, 0, 'e'},
 			{"timestamp", 0, 0, 'T'},
-			{"db-upgrade", 0, 0, 'U' },
 			{"version", 0, 0, 'V' },
 			{0, 0, 0, 0}
 		};
 
-		c = getopt_long(argc, argv, "hc:l:d:Dse:TUV",
+		c = getopt_long(argc, argv, "hc:l:d:Dse:TV",
 				long_options, &option_index);
 		if (c == -1)
 			break;
@@ -579,9 +371,6 @@ static void handle_options(int argc, char **argv)
 		case 'T':
 			log_set_print_timestamp(osmo_stderr_target, 1);
 			break;
-		case 'U':
-			cmdline_opts.db_upgrade = true;
-			break;
 		case 'V':
 			print_version(1);
 			exit(0);
@@ -602,7 +391,11 @@ static void signal_hdlr(int signal)
 	switch (signal) {
 	case SIGINT:
 		LOGP(DMAIN, LOGL_NOTICE, "Terminating due to SIGINT\n");
-		quit++;
+		osmo_gsup_server_destroy(g_hlr->gs);
+		db_close(g_hlr->dbc);
+		log_fini();
+		talloc_report_full(hlr_ctx, stderr);
+		exit(0);
 		break;
 	case SIGUSR1:
 		LOGP(DMAIN, LOGL_DEBUG, "Talloc Report due to SIGUSR1\n");
@@ -629,23 +422,12 @@ int main(int argc, char **argv)
 {
 	int rc;
 
-	/* Track the use of talloc NULL memory contexts */
-	talloc_enable_null_tracking();
-
 	hlr_ctx = talloc_named_const(NULL, 1, "OsmoHLR");
 	msgb_talloc_ctx_init(hlr_ctx, 0);
-	vty_info.tall_ctx = hlr_ctx;
 
 	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 default (call independent) SS session guard timeout value */
-	g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT;
-
-	rc = osmo_init_logging2(hlr_ctx, &hlr_log_info);
+	rc = osmo_init_logging(&hlr_log_info);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing logging\n");
 		exit(1);
@@ -654,7 +436,7 @@ int main(int argc, char **argv)
 	vty_init(&vty_info);
 	ctrl_vty_init(hlr_ctx);
 	handle_options(argc, argv);
-	hlr_vty_init(&hlr_log_info);
+	hlr_vty_init(g_hlr, &hlr_log_info);
 
 	rc = vty_read_config_file(cmdline_opts.config_file, NULL);
 	if (rc < 0) {
@@ -678,14 +460,14 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	g_hlr->dbc = db_open(hlr_ctx, cmdline_opts.db_file, true, cmdline_opts.db_upgrade);
+	g_hlr->dbc = db_open(hlr_ctx, cmdline_opts.db_file);
 	if (!g_hlr->dbc) {
 		LOGP(DMAIN, LOGL_FATAL, "Error opening database\n");
 		exit(1);
 	}
 
 	g_hlr->gs = osmo_gsup_server_create(hlr_ctx, g_hlr->gsup_bind_addr, OSMO_GSUP_PORT,
-					    read_cb, &g_lu_ops, g_hlr);
+					    read_cb, &g_lu_ops);
 	if (!g_hlr->gs) {
 		LOGP(DMAIN, LOGL_FATAL, "Error starting GSUP server\n");
 		exit(1);
@@ -706,29 +488,13 @@ int main(int argc, char **argv)
 		}
 	}
 
-	while (!quit)
+	while (1) {
 		osmo_select_main(0);
+	}
 
-	osmo_gsup_server_destroy(g_hlr->gs);
 	db_close(g_hlr->dbc);
+
 	log_fini();
 
-	/**
-	 * Report the heap state of root context, then free,
-	 * so both ASAN and Valgrind are happy...
-	 */
-	talloc_report_full(hlr_ctx, stderr);
-	talloc_free(hlr_ctx);
-
-	/* FIXME: VTY code still uses NULL-context */
-	talloc_free(tall_vty_ctx);
-
-	/**
-	 * Report the heap state of NULL context, then free,
-	 * so both ASAN and Valgrind are happy...
-	 */
-	talloc_report_full(NULL, stderr);
-	talloc_disable_null_tracking();
-
-	return 0;
+	exit(0);
 }

src/hlr.h

@@ -23,9 +23,6 @@
 #pragma once
 
 #include <stdbool.h>
-#include <osmocom/core/linuxlist.h>
-
-struct hlr_euse;
 
 struct hlr {
 	/* GSUP server pointer */
@@ -40,21 +37,4 @@ struct hlr {
 
 	/* Local bind addr */
 	char *gsup_bind_addr;
-
-	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;
-
-	struct llist_head ussd_routes;
-
-	struct llist_head ss_sessions;
 };
-
-extern struct hlr *g_hlr;
-
-struct hlr_subscriber;
-
-void osmo_hlr_subscriber_update_notify(struct hlr_subscriber *subscr);

src/hlr_db_tool.c

@@ -1,446 +0,0 @@
-/* (C) 2017 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
- *
- * All Rights Reserved
- *
- * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdlib.h>
-#include <signal.h>
-#include <stdio.h>
-#include <getopt.h>
-#include <inttypes.h>
-#include <string.h>
-
-#include <osmocom/core/logging.h>
-#include <osmocom/core/application.h>
-
-#include "logging.h"
-#include "db.h"
-#include "rand.h"
-
-struct hlr_db_tool_ctx {
-	/* DB context */
-	struct db_context *dbc;
-};
-
-struct hlr_db_tool_ctx *g_hlr_db_tool_ctx;
-
-static struct {
-	const char *db_file;
-	bool bootstrap;
-	const char *import_nitb_db;
-	bool db_upgrade;
-} cmdline_opts = {
-	.db_file = "hlr.db",
-	.db_upgrade = false,
-};
-
-static void print_help()
-{
-	printf("\n");
-	printf("Usage: osmo-hlr-db-tool [-l <hlr.db>] [create|import-nitb-db <nitb.db>]\n");
-	printf("  -l --database db-name      The OsmoHLR database to use, default '%s'.\n",
-	       cmdline_opts.db_file);
-	printf("  -h --help                  This text.\n");
-	printf("  -d option --debug=DMAIN:DDB:DAUC  Enable debugging.\n");
-	printf("  -s --disable-color         Do not print ANSI colors in the log\n");
-	printf("  -T --timestamp             Prefix every log line with a timestamp.\n");
-	printf("  -e --log-level number      Set a global loglevel.\n");
-	printf("  -U --db-upgrade            Allow HLR database schema upgrades.\n");
-	printf("  -V --version               Print the version of OsmoHLR-db-tool.\n");
-	printf("\n");
-	printf("Commands:\n");
-	printf("\n");
-	printf("  create                     Create an empty OsmoHLR database.\n");
-	printf("                             (All commands imply this if none exists yet.)\n");
-	printf("\n");
-	printf("  import-nitb-db <nitb.db>   Add OsmoNITB db's subscribers to OsmoHLR db.\n");
-	printf("                             Be aware that the import is lossy, only the\n");
-	printf("                             IMSI, MSISDN, nam_cs/ps and 2G auth data are set.\n");
-}
-
-static void print_version(int print_copyright)
-{
-	printf("OsmoHLR-db-tool version %s\n", PACKAGE_VERSION);
-	if (print_copyright)
-		printf("\n"
-       "Copyright (C) 2017 by sysmocom - s.f.m.c. GmbH\n"
-       "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\n"
-       "This is free software: you are free to change and redistribute it.\n"
-       "There is NO WARRANTY, to the extent permitted by law.\n"
-       "\n");
-}
-
-static void handle_options(int argc, char **argv)
-{
-	const char *cmd;
-
-	while (1) {
-		int option_index = 0, c;
-		static struct option long_options[] = {
-			{"help", 0, 0, 'h'},
-			{"database", 1, 0, 'l'},
-			{"debug", 1, 0, 'd'},
-			{"disable-color", 0, 0, 's'},
-			{"timestamp", 0, 0, 'T'},
-			{"log-level", 1, 0, 'e'},
-			{"db-upgrade", 0, 0, 'U' },
-			{"version", 0, 0, 'V' },
-			{0, 0, 0, 0}
-		};
-
-		c = getopt_long(argc, argv, "hl:d:sTe:UV",
-				long_options, &option_index);
-		if (c == -1)
-			break;
-
-		switch (c) {
-		case 'h':
-			print_help();
-			exit(EXIT_SUCCESS);
-		case 'l':
-			cmdline_opts.db_file = optarg;
-			break;
-		case 'd':
-			log_parse_category_mask(osmo_stderr_target, optarg);
-			break;
-		case 's':
-			log_set_use_color(osmo_stderr_target, 0);
-			break;
-		case 'T':
-			log_set_print_timestamp(osmo_stderr_target, 1);
-			break;
-		case 'e':
-			log_set_log_level(osmo_stderr_target, atoi(optarg));
-			break;
-		case 'U':
-			cmdline_opts.db_upgrade = true;
-			break;
-		case 'V':
-			print_version(1);
-			exit(EXIT_SUCCESS);
-			break;
-		default:
-			/* catch unknown options *as well as* missing arguments. */
-			fprintf(stderr, "Error in command line options. Exiting.\n");
-			exit(EXIT_FAILURE);
-			break;
-		}
-	}
-
-	if (argc - optind <= 0) {
-		fprintf(stderr, "Error: You must specify a command.\n");
-		print_help();
-		exit(EXIT_FAILURE);
-	}
-
-	cmd = argv[optind++];
-
-	if (!strcmp(cmd, "create")) {
-		/* Nothing to do, just run the main program to open the database without running any
-		 * action, which will bootstrap all tables. */
-	} else if (!strcmp(cmd, "import-nitb-db")) {
-		if (argc - optind < 1) {
-			fprintf(stderr, "You must specify an input db file\n");
-			print_help();
-			exit(EXIT_FAILURE);
-		}
-		cmdline_opts.import_nitb_db = argv[optind++];
-	} else {
-		fprintf(stderr, "Error: Unknown command `%s'\n", cmd);
-		print_help();
-		exit(EXIT_FAILURE);
-	}
-
-	if (argc - optind > 0) {
-		fprintf(stderr, "Too many arguments: '%s'\n", argv[optind]);
-		print_help();
-		exit(EXIT_FAILURE);
-	}
-}
-
-static void signal_hdlr(int signal)
-{
-	switch (signal) {
-	case SIGINT:
-		LOGP(DMAIN, LOGL_NOTICE, "Terminating due to SIGINT\n");
-		db_close(g_hlr_db_tool_ctx->dbc);
-		log_fini();
-		talloc_report_full(g_hlr_db_tool_ctx, stderr);
-		exit(EXIT_SUCCESS);
-		break;
-	case SIGUSR1:
-		LOGP(DMAIN, LOGL_DEBUG, "Talloc Report due to SIGUSR1\n");
-		talloc_report_full(g_hlr_db_tool_ctx, stderr);
-		break;
-	}
-}
-
-sqlite3 *open_nitb_db(const char *filename)
-{
-	int rc;
-	sqlite3 *nitb_db = NULL;
-
-	rc = sqlite3_open(filename, &nitb_db);
-	if (rc != SQLITE_OK) {
-		LOGP(DDB, LOGL_ERROR, "Unable to open OsmoNITB DB %s; rc = %d\n", filename, rc);
-		return NULL;
-	}
-
-	return nitb_db;
-}
-
-enum nitb_stmt {
-	NITB_SELECT_SUBSCR,
-	NITB_SELECT_AUTH_KEYS,
-};
-
-static const char *nitb_stmt_sql[] = {
-	[NITB_SELECT_SUBSCR] =
-		"SELECT imsi, id, extension, authorized"
-		" FROM Subscriber"
-		" ORDER BY id",
-	[NITB_SELECT_AUTH_KEYS] =
-		"SELECT algorithm_id, a3a8_ki from authkeys"
-		" WHERE subscriber_id = $subscr_id",
-};
-
-sqlite3_stmt *nitb_stmt[ARRAY_SIZE(nitb_stmt_sql)] = {};
-
-size_t _dbd_decode_binary(const unsigned char *in, unsigned char *out);
-
-void import_nitb_subscr_aud(sqlite3 *nitb_db, const char *imsi, int64_t nitb_id, int64_t hlr_id)
-{
-	int rc;
-	struct db_context *dbc = g_hlr_db_tool_ctx->dbc;
-	sqlite3_stmt *stmt;
-
-	int count = 0;
-
-	stmt = nitb_stmt[NITB_SELECT_AUTH_KEYS];
-	if (!db_bind_int(stmt, NULL, nitb_id))
-		return;
-
-	while ((rc = sqlite3_step(stmt)) == SQLITE_ROW) {
-		const void *blob;
-		unsigned int blob_size;
-		static unsigned char buf[4096];
-		static char ki[128];
-		int decoded_size;
-		struct sub_auth_data_str aud2g = {
-			.type = OSMO_AUTH_TYPE_GSM,
-			.algo = OSMO_AUTH_ALG_NONE,
-			.u.gsm.ki = ki,
-		};
-
-		aud2g.algo = sqlite3_column_int(stmt, 0);
-
-		if (count) {
-			LOGP(DDB, LOGL_ERROR,
-			     "Warning: subscriber has more than one auth key,"
-			     " importing only the first key, for IMSI=%s\n",
-			     imsi);
-			break;
-		}
-
-		blob = sqlite3_column_blob(stmt, 1);
-		blob_size = sqlite3_column_bytes(stmt, 1);
-
-		if (blob_size > sizeof(buf)) {
-			LOGP(DDB, LOGL_ERROR,
-			     "OsmoNITB import to %s: Cannot import auth data for IMSI %s:"
-			     " too large blob: %u\n",
-			     dbc->fname, imsi, blob_size);
-			db_remove_reset(stmt);
-			continue;
-		}
-
-		decoded_size = _dbd_decode_binary(blob, buf);
-		osmo_strlcpy(ki, osmo_hexdump_nospc(buf, decoded_size), sizeof(ki));
-
-		db_subscr_update_aud_by_id(dbc, hlr_id, &aud2g);
-		count ++;
-	}
-
-	if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
-		LOGP(DDB, LOGL_ERROR, "OsmoNITB DB: SQL error: (%d) %s,"
-		     " during stmt '%s'",
-		     rc, sqlite3_errmsg(nitb_db),
-		     nitb_stmt_sql[NITB_SELECT_AUTH_KEYS]);
-	}
-
-	db_remove_reset(stmt);
-}
-
-void import_nitb_subscr(sqlite3 *nitb_db, sqlite3_stmt *stmt)
-{
-	struct db_context *dbc = g_hlr_db_tool_ctx->dbc;
-	int rc;
-	struct hlr_subscriber subscr;
-
-	int64_t nitb_id;
-	int64_t imsi;
-	char imsi_str[32];
-	bool authorized;
-
-	imsi = sqlite3_column_int64(stmt, 0);
-
-	snprintf(imsi_str, sizeof(imsi_str), "%" PRId64, imsi);
-
-	rc = db_subscr_create(dbc, imsi_str);
-	if (rc < 0) {
-		LOGP(DDB, LOGL_ERROR, "OsmoNITB DB import to %s: failed to create IMSI %s: %d: %s\n",
-		     dbc->fname,
-		     imsi_str,
-		     rc,
-		     strerror(-rc));
-		/* on error, still attempt to continue */
-	}
-
-	nitb_id = sqlite3_column_int64(stmt, 1);
-	copy_sqlite3_text_to_buf(subscr.msisdn, stmt, 2);
-	authorized = sqlite3_column_int(stmt, 3) ? true : false;
-
-	db_subscr_update_msisdn_by_imsi(dbc, imsi_str, subscr.msisdn);
-	db_subscr_nam(dbc, imsi_str, authorized, true);
-	db_subscr_nam(dbc, imsi_str, authorized, false);
-
-	/* find the just created id */
-	rc = db_subscr_get_by_imsi(dbc, imsi_str, &subscr);
-	if (rc < 0) {
-		LOGP(DDB, LOGL_ERROR, "OsmoNITB DB import to %s: created IMSI %s,"
-		     " but failed to get new subscriber id: %d: %s\n",
-		     dbc->fname,
-		     imsi_str,
-		     rc,
-		     strerror(-rc));
-		return;
-	}
-
-	OSMO_ASSERT(!strcmp(imsi_str, subscr.imsi));
-
-	import_nitb_subscr_aud(nitb_db, imsi_str, nitb_id, subscr.id);
-}
-
-int import_nitb_db(void)
-{
-	int i;
-	int ret;
-	int rc;
-	const char *sql;
-	sqlite3_stmt *stmt;
-
-	sqlite3 *nitb_db = open_nitb_db(cmdline_opts.import_nitb_db);
-
-	if (!nitb_db)
-		return -1;
-	ret = 0;
-
-	for (i = 0; i < ARRAY_SIZE(nitb_stmt_sql); i++) {
-		sql = nitb_stmt_sql[i];
-		rc = sqlite3_prepare_v2(nitb_db, sql, -1, &nitb_stmt[i], NULL);
-		if (rc != SQLITE_OK) {
-			LOGP(DDB, LOGL_ERROR, "OsmoNITB DB: Unable to prepare SQL statement '%s'\n", sql);
-			ret = -1;
-			goto out_free;
-		}
-	}
-
-	stmt = nitb_stmt[NITB_SELECT_SUBSCR];
-
-	while ((rc = sqlite3_step(stmt)) == SQLITE_ROW) {
-		import_nitb_subscr(nitb_db, stmt);
-		/* On failure, carry on with the rest. */
-	}
-	if (rc != SQLITE_DONE) {
-		LOGP(DDB, LOGL_ERROR, "OsmoNITB DB: SQL error: (%d) %s,"
-		     " during stmt '%s'",
-		     rc, sqlite3_errmsg(nitb_db),
-		     nitb_stmt_sql[NITB_SELECT_SUBSCR]);
-		goto out_free;
-	}
-
-	db_remove_reset(stmt);
-	sqlite3_finalize(stmt);
-
-out_free:
-	sqlite3_close(nitb_db);
-	return ret;
-}
-
-int main(int argc, char **argv)
-{
-	int rc;
-	int (*main_action)(void);
-	main_action = NULL;
-
-	g_hlr_db_tool_ctx = talloc_zero(NULL, struct hlr_db_tool_ctx);
-	OSMO_ASSERT(g_hlr_db_tool_ctx);
-	talloc_set_name_const(g_hlr_db_tool_ctx, "OsmoHLR-db-tool");
-
-	rc = osmo_init_logging2(g_hlr_db_tool_ctx, &hlr_log_info);
-	if (rc < 0) {
-		fprintf(stderr, "Error initializing logging\n");
-		exit(EXIT_FAILURE);
-	}
-
-	handle_options(argc, argv);
-
-	if (cmdline_opts.import_nitb_db) {
-		if (main_action)
-			goto too_many_actions;
-		main_action = import_nitb_db;
-	}
-	/* Future: add more main_actions, besides import-nitb-db, here.
-	 * For command 'create', no action is required. */
-
-	/* Just in case any db actions need randomness */
-	rc = rand_init();
-	if (rc < 0) {
-		LOGP(DMAIN, LOGL_FATAL, "Error initializing random source\n");
-		exit(EXIT_FAILURE);
-	}
-
-	g_hlr_db_tool_ctx->dbc = db_open(g_hlr_db_tool_ctx, cmdline_opts.db_file, true, cmdline_opts.db_upgrade);
-	if (!g_hlr_db_tool_ctx->dbc) {
-		LOGP(DMAIN, LOGL_FATAL, "Error opening database\n");
-		exit(EXIT_FAILURE);
-	}
-
-	osmo_init_ignore_signals();
-	signal(SIGINT, &signal_hdlr);
-	signal(SIGUSR1, &signal_hdlr);
-
-	rc = 0;
-	if (main_action)
-		rc = (*main_action)();
-
-	db_close(g_hlr_db_tool_ctx->dbc);
-	log_fini();
-	exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);
-
-too_many_actions:
-	fprintf(stderr, "Too many actions requested.\n");
-	log_fini();
-	exit(EXIT_FAILURE);
-}
-
-/* stubs */
-void lu_op_alloc_conn(void) { OSMO_ASSERT(0); }
-void lu_op_tx_del_subscr_data(void) { OSMO_ASSERT(0); }
-void lu_op_free(void) { OSMO_ASSERT(0); }

src/hlr_ussd.c

@@ -1,685 +0,0 @@
-/* OsmoHLR SS/USSD implementation */
-
-/* (C) 2018 Harald Welte <laforge@gnumonks.org>
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/timer.h>
-#include <osmocom/gsm/gsup.h>
-#include <osmocom/gsm/gsm0480.h>
-#include <osmocom/gsm/protocol/gsm_04_80.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-
-#include "hlr.h"
-#include "hlr_ussd.h"
-#include "gsup_server.h"
-#include "gsup_router.h"
-#include "logging.h"
-
-/***********************************************************************
- * core data structures expressing config from VTY
- ***********************************************************************/
-
-struct hlr_euse *euse_find(struct hlr *hlr, const char *name)
-{
-	struct hlr_euse *euse;
-
-	llist_for_each_entry(euse, &hlr->euse_list, list) {
-		if (!strcmp(euse->name, name))
-			return euse;
-	}
-	return NULL;
-}
-
-struct hlr_euse *euse_alloc(struct hlr *hlr, const char *name)
-{
-	struct hlr_euse *euse = euse_find(hlr, name);
-	if (euse)
-		return NULL;
-
-	euse = talloc_zero(hlr, struct hlr_euse);
-	euse->name = talloc_strdup(euse, name);
-	euse->hlr = hlr;
-	llist_add_tail(&euse->list, &hlr->euse_list);
-
-	return euse;
-}
-
-void euse_del(struct hlr_euse *euse)
-{
-	llist_del(&euse->list);
-	talloc_free(euse);
-}
-
-
-struct hlr_ussd_route *ussd_route_find_prefix(struct hlr *hlr, const char *prefix)
-{
-	struct hlr_ussd_route *rt;
-
-	llist_for_each_entry(rt, &hlr->ussd_routes, list) {
-		if (!strcmp(rt->prefix, prefix))
-			return rt;
-	}
-	return NULL;
-}
-
-struct hlr_ussd_route *ussd_route_prefix_alloc_int(struct hlr *hlr, const char *prefix,
-						   const struct hlr_iuse *iuse)
-{
-	struct hlr_ussd_route *rt;
-
-	if (ussd_route_find_prefix(hlr, prefix))
-		return NULL;
-
-	rt = talloc_zero(hlr, struct hlr_ussd_route);
-	rt->prefix = talloc_strdup(rt, prefix);
-	rt->u.iuse = iuse;
-	llist_add_tail(&rt->list, &hlr->ussd_routes);
-
-	return rt;
-}
-
-struct hlr_ussd_route *ussd_route_prefix_alloc_ext(struct hlr *hlr, const char *prefix,
-						   struct hlr_euse *euse)
-{
-	struct hlr_ussd_route *rt;
-
-	if (ussd_route_find_prefix(hlr, prefix))
-		return NULL;
-
-	rt = talloc_zero(hlr, struct hlr_ussd_route);
-	rt->prefix = talloc_strdup(rt, prefix);
-	rt->is_external = true;
-	rt->u.euse = euse;
-	llist_add_tail(&rt->list, &hlr->ussd_routes);
-
-	return rt;
-}
-
-void ussd_route_del(struct hlr_ussd_route *rt)
-{
-	llist_del(&rt->list);
-	talloc_free(rt);
-}
-
-static struct hlr_ussd_route *ussd_route_lookup_7bit(struct hlr *hlr, const char *ussd_code)
-{
-	struct hlr_ussd_route *rt;
-	llist_for_each_entry(rt, &hlr->ussd_routes, list) {
-		if (!strncmp(ussd_code, rt->prefix, strlen(rt->prefix))) {
-			LOGP(DSS, LOGL_DEBUG, "Found %s '%s' (prefix '%s') for USSD "
-				"Code '%s'\n", rt->is_external ? "EUSE" : "IUSE",
-				rt->is_external ? rt->u.euse->name : rt->u.iuse->name,
-				rt->prefix, ussd_code);
-			return rt;
-		}
-	}
-
-	LOGP(DSS, LOGL_DEBUG, "Could not find Route for USSD Code '%s'\n", ussd_code);
-	return NULL;
-}
-
-/***********************************************************************
- * handling functions for individual GSUP messages
- ***********************************************************************/
-
-#define LOGPSS(ss, lvl, fmt, args...) \
-	LOGP(DSS, lvl, "%s/0x%08x: " fmt, (ss)->imsi, (ss)->session_id, ## args)
-
-struct ss_session {
-	/* link us to hlr->ss_sessions */
-	struct llist_head list;
-	/* imsi of this session */
-	char imsi[GSM23003_IMSI_MAX_DIGITS+2];
-	/* ID of this session (unique per IMSI) */
-	uint32_t session_id;
-	/* state of the session */
-	enum osmo_gsup_session_state state;
-	/* time-out when we will delete the session */
-	struct osmo_timer_list timeout;
-
-	/* is this USSD for an external handler (EUSE): true */
-	bool is_external;
-	union {
-		/* external USSD Entity responsible for this session */
-		struct hlr_euse *euse;
-		/* internal USSD Entity responsible for this session */
-		const struct hlr_iuse *iuse;
-	} u;
-
-	/* we don't keep a pointer to the osmo_gsup_{route,conn} towards the MSC/VLR here,
-	 * as this might change during inter-VLR hand-over, and we simply look-up the serving MSC/VLR
-	 * every time we receive an USSD component from the EUSE */
-};
-
-struct ss_session *ss_session_find(struct hlr *hlr, const char *imsi, uint32_t session_id)
-{
-	struct ss_session *ss;
-	llist_for_each_entry(ss, &hlr->ss_sessions, list) {
-		if (!strcmp(ss->imsi, imsi) && ss->session_id == session_id)
-			return ss;
-	}
-	return NULL;
-}
-
-void ss_session_free(struct ss_session *ss)
-{
-	osmo_timer_del(&ss->timeout);
-	llist_del(&ss->list);
-	talloc_free(ss);
-}
-
-static void ss_session_timeout(void *data)
-{
-	struct ss_session *ss = data;
-
-	LOGPSS(ss, LOGL_NOTICE, "SS Session Timeout, destroying\n");
-	/* FIXME: should we send a ReturnError component to the MS? */
-	ss_session_free(ss);
-}
-
-struct ss_session *ss_session_alloc(struct hlr *hlr, const char *imsi, uint32_t session_id)
-{
-	struct ss_session *ss;
-
-	OSMO_ASSERT(!ss_session_find(hlr, imsi, session_id));
-
-	ss = talloc_zero(hlr, struct ss_session);
-	OSMO_ASSERT(ss);
-
-	OSMO_STRLCPY_ARRAY(ss->imsi, imsi);
-	ss->session_id = session_id;
-
-	/* Schedule self-destruction timer */
-	osmo_timer_setup(&ss->timeout, ss_session_timeout, ss);
-	if (g_hlr->ncss_guard_timeout > 0)
-		osmo_timer_schedule(&ss->timeout, g_hlr->ncss_guard_timeout, 0);
-
-	llist_add_tail(&ss->list, &hlr->ss_sessions);
-	return ss;
-}
-
-/***********************************************************************
- * handling functions for encoding SS messages + wrapping them in GSUP
- ***********************************************************************/
-
-static int ss_tx_to_ms(struct ss_session *ss, enum osmo_gsup_message_type gsup_msg_type,
-			bool final, struct msgb *ss_msg)
-
-{
-	struct osmo_gsup_message resp = {0};
-	struct msgb *resp_msg;
-
-	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);
-	}
-
-	resp_msg = gsm0480_msgb_alloc_name(__func__);
-	OSMO_ASSERT(resp_msg);
-	osmo_gsup_encode(resp_msg, &resp);
-	msgb_free(ss_msg);
-
-	/* FIXME: resolve this based on the database vlr_addr */
-	return osmo_gsup_addr_send(g_hlr->gs, (uint8_t *)"MSC-00-00-00-00-00-00", 22, resp_msg);
-}
-
-#if 0
-static int ss_tx_reject(struct ss_session *ss, int invoke_id, uint8_t problem_tag,
-			uint8_t problem_code)
-{
-	struct msgb *msg = gsm0480_gen_reject(invoke_id, problem_tag, problem_code);
-	LOGPSS(ss, LOGL_NOTICE, "Tx Reject(%u, 0x%02x, 0x%02x)\n", invoke_id,
-		problem_tag, problem_code);
-	OSMO_ASSERT(msg);
-	return ss_tx_to_ms(ss, OSMO_GSUP_MSGT_PROC_SS_RESULT, true, msg);
-}
-#endif
-
-static int ss_tx_error(struct ss_session *ss, uint8_t invoke_id, uint8_t error_code)
-{
-	struct msgb *msg = gsm0480_gen_return_error(invoke_id, error_code);
-	LOGPSS(ss, LOGL_NOTICE, "Tx ReturnError(%u, 0x%02x)\n", invoke_id, error_code);
-	OSMO_ASSERT(msg);
-	return ss_tx_to_ms(ss, OSMO_GSUP_MSGT_PROC_SS_RESULT, true, msg);
-}
-
-static int ss_tx_ussd_7bit(struct ss_session *ss, bool final, uint8_t invoke_id, const char *text)
-{
-	struct msgb *msg = gsm0480_gen_ussd_resp_7bit(invoke_id, text);
-	LOGPSS(ss, LOGL_INFO, "Tx USSD '%s'\n", text);
-	OSMO_ASSERT(msg);
-	return ss_tx_to_ms(ss, OSMO_GSUP_MSGT_PROC_SS_RESULT, final, msg);
-}
-
-/***********************************************************************
- * Internal USSD Handlers
- ***********************************************************************/
-
-#include "db.h"
-
-static int handle_ussd_own_msisdn(struct osmo_gsup_conn *conn, struct ss_session *ss,
-				  const struct osmo_gsup_message *gsup, const struct ss_request *req)
-{
-	struct hlr_subscriber subscr;
-	char buf[GSM0480_USSD_7BIT_STRING_LEN+1];
-	int rc;
-
-	rc = db_subscr_get_by_imsi(g_hlr->dbc, ss->imsi, &subscr);
-	switch (rc) {
-	case 0:
-		if (strlen(subscr.msisdn) == 0)
-			snprintf(buf, sizeof(buf), "You have no MSISDN!");
-		else
-			snprintf(buf, sizeof(buf), "Your extension is %s", subscr.msisdn);
-		ss_tx_ussd_7bit(ss, true, req->invoke_id, buf);
-		break;
-	case -ENOENT:
-		ss_tx_error(ss, true, GSM0480_ERR_CODE_UNKNOWN_SUBSCRIBER);
-		break;
-	case -EIO:
-	default:
-		ss_tx_error(ss, true, GSM0480_ERR_CODE_SYSTEM_FAILURE);
-		break;
-	}
-	return 0;
-}
-
-static int handle_ussd_own_imsi(struct osmo_gsup_conn *conn, struct ss_session *ss,
-				const struct osmo_gsup_message *gsup, const struct ss_request *req)
-{
-	char buf[GSM0480_USSD_7BIT_STRING_LEN+1];
-	snprintf(buf, sizeof(buf), "Your IMSI is %s", ss->imsi);
-	ss_tx_ussd_7bit(ss, true, req->invoke_id, buf);
-	return 0;
-}
-
-static int handle_ussd_get_ran(struct osmo_gsup_conn *conn, struct ss_session *ss,
-			       const struct osmo_gsup_message *gsup,
-			       const struct ss_request *req)
-{
-	struct hlr_subscriber subscr;
-	const char *response;
-	int rc;
-
-#define RAN_TYPE_DESC "Available RAN types: "
-
-	rc = db_subscr_get_by_imsi(g_hlr->dbc, ss->imsi, &subscr);
-	switch (rc) {
-	case 0:
-		if (subscr.rat_types[OSMO_RAT_GERAN_A] && subscr.rat_types[OSMO_RAT_UTRAN_IU])
-			response = RAN_TYPE_DESC "GERAN-A (2G) & UTRAN-Iu (3G)";
-		else if (subscr.rat_types[OSMO_RAT_GERAN_A])
-			response = RAN_TYPE_DESC "GERAN-A (2G)";
-		else if (subscr.rat_types[OSMO_RAT_UTRAN_IU])
-			response = RAN_TYPE_DESC "UTRAN-Iu (3G)";
-		else
-			response = "No RAN types available";
-
-		rc = ss_tx_ussd_7bit(ss, true, req->invoke_id, response);
-		break;
-	case -ENOENT:
-		rc = ss_tx_error(ss, true, GSM0480_ERR_CODE_UNKNOWN_SUBSCRIBER);
-		break;
-	case -EIO:
-	default:
-		rc = ss_tx_error(ss, true, GSM0480_ERR_CODE_SYSTEM_FAILURE);
-		break;
-	}
-
-	return rc;
-}
-
-static int handle_ussd_umts_on(struct osmo_gsup_conn *conn, struct ss_session *ss,
-			       const struct osmo_gsup_message *gsup,
-			       const struct ss_request *req)
-{
-	struct hlr_subscriber subscr;
-	int rc;
-
-	rc = db_subscr_get_by_imsi(g_hlr->dbc, ss->imsi, &subscr);
-	switch (rc) {
-	case 0:
-		hlr_subscr_rat_flag(g_hlr, &subscr, OSMO_RAT_UTRAN_IU, true);
-		rc = ss_tx_ussd_7bit(ss, true, req->invoke_id,
-			"Enabled UTRAN-Iu (3G)");
-		break;
-	case -ENOENT:
-		rc = ss_tx_error(ss, true, GSM0480_ERR_CODE_UNKNOWN_SUBSCRIBER);
-		break;
-	case -EIO:
-	default:
-		rc = ss_tx_error(ss, true, GSM0480_ERR_CODE_SYSTEM_FAILURE);
-		break;
-	}
-
-	return rc;
-}
-
-static int handle_ussd_umts_off(struct osmo_gsup_conn *conn, struct ss_session *ss,
-				const struct osmo_gsup_message *gsup,
-				const struct ss_request *req)
-{
-	struct hlr_subscriber subscr;
-	int rc;
-
-	rc = db_subscr_get_by_imsi(g_hlr->dbc, ss->imsi, &subscr);
-	switch (rc) {
-	case 0:
-		hlr_subscr_rat_flag(g_hlr, &subscr, OSMO_RAT_UTRAN_IU, false);
-		rc = ss_tx_ussd_7bit(ss, true, req->invoke_id,
-			"Disabled UTRAN-Iu (3G)");
-		break;
-	case -ENOENT:
-		rc = ss_tx_error(ss, true, GSM0480_ERR_CODE_UNKNOWN_SUBSCRIBER);
-		break;
-	case -EIO:
-	default:
-		rc = ss_tx_error(ss, true, GSM0480_ERR_CODE_SYSTEM_FAILURE);
-		break;
-	}
-
-	return rc;
-}
-
-static const struct hlr_iuse hlr_iuses[] = {
-	{
-		.name = "own-msisdn",
-		.handle_ussd = handle_ussd_own_msisdn,
-	},
-	{
-		.name = "own-imsi",
-		.handle_ussd = handle_ussd_own_imsi,
-	},
-	{
-		.name = "get-ran",
-		.handle_ussd = handle_ussd_get_ran,
-	},
-	{
-		.name = "umts-on",
-		.handle_ussd = handle_ussd_umts_on,
-	},
-	{
-		.name = "umts-off",
-		.handle_ussd = handle_ussd_umts_off,
-	},
-};
-
-const struct hlr_iuse *iuse_find(const char *name)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(hlr_iuses); i++) {
-		const struct hlr_iuse *iuse = &hlr_iuses[i];
-		if (!strcmp(name, iuse->name))
-			return iuse;
-	}
-	return NULL;
-}
-
-
-/***********************************************************************
- * handling functions for individual GSUP messages
- ***********************************************************************/
-
-static bool ss_op_is_ussd(uint8_t opcode)
-{
-	switch (opcode) {
-	case GSM0480_OP_CODE_PROCESS_USS_DATA:
-	case GSM0480_OP_CODE_PROCESS_USS_REQ:
-	case GSM0480_OP_CODE_USS_REQUEST:
-	case GSM0480_OP_CODE_USS_NOTIFY:
-		return true;
-	default:
-		return false;
-	}
-}
-
-/* is this GSUP connection an EUSE (true) or not (false)? */
-static bool conn_is_euse(struct osmo_gsup_conn *conn)
-{
-	int rc;
-	uint8_t *addr;
-
-	rc = osmo_gsup_conn_ccm_get(conn, &addr, IPAC_IDTAG_SERNR);
-	if (rc <= 5)
-		return false;
-	if (!strncmp((char *)addr, "EUSE-", 5))
-		return true;
-	else
-		return false;
-}
-
-static struct hlr_euse *euse_by_conn(struct osmo_gsup_conn *conn)
-{
-	int rc;
-	char *addr;
-	struct hlr *hlr = conn->server->priv;
-
-	rc = osmo_gsup_conn_ccm_get(conn, (uint8_t **) &addr, IPAC_IDTAG_SERNR);
-	if (rc <= 5)
-		return NULL;
-	if (strncmp(addr, "EUSE-", 5))
-		return NULL;
-
-	return euse_find(hlr, addr+5);
-}
-
-static int handle_ss(struct ss_session *ss, const struct osmo_gsup_message *gsup,
-			const struct ss_request *req)
-{
-	uint8_t comp_type = gsup->ss_info[0];
-
-	LOGPSS(ss, LOGL_INFO, "SS CompType=%s, OpCode=%s\n",
-		gsm0480_comp_type_name(comp_type), gsm0480_op_code_name(req->opcode));
-
-	/**
-	 * FIXME: As we don't store any SS related information
-	 * (e.g. call forwarding preferences) in the database,
-	 * we don't handle "structured" SS requests at all.
-	 */
-	LOGPSS(ss, LOGL_NOTICE, "Structured SS requests are not supported, rejecting...\n");
-	ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_FACILITY_NOT_SUPPORTED);
-	return -ENOTSUP;
-}
-
-/* Handle a USSD GSUP message for a given SS Session received from VLR or EUSE */
-static int handle_ussd(struct osmo_gsup_conn *conn, struct ss_session *ss,
-			const struct osmo_gsup_message *gsup, const struct ss_request *req)
-{
-	uint8_t comp_type = gsup->ss_info[0];
-	struct msgb *msg_out;
-	bool is_euse_originated = conn_is_euse(conn);
-
-	LOGPSS(ss, LOGL_INFO, "USSD CompType=%s, OpCode=%s '%s'\n",
-		gsm0480_comp_type_name(comp_type), gsm0480_op_code_name(req->opcode),
-		req->ussd_text);
-
-	if ((ss->is_external && !ss->u.euse) || !ss->u.iuse) {
-		LOGPSS(ss, LOGL_NOTICE, "USSD for unknown code '%s'\n", req->ussd_text);
-		ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SS_NOT_AVAILABLE);
-		return 0;
-	}
-
-	if (is_euse_originated) {
-		msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");
-		OSMO_ASSERT(msg_out);
-		/* Received from EUSE, Forward to VLR */
-		osmo_gsup_encode(msg_out, gsup);
-		/* FIXME: resolve this based on the database vlr_addr */
-		osmo_gsup_addr_send(conn->server, (uint8_t *)"MSC-00-00-00-00-00-00", 22, msg_out);
-	} else {
-		/* Received from VLR (MS) */
-		if (ss->is_external) {
-			/* Forward to EUSE */
-			char addr[128];
-			strcpy(addr, "EUSE-");
-			osmo_strlcpy(addr+5, ss->u.euse->name, sizeof(addr)-5);
-			conn = gsup_route_find(conn->server, (uint8_t *)addr, strlen(addr)+1);
-			if (!conn) {
-				LOGPSS(ss, LOGL_ERROR, "Cannot find conn for EUSE %s\n", addr);
-				ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SYSTEM_FAILURE);
-			} else {
-				msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");
-				OSMO_ASSERT(msg_out);
-				osmo_gsup_encode(msg_out, gsup);
-				osmo_gsup_conn_send(conn, msg_out);
-			}
-		} else {
-			/* Handle internally */
-			ss->u.iuse->handle_ussd(conn, ss, gsup, req);
-			/* Release session immediately */
-			ss_session_free(ss);
-		}
-	}
-
-	return 0;
-}
-
-
-/* this function is called for any SS_REQ/SS_RESP messages from both the MSC/VLR side as well
- * as from the EUSE side */
-int rx_proc_ss_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup)
-{
-	struct hlr *hlr = conn->server->priv;
-	struct ss_session *ss;
-	struct ss_request req = {0};
-
-	LOGP(DSS, LOGL_DEBUG, "%s/0x%08x: Process SS (%s)\n", gsup->imsi, gsup->session_id,
-		osmo_gsup_session_state_name(gsup->session_state));
-
-	/* decode and find out what kind of SS message it is */
-	if (gsup->ss_info && gsup->ss_info_len) {
-		if (gsm0480_parse_facility_ie(gsup->ss_info, gsup->ss_info_len, &req)) {
-			LOGP(DSS, LOGL_ERROR, "%s/0x%082x: Unable to parse SS request: %s\n",
-				gsup->imsi, gsup->session_id,
-				osmo_hexdump(gsup->ss_info, gsup->ss_info_len));
-			/* FIXME: Send a Reject component? */
-			goto out_err;
-		}
-	}
-
-	switch (gsup->session_state) {
-	case OSMO_GSUP_SESSION_STATE_BEGIN:
-		/* Check for overlapping Session ID usage */
-		if (ss_session_find(hlr, gsup->imsi, gsup->session_id)) {
-			LOGP(DSS, LOGL_ERROR, "%s/0x%08x: BEGIN with non-unique session ID!\n",
-				gsup->imsi, gsup->session_id);
-			goto out_err;
-		}
-		ss = ss_session_alloc(hlr, gsup->imsi, gsup->session_id);
-		if (!ss) {
-			LOGP(DSS, LOGL_ERROR, "%s/0x%08x: Unable to allocate SS session\n",
-				gsup->imsi, gsup->session_id);
-			goto out_err;
-		}
-		if (ss_op_is_ussd(req.opcode)) {
-			if (conn_is_euse(conn)) {
-				/* EUSE->VLR: MT USSD. EUSE is known ('conn'), VLR is to be resolved */
-				ss->u.euse = euse_by_conn(conn);
-			} else {
-				/* VLR->EUSE: MO USSD. VLR is known ('conn'), EUSE is to be resolved */
-				struct hlr_ussd_route *rt;
-				rt = ussd_route_lookup_7bit(hlr, (const char *) req.ussd_text);
-				if (rt) {
-					if (rt->is_external) {
-						ss->is_external = true;
-						ss->u.euse = rt->u.euse;
-					} else if (rt) {
-						ss->is_external = false;
-						ss->u.iuse = rt->u.iuse;
-					}
-				} else {
-					if (hlr->euse_default) {
-						ss->is_external = true;
-						ss->u.euse = hlr->euse_default;
-					}
-				}
-			}
-			/* dispatch unstructured SS to routing */
-			handle_ussd(conn, ss, gsup, &req);
-		} else {
-			/* dispatch non-call SS to internal code */
-			handle_ss(ss, gsup, &req);
-		}
-		break;
-	case OSMO_GSUP_SESSION_STATE_CONTINUE:
-		ss = ss_session_find(hlr, gsup->imsi, gsup->session_id);
-		if (!ss) {
-			LOGP(DSS, LOGL_ERROR, "%s/0x%08x: CONTINUE for unknown SS session\n",
-				gsup->imsi, gsup->session_id);
-			goto out_err;
-		}
-
-		/* Reschedule self-destruction timer */
-		if (g_hlr->ncss_guard_timeout > 0)
-			osmo_timer_schedule(&ss->timeout, g_hlr->ncss_guard_timeout, 0);
-
-		if (ss_op_is_ussd(req.opcode)) {
-			/* dispatch unstructured SS to routing */
-			handle_ussd(conn, ss, gsup, &req);
-		} else {
-			/* dispatch non-call SS to internal code */
-			handle_ss(ss, gsup, &req);
-		}
-		break;
-	case OSMO_GSUP_SESSION_STATE_END:
-		ss = ss_session_find(hlr, gsup->imsi, gsup->session_id);
-		if (!ss) {
-			LOGP(DSS, LOGL_ERROR, "%s/0x%08x: END for unknown SS session\n",
-				gsup->imsi, gsup->session_id);
-			goto out_err;
-		}
-		if (ss_op_is_ussd(req.opcode)) {
-			/* dispatch unstructured SS to routing */
-			handle_ussd(conn, ss, gsup, &req);
-		} else {
-			/* dispatch non-call SS to internal code */
-			handle_ss(ss, gsup, &req);
-		}
-		ss_session_free(ss);
-		break;
-	default:
-		LOGP(DSS, LOGL_ERROR, "%s/0x%08x: Unknown SS State %d\n", gsup->imsi,
-			gsup->session_id, gsup->session_state);
-		goto out_err;
-	}
-
-	return 0;
-
-out_err:
-	return 0;
-}
-
-int rx_proc_ss_error(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup)
-{
-	LOGP(DSS, LOGL_NOTICE, "%s/0x%08x: Process SS ERROR (%s)\n", gsup->imsi, gsup->session_id,
-		osmo_gsup_session_state_name(gsup->session_state));
-	return 0;
-}

src/hlr_ussd.h

@@ -1,61 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/gsm/gsup.h>
-
-#include "gsup_server.h"
-
-#define NCSS_GUARD_TIMEOUT_DEFAULT 30
-
-struct hlr_ussd_route {
-	/* g_hlr.routes */
-	struct llist_head list;
-	const char *prefix;
-	bool is_external;
-	union {
-		struct hlr_euse *euse;
-		const struct hlr_iuse *iuse;
-	} u;
-};
-
-struct hlr_euse {
-	/* list in the per-hlr list of EUSEs */
-	struct llist_head list;
-	struct hlr *hlr;
-	/* name (must match the IPA ID tag) */
-	const char *name;
-	/* human-readable description */
-	const char *description;
-
-	/* GSUP connection to the EUSE, if any */
-	struct osmo_gsup_conn *conn;
-};
-
-struct hlr_euse *euse_find(struct hlr *hlr, const char *name);
-struct hlr_euse *euse_alloc(struct hlr *hlr, const char *name);
-void euse_del(struct hlr_euse *euse);
-
-const struct hlr_iuse *iuse_find(const char *name);
-
-struct hlr_ussd_route *ussd_route_find_prefix(struct hlr *hlr, const char *prefix);
-struct hlr_ussd_route *ussd_route_prefix_alloc_int(struct hlr *hlr, const char *prefix,
-						   const struct hlr_iuse *iuse);
-struct hlr_ussd_route *ussd_route_prefix_alloc_ext(struct hlr *hlr, const char *prefix,
-						   struct hlr_euse *euse);
-void ussd_route_del(struct hlr_ussd_route *rt);
-
-int rx_proc_ss_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup);
-int rx_proc_ss_error(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup);
-
-struct ss_session;
-struct ss_request;
-
-/* Internal USSD Handler */
-struct hlr_iuse {
-	const char *name;
-	/* call-back to be called for any incoming USSD messages for this IUSE */
-	int (*handle_ussd)(struct osmo_gsup_conn *conn, struct ss_session *ss,
-			   const struct osmo_gsup_message *gsup, const struct ss_request *req);
-};

src/hlr_vty.c

@@ -1,14 +1,9 @@
 /* OsmoHLR VTY implementation */
 
 /* (C) 2016 sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
  * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
- * (C) 2018 Harald Welte <laforge@gnumonks.org>
- *
- * All Rights Reserved
- *
- * (C) 2018 Harald Welte <laforge@gnumonks.org>
- *
- * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -29,14 +24,11 @@
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/logging.h>
-#include <osmocom/vty/misc.h>
-#include <osmocom/abis/ipa.h>
 
-#include "hlr.h"
 #include "hlr_vty.h"
 #include "hlr_vty_subscr.h"
-#include "hlr_ussd.h"
-#include "gsup_server.h"
+
+static struct hlr *g_hlr = NULL;
 
 struct cmd_node hlr_node = {
 	HLR_NODE,
@@ -82,33 +74,6 @@ static int config_write_hlr_gsup(struct vty *vty)
 	return CMD_SUCCESS;
 }
 
-static void show_one_conn(struct vty *vty, const struct osmo_gsup_conn *conn)
-{
-	const struct ipa_server_conn *isc = conn->conn;
-	char *name;
-	int rc;
-
-	rc = osmo_gsup_conn_ccm_get(conn, (uint8_t **) &name, IPAC_IDTAG_SERNR);
-	OSMO_ASSERT(rc);
-
-	vty_out(vty, " '%s' from %s:%5u, CS=%u, PS=%u, 3G_IND=%u%s",
-		name, isc->addr, isc->port, conn->supports_cs, conn->supports_ps, conn->auc_3g_ind,
-		VTY_NEWLINE);
-}
-
-DEFUN(show_gsup_conn, show_gsup_conn_cmd,
-	"show gsup-connections",
-	SHOW_STR "GSUP Connections from VLRs, SGSNs, EUSEs\n")
-{
-	struct osmo_gsup_server *gs = g_hlr->gs;
-	struct osmo_gsup_conn *conn;
-
-	llist_for_each_entry(conn, &gs->clients, list)
-		show_one_conn(vty, conn);
-
-	return CMD_SUCCESS;
-}
-
 DEFUN(cfg_hlr_gsup_bind_ip,
       cfg_hlr_gsup_bind_ip_cmd,
       "bind ip A.B.C.D",
@@ -123,203 +88,12 @@ DEFUN(cfg_hlr_gsup_bind_ip,
 	return CMD_SUCCESS;
 }
 
-/***********************************************************************
- * USSD Entity
- ***********************************************************************/
-
-#include "hlr_ussd.h"
-
-#define USSD_STR "USSD Configuration\n"
-#define UROUTE_STR "Routing Configuration\n"
-#define PREFIX_STR "Prefix-Matching Route\n" "USSD Prefix\n"
-
-#define INT_CHOICE "(own-msisdn|own-imsi|get-ran|umts-on|umts-off)"
-#define INT_STR "Internal USSD Handler\n" \
-		"Respond with subscribers' own MSISDN\n" \
-		"Respond with subscribers' own IMSI\n" \
-		"Respond with available RAN types\n" \
-		"Enable UMTS service\n" \
-		"Disable UMTS service\n"
-
-#define EXT_STR "External USSD Handler\n" \
-		"Name of External USSD Handler (IPA CCM ID)\n"
-
-DEFUN(cfg_ussd_route_pfx_int, cfg_ussd_route_pfx_int_cmd,
-	"ussd route prefix PREFIX internal " INT_CHOICE,
-	USSD_STR UROUTE_STR PREFIX_STR INT_STR)
-{
-	const struct hlr_iuse *iuse = iuse_find(argv[1]);
-	struct hlr_ussd_route *rt = ussd_route_find_prefix(g_hlr, argv[0]);
-	if (rt) {
-		vty_out(vty, "%% Cannot add [another?] route for prefix %s%s", argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	ussd_route_prefix_alloc_int(g_hlr, argv[0], iuse);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_ussd_route_pfx_ext, cfg_ussd_route_pfx_ext_cmd,
-	"ussd route prefix PREFIX external EUSE",
-	USSD_STR UROUTE_STR PREFIX_STR EXT_STR)
-{
-	struct hlr_euse *euse = euse_find(g_hlr, argv[1]);
-	struct hlr_ussd_route *rt = ussd_route_find_prefix(g_hlr, argv[0]);
-	if (rt) {
-		vty_out(vty, "%% Cannot add [another?] route for prefix %s%s", argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	if (!euse) {
-		vty_out(vty, "%% Cannot find euse '%s'%s", argv[1], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	ussd_route_prefix_alloc_ext(g_hlr, argv[0], euse);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_ussd_no_route_pfx, cfg_ussd_no_route_pfx_cmd,
-	"no ussd route prefix PREFIX",
-	NO_STR USSD_STR UROUTE_STR PREFIX_STR)
-{
-	struct hlr_ussd_route *rt = ussd_route_find_prefix(g_hlr, argv[0]);
-	if (!rt) {
-		vty_out(vty, "%% Cannot find route for prefix %s%s", argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	ussd_route_del(rt);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_ussd_defaultroute, cfg_ussd_defaultroute_cmd,
-	"ussd default-route external EUSE",
-	USSD_STR "Configure default-route for all USSD to unknown destinations\n"
-	EXT_STR)
-{
-	struct hlr_euse *euse;
-
-	euse = euse_find(g_hlr, argv[0]);
-	if (!euse) {
-		vty_out(vty, "%% Cannot find EUSE %s%s", argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-
-	if (g_hlr->euse_default != euse) {
-		vty_out(vty, "Switching default route from %s to %s%s",
-			g_hlr->euse_default ? g_hlr->euse_default->name : "<none>",
-			euse->name, VTY_NEWLINE);
-		g_hlr->euse_default = euse;
-	}
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_ussd_no_defaultroute, cfg_ussd_no_defaultroute_cmd,
-	"no ussd default-route",
-	NO_STR USSD_STR "Remove the default-route for all USSD to unknown destinations\n")
-{
-	g_hlr->euse_default = NULL;
-
-	return CMD_SUCCESS;
-}
-
-struct cmd_node euse_node = {
-	EUSE_NODE,
-	"%s(config-hlr-euse)# ",
-	1,
-};
-
-DEFUN(cfg_euse, cfg_euse_cmd,
-	"euse NAME",
-	"Configure a particular External USSD Entity\n"
-	"Alphanumeric name of the External USSD Entity\n")
-{
-	struct hlr_euse *euse;
-	const char *id = argv[0];
-
-	euse = euse_find(g_hlr, id);
-	if (!euse) {
-		euse = euse_alloc(g_hlr, id);
-		if (!euse)
-			return CMD_WARNING;
-	}
-	vty->index = euse;
-	vty->index_sub = &euse->description;
-	vty->node = EUSE_NODE;
-
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_no_euse, cfg_no_euse_cmd,
-	"no euse NAME",
-	NO_STR "Remove a particular External USSD Entity\n"
-	"Alphanumeric name of the External USSD Entity\n")
-{
-	struct hlr_euse *euse = euse_find(g_hlr, argv[0]);
-	if (!euse) {
-		vty_out(vty, "%% Cannot remove non-existant EUSE %s%s", argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	if (g_hlr->euse_default == euse) {
-		vty_out(vty, "%% Cannot remove EUSE %s, it is the default route%s", argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	euse_del(euse);
-	return CMD_SUCCESS;
-}
-
-static void dump_one_euse(struct vty *vty, struct hlr_euse *euse)
-{
-	vty_out(vty, " euse %s%s", euse->name, VTY_NEWLINE);
-}
-
-static int config_write_euse(struct vty *vty)
-{
-	struct hlr_euse *euse;
-	struct hlr_ussd_route *rt;
-
-	llist_for_each_entry(euse, &g_hlr->euse_list, list)
-		dump_one_euse(vty, euse);
-
-	llist_for_each_entry(rt, &g_hlr->ussd_routes, list) {
-		vty_out(vty, " ussd route prefix %s %s %s%s", rt->prefix,
-			rt->is_external ? "external" : "internal",
-			rt->is_external ? rt->u.euse->name : rt->u.iuse->name,
-			VTY_NEWLINE);
-	}
-
-	if (g_hlr->euse_default)
-		vty_out(vty, " ussd default-route external %s%s", g_hlr->euse_default->name, VTY_NEWLINE);
-
-	if (g_hlr->ncss_guard_timeout != NCSS_GUARD_TIMEOUT_DEFAULT)
-		vty_out(vty, " ncss-guard-timeout %i%s",
-			g_hlr->ncss_guard_timeout, VTY_NEWLINE);
-
-	return 0;
-}
-
-DEFUN(cfg_ncss_guard_timeout, cfg_ncss_guard_timeout_cmd,
-	"ncss-guard-timeout <0-255>",
-	"Set guard timer for NCSS (call independent SS) session activity\n"
-	"Guard timer value (sec.), or 0 to disable")
-{
-	g_hlr->ncss_guard_timeout = atoi(argv[0]);
-	return CMD_SUCCESS;
-}
-
-/***********************************************************************
- * Common Code
- ***********************************************************************/
-
 int hlr_vty_go_parent(struct vty *vty)
 {
 	switch (vty->node) {
 	case GSUP_NODE:
-	case EUSE_NODE:
 		vty->node = HLR_NODE;
 		vty->index = NULL;
-		vty->index_sub = NULL;
 		break;
 	default:
 	case HLR_NODE:
@@ -347,30 +121,21 @@ int hlr_vty_is_config_node(struct vty *vty, int node)
 	}
 }
 
-void hlr_vty_init(const struct log_info *cat)
+void hlr_vty_init(struct hlr *hlr, const struct log_info *cat)
 {
-	logging_vty_add_cmds(cat);
-	osmo_talloc_vty_add_cmds();
+	g_hlr = hlr;
 
-	install_element_ve(&show_gsup_conn_cmd);
+	logging_vty_add_cmds(cat);
 
 	install_element(CONFIG_NODE, &cfg_hlr_cmd);
 	install_node(&hlr_node, config_write_hlr);
+	install_default(HLR_NODE);
 
 	install_element(HLR_NODE, &cfg_gsup_cmd);
 	install_node(&gsup_node, config_write_hlr_gsup);
+	install_default(GSUP_NODE);
 
 	install_element(GSUP_NODE, &cfg_hlr_gsup_bind_ip_cmd);
 
-	install_element(HLR_NODE, &cfg_euse_cmd);
-	install_element(HLR_NODE, &cfg_no_euse_cmd);
-	install_node(&euse_node, config_write_euse);
-	install_element(HLR_NODE, &cfg_ussd_route_pfx_int_cmd);
-	install_element(HLR_NODE, &cfg_ussd_route_pfx_ext_cmd);
-	install_element(HLR_NODE, &cfg_ussd_no_route_pfx_cmd);
-	install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd);
-	install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd);
-	install_element(HLR_NODE, &cfg_ncss_guard_timeout_cmd);
-
-	hlr_vty_subscriber_init();
+	hlr_vty_subscriber_init(hlr);
 }

src/hlr_vty.h

@@ -30,9 +30,8 @@
 enum hlr_vty_node {
 	HLR_NODE = _LAST_OSMOVTY_NODE + 1,
 	GSUP_NODE,
-	EUSE_NODE,
 };
 
 int hlr_vty_is_config_node(struct vty *vty, int node);
 int hlr_vty_go_parent(struct vty *vty);
-void hlr_vty_init(const struct log_info *cat);
+void hlr_vty_init(struct hlr *hlr, const struct log_info *cat);

src/hlr_vty_subscr.c

@@ -20,14 +20,11 @@
 #include <inttypes.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <time.h>
 
 #include <osmocom/gsm/gsm23003.h>
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 #include <osmocom/core/utils.h>
-#include <osmocom/gsm/gsm_utils.h>
 
 #include "hlr.h"
 #include "db.h"
@@ -36,21 +33,11 @@ struct vty;
 
 #define hexdump_buf(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf))
 
-static char *get_datestr(const time_t *t)
-{
-	static char buf[32];
-	struct tm tm;
-
-	tm = *gmtime(t);
-
-	strftime(buf, sizeof(buf), "%FT%T+00:00", &tm);
-	return buf;
-}
+static struct hlr *g_hlr = NULL;
 
 static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr)
 {
 	int rc;
-	int i;
 	struct osmo_sub_auth_data aud2g;
 	struct osmo_sub_auth_data aud3g;
 
@@ -78,14 +65,6 @@ static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr)
 		vty_out(vty, "    PS disabled%s", VTY_NEWLINE);
 	if (subscr->ms_purged_ps)
 		vty_out(vty, "    PS purged%s", VTY_NEWLINE);
-	if (subscr->last_lu_seen)
-		vty_out(vty, "    last LU seen: %s%s", get_datestr(&subscr->last_lu_seen), VTY_NEWLINE);
-	for (i = OSMO_RAT_UNKNOWN + 1; i < ARRAY_SIZE(subscr->rat_types); i++) {
-		vty_out(vty, "    %s: %s%s", osmo_rat_type_name(i), subscr->rat_types[i] ? "allowed" : "forbidden",
-			VTY_NEWLINE);
-	}
-	if (subscr->ms_purged_cs)
-		vty_out(vty, "    CS purged%s", VTY_NEWLINE);
 
 	if (!*subscr->imsi)
 		return;
@@ -93,17 +72,14 @@ static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr)
 	OSMO_ASSERT(g_hlr);
 	rc = db_get_auth_data(g_hlr->dbc, subscr->imsi, &aud2g, &aud3g, NULL);
 
-	switch (rc) {
-	case 0:
-		break;
-	case -ENOENT:
-	case -ENOKEY:
-		aud2g.algo = OSMO_AUTH_ALG_NONE;
-		aud3g.algo = OSMO_AUTH_ALG_NONE;
-		break;
-	default:
-		vty_out(vty, "%% Error retrieving data from database (%d)%s", rc, VTY_NEWLINE);
-		return;
+	if (rc) {
+		if (rc == -ENOENT) {
+			aud2g.algo = OSMO_AUTH_ALG_NONE;
+			aud3g.algo = OSMO_AUTH_ALG_NONE;
+		} else {
+			vty_out(vty, "%% Error retrieving data from database (%d)%s", rc, VTY_NEWLINE);
+			return;
+		}
 	}
 
 	if (aud2g.type != OSMO_AUTH_TYPE_NONE && aud2g.type != OSMO_AUTH_TYPE_GSM) {
@@ -153,19 +129,18 @@ static int get_subscr_by_argv(struct vty *vty, const char *type, const char *id,
 #define SUBSCR_CMD "subscriber "
 #define SUBSCR_CMD_HELP "Subscriber management commands\n"
 
-#define SUBSCR_ID "(imsi|msisdn|id) IDENT"
+#define SUBSCR_ID "(imsi|msisdn|id) IDENT "
 #define SUBSCR_ID_HELP \
 	"Identify subscriber by IMSI\n" \
 	"Identify subscriber by MSISDN (phone number)\n" \
 	"Identify subscriber by database ID\n" \
 	"IMSI/MSISDN/ID of the subscriber\n"
 
-#define SUBSCR 		SUBSCR_CMD SUBSCR_ID " "
+#define SUBSCR 		SUBSCR_CMD SUBSCR_ID
 #define SUBSCR_HELP	SUBSCR_CMD_HELP SUBSCR_ID_HELP
 
 #define SUBSCR_UPDATE		SUBSCR "update "
 #define SUBSCR_UPDATE_HELP	SUBSCR_HELP "Set or update subscriber data\n"
-#define SUBSCR_MSISDN_HELP	"Set MSISDN (phone number) of the subscriber\n"
 
 DEFUN(subscriber_show,
       subscriber_show_cmd,
@@ -183,17 +158,12 @@ DEFUN(subscriber_show,
 	return CMD_SUCCESS;
 }
 
-ALIAS(subscriber_show, show_subscriber_cmd,
-      "show " SUBSCR_CMD SUBSCR_ID,
-      SHOW_STR SUBSCR_CMD_HELP SUBSCR_ID_HELP);
-
 DEFUN(subscriber_create,
       subscriber_create_cmd,
       SUBSCR_CMD "imsi IDENT create",
       SUBSCR_CMD_HELP
-      "Identify subscriber by IMSI\n"
-      "IMSI/MSISDN/ID of the subscriber\n"
-      "Create subscriber by IMSI\n")
+      "Create subscriber by IMSI\n"
+      "IMSI/MSISDN/ID of the subscriber\n")
 {
 	int rc;
 	struct hlr_subscriber subscr;
@@ -252,9 +222,9 @@ DEFUN(subscriber_delete,
 
 DEFUN(subscriber_msisdn,
       subscriber_msisdn_cmd,
-      SUBSCR_UPDATE "msisdn (none|MSISDN)",
-      SUBSCR_UPDATE_HELP SUBSCR_MSISDN_HELP
-      "Remove MSISDN (phone number)\n"
+      SUBSCR_UPDATE "msisdn MSISDN",
+      SUBSCR_UPDATE_HELP
+      "Set MSISDN (phone number) of the subscriber\n"
       "New MSISDN (phone number)\n")
 {
 	struct hlr_subscriber subscr;
@@ -262,19 +232,15 @@ DEFUN(subscriber_msisdn,
 	const char *id = argv[1];
 	const char *msisdn = argv[2];
 
-	if (strcmp(msisdn, "none") == 0)
-		msisdn = NULL;
-	else {
-		if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) {
-			vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s",
-				sizeof(subscr.msisdn)-1, VTY_NEWLINE);
-			return CMD_WARNING;
-		}
+	if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) {
+		vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s",
+			sizeof(subscr.msisdn)-1, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-		if (!osmo_msisdn_str_valid(msisdn)) {
-			vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE);
-			return CMD_WARNING;
-		}
+	if (!osmo_msisdn_str_valid(msisdn)) {
+		vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE);
+		return CMD_WARNING;
 	}
 
 	if (get_subscr_by_argv(vty, id_type, id, &subscr))
@@ -286,19 +252,8 @@ DEFUN(subscriber_msisdn,
 		return CMD_WARNING;
 	}
 
-	if (msisdn) {
-		vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s",
-			subscr.imsi, msisdn, VTY_NEWLINE);
-
-		if (db_subscr_get_by_msisdn(g_hlr->dbc, msisdn, &subscr) == 0)
-			osmo_hlr_subscriber_update_notify(&subscr);
-	} else {
-		vty_out(vty, "%% Updated subscriber IMSI='%s': removed MSISDN%s",
-			subscr.imsi, VTY_NEWLINE);
-
-		osmo_hlr_subscriber_update_notify(&subscr);
-	}
-
+	vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s",
+		subscr.imsi, msisdn, VTY_NEWLINE);
 	return CMD_SUCCESS;
 }
 
@@ -376,7 +331,7 @@ DEFUN(subscriber_no_aud2g,
 
 	rc = db_subscr_update_aud_by_id(g_hlr->dbc, subscr.id, &aud);
 
-	if (rc && rc != -ENOENT) {
+	if (rc) {
 		vty_out(vty, "%% Error: cannot disable 2G auth data for IMSI='%s'%s",
 			subscr.imsi, VTY_NEWLINE);
 		return CMD_WARNING;
@@ -447,7 +402,7 @@ DEFUN(subscriber_no_aud3g,
 
 	rc = db_subscr_update_aud_by_id(g_hlr->dbc, subscr.id, &aud);
 
-	if (rc && rc != -ENOENT) {
+	if (rc) {
 		vty_out(vty, "%% Error: cannot disable 3G auth data for IMSI='%s'%s",
 			subscr.imsi, VTY_NEWLINE);
 		return CMD_WARNING;
@@ -514,49 +469,11 @@ DEFUN(subscriber_aud3g,
 	return CMD_SUCCESS;
 }
 
-DEFUN(subscriber_rat,
-      subscriber_rat_cmd,
-      SUBSCR_UPDATE "rat (geran-a|utran-iu) (allowed|forbidden)",
-      SUBSCR_UPDATE_HELP
-      "Allow or forbid specific Radio Access Types\n"
-      "Set access to GERAN-A\n"
-      "Set access to UTRAN-Iu\n"
-      "Allow access\n"
-      "Forbid access\n")
+void hlr_vty_subscriber_init(struct hlr *hlr)
 {
-	struct hlr_subscriber subscr;
-	const char *id_type = argv[0];
-	const char *id = argv[1];
-	const char *rat_str = argv[2];
-	const char *allowed_forbidden = argv[3];
-	enum osmo_rat_type rat;
-	bool allowed;
-	int rc;
+	g_hlr = hlr;
 
-	if (strcmp(rat_str, "geran-a") == 0)
-		rat = OSMO_RAT_GERAN_A;
-	else if (strcmp(rat_str, "utran-iu") == 0)
-		rat = OSMO_RAT_UTRAN_IU;
-
-	allowed = (strcmp(allowed_forbidden, "allowed") == 0);
-
-	if (get_subscr_by_argv(vty, id_type, id, &subscr))
-		return CMD_WARNING;
-
-	rc = hlr_subscr_rat_flag(g_hlr, &subscr, rat, allowed);
-
-	if (rc && rc != -ENOEXEC) {
-		vty_out(vty, "%% Error: cannot set %s to %s%s",
-			osmo_rat_type_name(rat), allowed ? "allowed" : "forbidden", VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	return CMD_SUCCESS;
-}
-
-void hlr_vty_subscriber_init(void)
-{
 	install_element_ve(&subscriber_show_cmd);
-	install_element_ve(&show_subscriber_cmd);
 	install_element(ENABLE_NODE, &subscriber_create_cmd);
 	install_element(ENABLE_NODE, &subscriber_delete_cmd);
 	install_element(ENABLE_NODE, &subscriber_msisdn_cmd);
@@ -564,5 +481,4 @@ void hlr_vty_subscriber_init(void)
 	install_element(ENABLE_NODE, &subscriber_aud2g_cmd);
 	install_element(ENABLE_NODE, &subscriber_no_aud3g_cmd);
 	install_element(ENABLE_NODE, &subscriber_aud3g_cmd);
-	install_element(ENABLE_NODE, &subscriber_rat_cmd);
 }

src/hlr_vty_subscr.h

@@ -1,3 +1,3 @@
 #pragma once
 
-void hlr_vty_subscriber_init(void);
+void hlr_vty_subscriber_init(struct hlr *hlr);

src/logging.c

@@ -5,27 +5,20 @@ const struct log_info_cat hlr_log_info_cat[] = {
 	[DMAIN] = {
 		.name = "DMAIN",
 		.description = "Main Program",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
+		.enabled = 1, .loglevel = LOGL_DEBUG,
 	},
 	[DDB] = {
 		.name = "DDB",
 		.description = "Database Layer",
 		.color = "\033[1;31m",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
+		.enabled = 1, .loglevel = LOGL_DEBUG,
 	},
 	[DAUC] = {
 		.name = "DAUC",
 		.description = "Authentication Center",
 		.color = "\033[1;33m",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
+		.enabled = 1, .loglevel = LOGL_DEBUG,
 	},
-	[DSS] = {
-		.name = "DSS",
-		.description = "Supplementary Services",
-		.color = "\033[1;34m",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
-
 };
 
 const struct log_info hlr_log_info = {

src/logging.h

@@ -7,7 +7,6 @@ enum {
 	DDB,
 	DGSUP,
 	DAUC,
-	DSS,
 };
 
 extern const struct log_info hlr_log_info;

src/luop.c

@@ -25,6 +25,7 @@
 #include <errno.h>
 
 #include <osmocom/core/logging.h>
+#include <osmocom/gsm/gsm48_ie.h>
 #include <osmocom/gsm/gsup.h>
 #include <osmocom/gsm/apn.h>
 
@@ -51,7 +52,6 @@ static void _luop_tx_gsup(struct lu_operation *luop,
 	struct msgb *msg_out;
 
 	msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP LUOP");
-	OSMO_ASSERT(msg_out);
 	osmo_gsup_encode(msg_out, gsup);
 
 	osmo_gsup_addr_send(luop->gsup_server, luop->peer,
@@ -108,7 +108,8 @@ struct lu_operation *lu_op_alloc(struct osmo_gsup_server *srv)
 	luop = talloc_zero(srv, struct lu_operation);
 	OSMO_ASSERT(luop);
 	luop->gsup_server = srv;
-	osmo_timer_setup(&luop->timer, lu_op_timer_cb, luop);
+	luop->timer.cb = lu_op_timer_cb;
+	luop->timer.data = luop;
 
 	return luop;
 }
@@ -118,10 +119,6 @@ void lu_op_free(struct lu_operation *luop)
 	/* Only attempt to remove when it was ever added to a list. */
 	if (luop->list.next)
 		llist_del(&luop->list);
-
-	/* Delete timer just in case it is still pending. */
-	osmo_timer_del(&luop->timer);
-
 	talloc_free(luop);
 }
 
@@ -165,6 +162,23 @@ void lu_op_statechg(struct lu_operation *luop, enum lu_state new_state)
 	luop->state = new_state;
 }
 
+/* Send a msgb to a given address using routing */
+int osmo_gsup_addr_send(struct osmo_gsup_server *gs,
+			const uint8_t *addr, size_t addrlen,
+			struct msgb *msg)
+{
+	struct osmo_gsup_conn *conn;
+
+	conn = gsup_route_find(gs, addr, addrlen);
+	if (!conn) {
+		DEBUGP(DMAIN, "Cannot find route for addr %s\n", addr);
+		msgb_free(msg);
+		return -ENODEV;
+	}
+
+	return osmo_gsup_conn_send(conn, msg);
+}
+
 /*! Transmit UPD_LOC_ERROR and destroy lu_operation */
 void lu_op_tx_error(struct lu_operation *luop, enum gsm48_gmm_cause cause)
 {
@@ -215,27 +229,44 @@ void lu_op_tx_cancel_old(struct lu_operation *luop)
 /*! Transmit Insert Subscriber Data to new VLR/SGSN */
 void lu_op_tx_insert_subscr_data(struct lu_operation *luop)
 {
-	struct hlr_subscriber *subscr = &luop->subscr;
-	struct osmo_gsup_message gsup = { };
-	uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN];
+	struct osmo_gsup_message gsup;
 	uint8_t apn[APN_MAXLEN];
-	enum osmo_gsup_cn_domain cn_domain;
+	uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */
+	int l;
 
 	OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED ||
 		    luop->state == LU_S_CANCEL_ACK_RECEIVED);
 
-	if (luop->is_ps)
-		cn_domain = OSMO_GSUP_CN_DOMAIN_PS;
-	else
-		cn_domain = OSMO_GSUP_CN_DOMAIN_CS;
+	fill_gsup_msg(&gsup, luop, OSMO_GSUP_MSGT_INSERT_DATA_REQUEST);
 
-	if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc,
-							sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) {
+	l = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0,
+				    luop->subscr.msisdn);
+	if (l < 1) {
 		LOGP(DMAIN, LOGL_ERROR,
-		       "IMSI='%s': Cannot notify GSUP client; could not create gsup message "
-		       "for %s\n", subscr->imsi, luop->peer);
+		     "%s: Error: cannot encode MSISDN '%s'\n",
+		     luop->subscr.imsi, luop->subscr.msisdn);
+		lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC);
 		return;
 	}
+	gsup.msisdn_enc = msisdn_enc;
+	gsup.msisdn_enc_len = l;
+
+	/* FIXME: deal with encoding the following data */
+	gsup.hlr_enc;
+
+	if (luop->is_ps) {
+		/* FIXME: PDP infos - use more fine-grained access control
+		   instead of wildcard APN */
+		l = osmo_apn_from_str(apn, sizeof(apn), "*");
+		if (l > 0) {
+			gsup.pdp_infos[0].apn_enc = apn;
+			gsup.pdp_infos[0].apn_enc_len = l;
+			gsup.pdp_infos[0].have_info = 1;
+			gsup.num_pdp_infos = 1;
+			/* FIXME: use real value: */
+			gsup.pdp_infos[0].context_id = 1;
+		}
+	}
 
 	/* Send ISD to new VLR/SGSN */
 	_luop_tx_gsup(luop, &gsup);

src/luop.h

@@ -28,7 +28,6 @@
 #include <osmocom/gsm/gsup.h>
 
 #include "db.h"
-#include "gsup_server.h"
 
 #define CANCEL_TIMEOUT_SECS	30
 #define ISD_TIMEOUT_SECS	30
@@ -54,9 +53,6 @@ struct lu_operation {
 	enum lu_state state;
 	/*! CS (false) or PS (true) Location Update? */
 	bool is_ps;
-	/*! RAT type indicator: coming in on GERAN-A? UTRAN-Iu? */
-	enum osmo_rat_type via_rat;
-
 	/*! currently running timer */
 	struct osmo_timer_list timer;
 
@@ -66,6 +62,9 @@ struct lu_operation {
 	uint8_t *peer;
 };
 
+int osmo_gsup_addr_send(struct osmo_gsup_server *gs,
+			const uint8_t *addr, size_t addrlen,
+			struct msgb *msg);
 
 struct lu_operation *lu_op_alloc(struct osmo_gsup_server *srv);
 struct lu_operation *lu_op_alloc_conn(struct osmo_gsup_conn *conn);

src/osmo-euse-demo.c

@@ -1,239 +0,0 @@
-/* osmo-demo-euse: An External USSD Entity (EUSE) for demo purpose */
-
-/* (C) 2018 by Harald Welte <laforge@gnumonks.org>
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This program illustrates how to implement an external USSD application using
- * the existing osmocom libraries, particularly libosmocore, libosmogsm and libosmo-gsup-client.
- *
- * It will receive any MS-originated USSD message that is routed to it via the HLR, and
- * simply respond it quoted in the following string: 'You sent "foobar"' (assuming the original
- * message was 'foobar').
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/application.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/logging.h>
-
-#include <osmocom/gsm/gsup.h>
-#include <osmocom/gsm/gsm0480.h>
-#include <osmocom/gsm/protocol/gsm_04_80.h>
-
-#include <osmocom/gsupclient/gsup_client.h>
-
-#include "logging.h"
-
-static struct osmo_gsup_client *g_gc;
-
-/*! send a SS/USSD response to a given imsi/session.
- *  \param[in] gsupc GSUP client connection through which to send
- *  \param[in] imsi IMSI of the subscriber
- *  \param[in] session_id Unique identifier of SS session for which this response is
- *  \param[in] gsup_msg_type GSUP message type (OSMO_GSUP_MSGT_PROC_SS_{REQUEST,RESULT,ERROR})
- *  \param[in] final Is this the final result (true=END) or an intermediate result (false=CONTINUE)
- *  \param[in] msg Optional binary/BER encoded SS date (for FACILITY IE). Can be NULL. Freed in
- *  		   this function call.
- */
-static int euse_tx_ss(struct osmo_gsup_client *gsupc, const char *imsi, uint32_t session_id,
-		      enum osmo_gsup_message_type gsup_msg_type, bool final, struct msgb *ss_msg)
-{
-	struct osmo_gsup_message resp = {0};
-	struct msgb *resp_msg;
-
-	switch (gsup_msg_type) {
-	case OSMO_GSUP_MSGT_PROC_SS_REQUEST:
-	case OSMO_GSUP_MSGT_PROC_SS_RESULT:
-	case OSMO_GSUP_MSGT_PROC_SS_ERROR:
-		break;
-	default:
-		msgb_free(ss_msg);
-		return -EINVAL;
-	}
-
-	resp.message_type = gsup_msg_type;
-	OSMO_STRLCPY_ARRAY(resp.imsi, imsi);
-	if (final)
-		resp.session_state = OSMO_GSUP_SESSION_STATE_END;
-	else
-		resp.session_state = OSMO_GSUP_SESSION_STATE_CONTINUE;
-	resp.session_id = session_id;
-	if (ss_msg) {
-		resp.ss_info = msgb_data(ss_msg);
-		resp.ss_info_len = msgb_length(ss_msg);
-	}
-
-	resp_msg = gsm0480_msgb_alloc_name(__func__);
-	OSMO_ASSERT(resp_msg);
-	osmo_gsup_encode(resp_msg, &resp);
-	msgb_free(ss_msg);
-	return osmo_gsup_client_send(gsupc, resp_msg);
-}
-
-/*! send a SS/USSD reject to a given IMSI/session.
- * \param[in] gsupc		GSUP client connection through which to send
- * \param[in] imsi		IMSI of the subscriber
- * \param[in] session_id	Unique identifier of SS session for which this response is
- * \param[in] invoke_id		InvokeID of the request
- * \param[in] problem_tag	Problem code tag (table 3.13)
- * \param[in] problem_code	Problem code (table 3.14-3.17)
- */
-static int euse_tx_ussd_reject(struct osmo_gsup_client *gsupc, const char *imsi, uint32_t session_id,
-				int invoke_id, uint8_t problem_tag, uint8_t problem_code)
-{
-	struct msgb *msg = gsm0480_gen_reject(invoke_id, problem_tag, problem_code);
-	LOGP(DMAIN, LOGL_NOTICE, "Tx %s/0x%08x: Reject(%d, 0x%02x, 0x%02x)\n", imsi, session_id,
-		invoke_id, problem_tag, problem_code);
-	OSMO_ASSERT(msg);
-	return euse_tx_ss(gsupc, imsi, session_id, OSMO_GSUP_MSGT_PROC_SS_RESULT, true, msg);
-}
-
-/*! send a SS/USSD response in 7-bit GSM default alphabet o a given imsi/session.
- * \param[in] gsupc		GSUP client connection through which to send
- * \param[in] imsi		IMSI of the subscriber
- * \param[in] session_id	Unique identifier of SS session for which this response is
- * \param[in] final		Is this the final result (true=END) or an intermediate result
- * 				(false=CONTINUE)
- * \param[in] invoke_id		InvokeID of the request
- */
-static int euse_tx_ussd_resp_7bit(struct osmo_gsup_client *gsupc, const char *imsi, uint32_t session_id,
-				  bool final, uint8_t invoke_id, const char *text)
-{
-	struct msgb *ss_msg;
-
-	/* encode response; remove L3 header */
-	ss_msg = gsm0480_gen_ussd_resp_7bit(invoke_id, text);
-	LOGP(DMAIN, LOGL_DEBUG, "Tx %s/0x%08x: USSD Result(%d, %s, '%s')\n", imsi, session_id,
-		invoke_id, final ? "END" : "CONTINUE", text);
-	OSMO_ASSERT(ss_msg);
-	return euse_tx_ss(gsupc, imsi, session_id, OSMO_GSUP_MSGT_PROC_SS_RESULT, final, ss_msg);
-}
-
-static int euse_rx_proc_ss_req(struct osmo_gsup_client *gsupc, const struct osmo_gsup_message *gsup)
-{
-	char buf[GSM0480_USSD_7BIT_STRING_LEN+1];
-	struct ss_request req = {0};
-
-	if (gsup->ss_info && gsup->ss_info_len) {
-		if (gsm0480_parse_facility_ie(gsup->ss_info, gsup->ss_info_len, &req)) {
-			return euse_tx_ussd_reject(gsupc, gsup->imsi, gsup->session_id, -1,
-						   GSM_0480_PROBLEM_CODE_TAG_GENERAL,
-						   GSM_0480_GEN_PROB_CODE_BAD_STRUCTURE);
-		}
-	}
-
-	LOGP(DMAIN, LOGL_INFO, "Rx %s/0x%08x: USSD SessionState=%s, OpCode=%s, '%s'\n", gsup->imsi,
-		gsup->session_id, osmo_gsup_session_state_name(gsup->session_state),
-		gsm0480_op_code_name(req.opcode), req.ussd_text);
-
-	/* we only handle single-request-response USSD in this demo */
-	if (gsup->session_state != OSMO_GSUP_SESSION_STATE_BEGIN) {
-		return euse_tx_ussd_reject(gsupc, gsup->imsi, gsup->session_id, req.invoke_id,
-					   GSM_0480_PROBLEM_CODE_TAG_GENERAL,
-					   GSM_0480_GEN_PROB_CODE_UNRECOGNISED);
-	}
-
-	snprintf(buf, sizeof(buf), "You sent \"%s\"", req.ussd_text);
-	return euse_tx_ussd_resp_7bit(gsupc, gsup->imsi, gsup->session_id, true, req.invoke_id, buf);
-}
-
-static int gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg)
-{
-	struct osmo_gsup_message gsup_msg = {0};
-	int rc;
-
-	rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup_msg);
-	if (rc < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "Error decoding GSUP: %s\n", msgb_hexdump(msg));
-		return rc;
-	}
-	DEBUGP(DMAIN, "Rx GSUP %s: %s\n", osmo_gsup_message_type_name(gsup_msg.message_type),
-		msgb_hexdump(msg));
-
-	switch (gsup_msg.message_type) {
-	case OSMO_GSUP_MSGT_PROC_SS_REQUEST:
-	case OSMO_GSUP_MSGT_PROC_SS_RESULT:
-		euse_rx_proc_ss_req(gsupc, &gsup_msg);
-		break;
-	case OSMO_GSUP_MSGT_PROC_SS_ERROR:
-		break;
-	default:
-		LOGP(DMAIN, LOGL_DEBUG, "Unhandled GSUP message type %s\n",
-			osmo_gsup_message_type_name(gsup_msg.message_type));
-		break;
-	}
-
-	msgb_free(msg);
-	return 0;
-}
-
-
-static struct log_info_cat default_categories[] = {
-	[DMAIN] = {
-		.name = "DMAIN",
-		.description = "Main Program",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-};
-
-static const struct log_info gsup_log_info = {
-	.cat = default_categories,
-	.num_cat = ARRAY_SIZE(default_categories),
-};
-
-static void print_usage(void)
-{
-	printf("Usage: osmo-euse-demo [hlr-ip [hlr-gsup-port]]\n");
-}
-
-int main(int argc, char **argv)
-{
-	char *server_host = "127.0.0.1";
-	uint16_t server_port = OSMO_GSUP_PORT;
-	void *ctx = talloc_named_const(NULL, 0, "demo-euse");
-
-	osmo_init_logging2(ctx, &gsup_log_info);
-
-	printf("argc=%d\n", argc);
-
-	if (argc > 1) {
-		if (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) {
-			print_usage();
-			exit(0);
-		} else
-			server_host = argv[1];
-	}
-	if (argc > 2)
-		server_port = atoi(argv[2]);
-
-	g_gc = osmo_gsup_client_create(ctx, "EUSE-foobar", server_host, server_port, gsupc_read_cb, NULL);
-
-	while (1) {
-		osmo_select_main(0);
-	}
-
-	exit(0);
-}
-

tests/Makefile.am

@@ -2,7 +2,6 @@ SUBDIRS = \
 	auc \
 	gsup_server \
 	db \
-	gsup \
 	$(NULL)
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
@@ -44,10 +43,6 @@ python-tests:
 # don't run vty and ctrl tests concurrently so that the ports don't conflict
 	$(MAKE) vty-test
 	$(MAKE) ctrl-test
-else
-python-tests:
-	echo "Not running python-based external tests (determined at configure-time)"
-endif
 
 VTY_TEST_DB = hlr_vty_test.db
 
@@ -56,12 +51,12 @@ VTY_TEST_DB = hlr_vty_test.db
 #   make vty-test U=-u
 vty-test:
 	-rm -f $(VTY_TEST_DB)
+	sqlite3 $(VTY_TEST_DB) < $(top_srcdir)/sql/hlr.sql
 	osmo_verify_transcript_vty.py -v \
 		-n OsmoHLR -p 4258 \
-		-r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(VTY_TEST_DB)" \
+		-r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l hlr_vty_test.db" \
 		$(U) $(srcdir)/*.vty
 	-rm -f $(VTY_TEST_DB)
-	-rm $(VTY_TEST_DB)-*
 
 CTRL_TEST_DB = hlr_ctrl_test.db
 
@@ -74,10 +69,14 @@ ctrl-test:
 	sqlite3 $(CTRL_TEST_DB) < $(srcdir)/test_subscriber.sql
 	osmo_verify_transcript_ctrl.py -v \
 		-p 4259 \
-		-r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(CTRL_TEST_DB)" \
+		-r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l hlr_ctrl_test.db" \
 		$(U) $(srcdir)/*.ctrl
 	-rm -f $(CTRL_TEST_DB)
-	-rm $(CTRL_TEST_DB)-*
+
+else
+python-tests:
+	echo "Not running python-based tests (determined at configure-time)"
+endif
 
 check-local: atconfig $(TESTSUITE)
 	$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)

tests/auc/auc_test.c

@@ -610,14 +610,11 @@ int main(int argc, char **argv)
 
 	handle_options(argc, argv);
 
-	void *tall_ctx = talloc_named_const(NULL, 1, "auc_test");
-
-	osmo_init_logging2(tall_ctx, &hlr_log_info);
+	osmo_init_logging(&hlr_log_info);
 	log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 1);
-	log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1");
 
 	test_gen_vectors_2g_only();
 	test_gen_vectors_2g_plus_3g();

tests/auc/auc_test.err

@@ -35,7 +35,7 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
 DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
 DAUC vector [0]: res = e229c19e791f2e410000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: calculating 2G separately
+DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 241a5b16aeb8e400
 DAUC vector [0]: sres = 429d5b27
 DAUC vector [0]: auth_types = 0x3
@@ -55,7 +55,7 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
 DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
 DAUC vector [0]: res = e229c19e791f2e410000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: calculating 2G separately
+DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 241a5b16aeb8e400
 DAUC vector [0]: sres = 429d5b27
 DAUC vector [0]: auth_types = 0x3
@@ -78,7 +78,6 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
 DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
 DAUC vector [0]: res = e229c19e791f2e410000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 059a4f668f6fbe39
 DAUC vector [0]: sres = 9b36efdf
 DAUC vector [0]: auth_types = 0x3
@@ -97,7 +96,6 @@ DAUC vector [0]: ck = f64735036e5871319c679f4742a75ea1
 DAUC vector [0]: ik = 27497388b6cb044648f396aa155b95ef
 DAUC vector [0]: res = e229c19e791f2e410000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 059a4f668f6fbe39
 DAUC vector [0]: sres = 9b36efdf
 DAUC vector [0]: auth_types = 0x3
@@ -119,7 +117,6 @@ DAUC vector [0]: ck = e9922bd036718ed9e40bd1d02c3b81a5
 DAUC vector [0]: ik = f19c20ca863137f8892326d959ec5e01
 DAUC vector [0]: res = 9af5a557902d2db80000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 7526fc13c5976685
 DAUC vector [0]: sres = 0ad888ef
 DAUC vector [0]: auth_types = 0x3
@@ -140,7 +137,6 @@ DAUC vector [0]: ck = e9922bd036718ed9e40bd1d02c3b81a5
 DAUC vector [0]: ik = f19c20ca863137f8892326d959ec5e01
 DAUC vector [0]: res = 9af5a557902d2db80000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 7526fc13c5976685
 DAUC vector [0]: sres = 0ad888ef
 DAUC vector [0]: auth_types = 0x3
@@ -151,7 +147,6 @@ DAUC vector [1]: ck = 3686f05df057d1899c66ae4eb18cf941
 DAUC vector [1]: ik = 79f21ed53bcb47787de57d136ff803a5
 DAUC vector [1]: res = 43023475cb29292c0000000000000000
 DAUC vector [1]: res_len = 8
-DAUC vector [1]: deriving 2G from 3G
 DAUC vector [1]: kc = aef73dd515e86c15
 DAUC vector [1]: sres = 882b1d59
 DAUC vector [1]: auth_types = 0x3
@@ -162,7 +157,6 @@ DAUC vector [2]: ck = d86c3191a36fc0602e48202ef2080964
 DAUC vector [2]: ik = 648dab72016181406243420649e63dc9
 DAUC vector [2]: res = 010cab11cc63a6e40000000000000000
 DAUC vector [2]: res_len = 8
-DAUC vector [2]: deriving 2G from 3G
 DAUC vector [2]: kc = f0eaf8cb19e0758d
 DAUC vector [2]: sres = cd6f0df5
 DAUC vector [2]: auth_types = 0x3
@@ -185,7 +179,6 @@ DAUC vector [0]: ck = e9922bd036718ed9e40bd1d02c3b81a5
 DAUC vector [0]: ik = f19c20ca863137f8892326d959ec5e01
 DAUC vector [0]: res = 9af5a557902d2db80000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 7526fc13c5976685
 DAUC vector [0]: sres = 0ad888ef
 DAUC vector [0]: auth_types = 0x3
@@ -196,7 +189,6 @@ DAUC vector [1]: ck = 3686f05df057d1899c66ae4eb18cf941
 DAUC vector [1]: ik = 79f21ed53bcb47787de57d136ff803a5
 DAUC vector [1]: res = 43023475cb29292c0000000000000000
 DAUC vector [1]: res_len = 8
-DAUC vector [1]: deriving 2G from 3G
 DAUC vector [1]: kc = aef73dd515e86c15
 DAUC vector [1]: sres = 882b1d59
 DAUC vector [1]: auth_types = 0x3
@@ -207,7 +199,6 @@ DAUC vector [2]: ck = d86c3191a36fc0602e48202ef2080964
 DAUC vector [2]: ik = 648dab72016181406243420649e63dc9
 DAUC vector [2]: res = 010cab11cc63a6e40000000000000000
 DAUC vector [2]: res_len = 8
-DAUC vector [2]: deriving 2G from 3G
 DAUC vector [2]: kc = f0eaf8cb19e0758d
 DAUC vector [2]: sres = cd6f0df5
 DAUC vector [2]: auth_types = 0x3

tests/auc/auc_ts_55_205_test_sets.err

@@ -12,7 +12,6 @@ DAUC vector [0]: ck = b40ba9a3c58b2a05bbf0d987b21bf8cb
 DAUC vector [0]: ik = f769bcd751044604127672711c6d3441
 DAUC vector [0]: res = a54211d5e3ba50bf0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = eae4be823af9a08b
 DAUC vector [0]: sres = 46f8416a
 DAUC vector [0]: auth_types = 0x3
@@ -35,7 +34,6 @@ DAUC vector [0]: ck = 5dbdbb2954e8f3cde665b046179a5098
 DAUC vector [0]: ik = 59a92d3b476a0443487055cf88b2307b
 DAUC vector [0]: res = 8011c48c0c214ed20000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = aa01739b8caa976d
 DAUC vector [0]: sres = 8c308a5e
 DAUC vector [0]: auth_types = 0x3
@@ -58,7 +56,6 @@ DAUC vector [0]: ck = e203edb3971574f5a94b0d61b816345d
 DAUC vector [0]: ik = 0c4524adeac041c4dd830d20854fc46b
 DAUC vector [0]: res = f365cd683cd92e960000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 9a8ec95f408cc507
 DAUC vector [0]: sres = cfbce3fe
 DAUC vector [0]: auth_types = 0x3
@@ -81,7 +78,6 @@ DAUC vector [0]: ck = 7657766b373d1c2138f307e3de9242f9
 DAUC vector [0]: ik = 1c42e960d89b8fa99f2744e0708ccb53
 DAUC vector [0]: res = 5860fc1bce351e7e0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = cdc1dc0841b81a22
 DAUC vector [0]: sres = 9655e265
 DAUC vector [0]: auth_types = 0x3
@@ -104,7 +100,6 @@ DAUC vector [0]: ck = 3f8c7587fe8e4b233af676aede30ba3b
 DAUC vector [0]: ik = a7466cc1e6b2a1337d49d3b66e95d7b4
 DAUC vector [0]: res = 16c8233f05a0ac280000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = df75bc5ea899879f
 DAUC vector [0]: sres = 13688f17
 DAUC vector [0]: auth_types = 0x3
@@ -127,7 +122,6 @@ DAUC vector [0]: ck = 4cd0846020f8fa0731dd47cbdc6be411
 DAUC vector [0]: ik = 88ab80a415f15c73711254a1d388f696
 DAUC vector [0]: res = 8c25a16cd918a1df0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 84b417ae3aeab4f3
 DAUC vector [0]: sres = 553d00b3
 DAUC vector [0]: auth_types = 0x3
@@ -150,7 +144,6 @@ DAUC vector [0]: ck = 10f05bab75a99a5fbb98a9c287679c3b
 DAUC vector [0]: ik = f9ec0865eb32f22369cade40c59c3a44
 DAUC vector [0]: res = a63241e1ffc3e5ab0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 3b4e244cdc60ce03
 DAUC vector [0]: sres = 59f1a44a
 DAUC vector [0]: auth_types = 0x3
@@ -173,7 +166,6 @@ DAUC vector [0]: ck = 71236b7129f9b22ab77ea7a54c96da22
 DAUC vector [0]: ik = 90527ebaa5588968db41727325a04d9e
 DAUC vector [0]: res = 4a90b2171ac83a760000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 8d4ec01de597acfe
 DAUC vector [0]: sres = 50588861
 DAUC vector [0]: auth_types = 0x3
@@ -196,7 +188,6 @@ DAUC vector [0]: ck = 08cef6d004ec61471a3c3cda048137fa
 DAUC vector [0]: ik = ed0318ca5deb9206272f6e8fa64ba411
 DAUC vector [0]: res = 4bc2212d8624910a0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = d8debc4ffbcd60aa
 DAUC vector [0]: sres = cde6b027
 DAUC vector [0]: auth_types = 0x3
@@ -219,7 +210,6 @@ DAUC vector [0]: ck = 69b1cae7c7429d975e245cacb05a517c
 DAUC vector [0]: ik = 74f24e8c26df58e1b38d7dcd4f1b7fbd
 DAUC vector [0]: res = 6fc30fee6d1235230000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = f0eaa50a1edcebb7
 DAUC vector [0]: sres = 02d13acd
 DAUC vector [0]: auth_types = 0x3
@@ -242,7 +232,6 @@ DAUC vector [0]: ck = 908c43f0569cb8f74bc971e706c36c5f
 DAUC vector [0]: ik = c251df0d888dd9329bcf46655b226e40
 DAUC vector [0]: res = aefa357beac2a87a0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 82dbab7f83f063da
 DAUC vector [0]: sres = 44389d01
 DAUC vector [0]: auth_types = 0x3
@@ -265,7 +254,6 @@ DAUC vector [0]: ck = 44c0f23c5493cfd241e48f197e1d1012
 DAUC vector [0]: ik = 0c9fb81613884c2535dd0eabf3b440d8
 DAUC vector [0]: res = 98dbbd099b3b408d0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 3c66cb98cab2d33d
 DAUC vector [0]: sres = 03e0fd84
 DAUC vector [0]: auth_types = 0x3
@@ -288,7 +276,6 @@ DAUC vector [0]: ck = 5af86b80edb70df5292cc1121cbad50c
 DAUC vector [0]: ik = 7f4d6ae7440e18789a8b75ad3f42f03a
 DAUC vector [0]: res = af4a411e1139f2c20000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 9612b5d88a4130bb
 DAUC vector [0]: sres = be73b3dc
 DAUC vector [0]: auth_types = 0x3
@@ -311,7 +298,6 @@ DAUC vector [0]: ck = 3f8c3f3ccf7625bf77fc94bcfd22fd26
 DAUC vector [0]: ik = abcbae8fd46115e9961a55d0da5f2078
 DAUC vector [0]: res = 7bffa5c2f41fbc050000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 75a150df3c6aed08
 DAUC vector [0]: sres = 8fe019c7
 DAUC vector [0]: auth_types = 0x3
@@ -334,7 +320,6 @@ DAUC vector [0]: ck = d42b2d615e49a03ac275a5aef97af892
 DAUC vector [0]: ik = 0b3f8d024fe6bfafaa982b8f82e319c2
 DAUC vector [0]: res = 7e3f44c7591f6f450000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = b7f92e426a36fec5
 DAUC vector [0]: sres = 27202b82
 DAUC vector [0]: auth_types = 0x3
@@ -357,7 +342,6 @@ DAUC vector [0]: ck = 6edaf99e5bd9f85d5f36d91c1272fb4b
 DAUC vector [0]: ik = d61c853c280dd9c46f297baec386de17
 DAUC vector [0]: res = 70f6bdb9ad21525f0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 88d9de10a22004c5
 DAUC vector [0]: sres = ddd7efe6
 DAUC vector [0]: auth_types = 0x3
@@ -380,7 +364,6 @@ DAUC vector [0]: ck = 66195dbed0313274c5ca7766615fa25e
 DAUC vector [0]: ik = 66bec707eb2afc476d7408a8f2927b36
 DAUC vector [0]: res = 479dd25c20792d630000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = a819e577a8d6175b
 DAUC vector [0]: sres = 67e4ff3f
 DAUC vector [0]: auth_types = 0x3
@@ -403,7 +386,6 @@ DAUC vector [0]: ck = 5349fbe098649f948f5d2e973a81c00f
 DAUC vector [0]: ik = 9744871ad32bf9bbd1dd5ce54e3e2e5a
 DAUC vector [0]: res = 28d7b0f2a2ec3de50000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = 9a8d0e883ff0887a
 DAUC vector [0]: sres = 8a3b8d17
 DAUC vector [0]: auth_types = 0x3
@@ -426,7 +408,6 @@ DAUC vector [0]: ck = b5f2da03883b69f96bf52e029ed9ac45
 DAUC vector [0]: ik = b4721368bc16ea67875c5598688bb0ef
 DAUC vector [0]: res = a95100e2760952cd0000000000000000
 DAUC vector [0]: res_len = 8
-DAUC vector [0]: deriving 2G from 3G
 DAUC vector [0]: kc = ed29b2f1c27f9f34
 DAUC vector [0]: sres = df58522f
 DAUC vector [0]: auth_types = 0x3

tests/auc/gen_ts_55_205_test_sets/main_template.c

@@ -29,7 +29,6 @@
 #include <osmocom/core/application.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
-#include <osmocom/core/msgb.h>
 
 #include <osmocom/crypt/auth.h>
 
@@ -103,14 +102,11 @@ FUNCTIONS
 int main()
 {
 	printf("3GPP TS 55.205 Test Sets\n");
-	void *tall_ctx = talloc_named_const(NULL, 1, "test");
-	msgb_talloc_ctx_init(tall_ctx, 0);
-	osmo_init_logging2(tall_ctx, &hlr_log_info);
+	osmo_init_logging(&hlr_log_info);
 	log_set_print_filename(osmo_stderr_target, 0);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 1);
-	log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1");
 
 FUNCTION_CALLS
 

tests/db/Makefile.am

@@ -1,15 +1,19 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
 	$(all_includes) \
 	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
+	$(NULL)
+
+AM_CFLAGS = \
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
 	$(NULL)
 
+AM_LDFLAGS = \
+	$(NULL)
+
 EXTRA_DIST = \
 	db_test.ok \
 	db_test.err \
@@ -28,7 +32,6 @@ db_test_LDADD = \
 	$(top_srcdir)/src/logging.c \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
-	$(LIBOSMOABIS_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(NULL)
 

tests/db/db_test.c

@@ -100,22 +100,6 @@ static void _fill_invalid(void *dest, size_t size)
 		fprintf(stderr, "\n"); \
 	} while (0)
 
-#define N_VECTORS 3
-
-#define ASSERT_DB_GET_AUC(imsi, expect_rc) \
-	do { \
-		struct osmo_auth_vector vec[N_VECTORS]; \
-		ASSERT_RC(db_get_auc(dbc, imsi, 3, vec, N_VECTORS, NULL, NULL), expect_rc); \
-	} while (0)
-
-/* Not linking the real auc_compute_vectors(), just returning num_vec.
- * This gets called by db_get_auc(), but we're only interested in its rc. */
-int auc_compute_vectors(struct osmo_auth_vector *vec, unsigned int num_vec,
-			struct osmo_sub_auth_data *aud2g,
-			struct osmo_sub_auth_data *aud3g,
-			const uint8_t *rand_auts, const uint8_t *auts)
-{ return num_vec; }
-
 static struct db_context *dbc = NULL;
 static void *ctx = NULL;
 static struct hlr_subscriber g_subscr;
@@ -473,7 +457,6 @@ static void test_subscr_aud()
 
 	comment("Get auth data for non-existent subscriber");
 	ASSERT_SEL_AUD(unknown_imsi, -ENOENT, 0);
-	ASSERT_DB_GET_AUC(imsi0, -ENOENT);
 
 	comment("Create subscriber");
 
@@ -481,8 +464,7 @@ static void test_subscr_aud()
 	ASSERT_SEL(imsi, imsi0, 0);
 
 	id = g_subscr.id;
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
-	ASSERT_DB_GET_AUC(imsi0, -ENOKEY);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 
 	comment("Set auth data, 2G only");
@@ -491,7 +473,6 @@ static void test_subscr_aud()
 		mk_aud_2g(OSMO_AUTH_ALG_COMP128v1, "0123456789abcdef0123456789abcdef")),
 		0);
 	ASSERT_SEL_AUD(imsi0, 0, id);
-	ASSERT_DB_GET_AUC(imsi0, N_VECTORS);
 
 	/* same again */
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
@@ -519,8 +500,7 @@ static void test_subscr_aud()
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
 		mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)),
 		0);
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
-	ASSERT_DB_GET_AUC(imsi0, -ENOKEY);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 	/* Removing nothing results in -ENOENT */
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
@@ -535,8 +515,7 @@ static void test_subscr_aud()
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
 		mk_aud_2g(OSMO_AUTH_ALG_NONE, "f000000000000f00000000000f000000")),
 		0);
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
-	ASSERT_DB_GET_AUC(imsi0, -ENOKEY);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 
 	comment("Set auth data, 3G only");
@@ -547,7 +526,6 @@ static void test_subscr_aud()
 			  "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)),
 		0);
 	ASSERT_SEL_AUD(imsi0, 0, id);
-	ASSERT_DB_GET_AUC(imsi0, N_VECTORS);
 
 	/* same again */
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
@@ -584,8 +562,7 @@ static void test_subscr_aud()
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
 		mk_aud_3g(OSMO_AUTH_ALG_NONE, NULL, false, NULL, 0)),
 		0);
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
-	ASSERT_DB_GET_AUC(imsi0, -ENOKEY);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 	/* Removing nothing results in -ENOENT */
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
@@ -598,15 +575,13 @@ static void test_subscr_aud()
 			  "BeefedCafeFaceAcedAddedDecadeFee", 5)),
 		0);
 	ASSERT_SEL_AUD(imsi0, 0, id);
-	ASSERT_DB_GET_AUC(imsi0, N_VECTORS);
 
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
 		mk_aud_3g(OSMO_AUTH_ALG_NONE,
 			  "asdfasdfasd", false,
 			  "asdfasdfasdf", 99999)),
 		0);
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
-	ASSERT_DB_GET_AUC(imsi0, -ENOKEY);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 
 	comment("Set auth data, 2G and 3G");
@@ -620,7 +595,6 @@ static void test_subscr_aud()
 			  "DeafBeddedBabeAcceededFadedDecaf", 5)),
 		0);
 	ASSERT_SEL_AUD(imsi0, 0, id);
-	ASSERT_DB_GET_AUC(imsi0, N_VECTORS);
 
 
 	comment("Set invalid auth data");
@@ -695,12 +669,10 @@ static void test_subscr_aud()
 	/* For this test to work, we want to get the same subscriber ID back,
 	 * and make sure there are no auth data leftovers for this ID. */
 	OSMO_ASSERT(id == g_subscr.id);
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
-	ASSERT_DB_GET_AUC(imsi0, -ENOKEY);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 	ASSERT_RC(db_subscr_delete_by_id(dbc, id), 0);
 	ASSERT_SEL(imsi, imsi0, -ENOENT);
-	ASSERT_DB_GET_AUC(imsi0, -ENOENT);
 
 	comment_end();
 }
@@ -725,15 +697,15 @@ static void test_subscr_sqn()
 	ASSERT_SEL(imsi, imsi0, 0);
 
 	id = g_subscr.id;
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 	comment("Set SQN, but no 3G auth data present");
 
 	ASSERT_RC(db_update_sqn(dbc, id, 123), -ENOENT);
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 	ASSERT_RC(db_update_sqn(dbc, id, 543), -ENOENT);
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
+	ASSERT_SEL_AUD(imsi0, -ENOENT, id);
 
 	comment("Set auth 3G data");
 
@@ -839,18 +811,15 @@ int main(int argc, char **argv)
 
 	handle_options(argc, argv);
 
-	osmo_init_logging2(ctx, &hlr_log_info);
+	osmo_init_logging(&hlr_log_info);
 	log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 1);
-	log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1");
 
 	/* omit the SQLite version and compilation flags from test output */
 	log_set_log_level(osmo_stderr_target, LOGL_ERROR);
-	/* Disable SQLite logging so that we're not vulnerable on SQLite error messages changing across
-	 * library versions. */
-	dbc = db_open(ctx, "db_test.db", false, false);
+	dbc = db_open(ctx, "db_test.db");
 	log_set_log_level(osmo_stderr_target, 0);
 	OSMO_ASSERT(dbc);
 
@@ -863,6 +832,11 @@ int main(int argc, char **argv)
 }
 
 /* stubs */
+int auc_compute_vectors(struct osmo_auth_vector *vec, unsigned int num_vec,
+			struct osmo_sub_auth_data *aud2g,
+			struct osmo_sub_auth_data *aud3g,
+			const uint8_t *rand_auts, const uint8_t *auts)
+{ OSMO_ASSERT(false); return -1; }
 void *lu_op_alloc_conn(void *conn)
 { OSMO_ASSERT(false); return NULL; }
 void lu_op_tx_del_subscr_data(void *luop)

tests/db/db_test.err

@@ -28,6 +28,7 @@ struct hlr_subscriber {
 }
 
 db_subscr_create(dbc, imsi0) --> -EIO
+DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi
 DAUC IMSI='123456789000000': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi
 
 db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0
@@ -37,9 +38,11 @@ struct hlr_subscriber {
 }
 
 db_subscr_create(dbc, imsi1) --> -EIO
+DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi
 DAUC IMSI='123456789000001': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi
 
 db_subscr_create(dbc, imsi1) --> -EIO
+DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi
 DAUC IMSI='123456789000001': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi
 
 db_subscr_get_by_imsi(dbc, imsi1, &g_subscr) --> 0
@@ -49,9 +52,11 @@ struct hlr_subscriber {
 }
 
 db_subscr_create(dbc, imsi2) --> -EIO
+DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi
 DAUC IMSI='123456789000002': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi
 
 db_subscr_create(dbc, imsi2) --> -EIO
+DDB (2067) abort at 18 in [INSERT INTO subscriber (imsi) VALUES ($imsi)]: UNIQUE constraint failed: subscriber.imsi
 DAUC IMSI='123456789000002': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi
 
 db_subscr_get_by_imsi(dbc, imsi2, &g_subscr) --> 0
@@ -715,9 +720,6 @@ db_get_auth_data(dbc, unknown_imsi, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='999999999': No such subscriber
 
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -2
-DAUC IMSI='123456789000000': No such subscriber
-
 
 --- Create subscriber
 
@@ -729,15 +731,11 @@ struct hlr_subscriber {
   .imsi = '123456789000000',
 }
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': No 3G Auth Data
-
 
 --- Set auth data, 2G only
 
@@ -753,11 +751,6 @@ DAUC IMSI='123456789000000': No 3G Auth Data
 }
 3G: none
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3
-DAUC IMSI='123456789000000': No 3G Auth Data
-DAUC IMSI='123456789000000': Calling to generate 3 vectors
-DAUC IMSI='123456789000000': Generated 3 vectors
-
 db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_COMP128v1, "0123456789abcdef0123456789abcdef")) --> 0
 
 db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> 0
@@ -811,15 +804,11 @@ DAUC IMSI='123456789000000': No 3G Auth Data
 
 db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)) --> 0
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': No 3G Auth Data
-
 db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)) --> -ENOENT
 
 db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR, "CededEffacedAceFacedBadFadedBeef")) --> 0
@@ -836,15 +825,11 @@ DAUC IMSI='123456789000000': No 3G Auth Data
 
 db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, "f000000000000f00000000000f000000")) --> 0
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': No 3G Auth Data
-
 
 --- Set auth data, 3G only
 
@@ -864,12 +849,6 @@ DAUC IMSI='123456789000000': No 2G Auth Data
   .u.umts.ind_bitlen = 5,
 }
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': Calling to generate 3 vectors
-DAUC IMSI='123456789000000': Generated 3 vectors
-DAUC IMSI='123456789000000': Updating SQN=0 in DB
-
 db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_MILENAGE, "BeefedCafeFaceAcedAddedDecadeFee", true, "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)) --> 0
 
 db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> 0
@@ -938,15 +917,11 @@ DAUC IMSI='123456789000000': No 2G Auth Data
 
 db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_NONE, NULL, false, NULL, 0)) --> 0
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': No 3G Auth Data
-
 db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_NONE, NULL, false, NULL, 0)) --> -ENOENT
 
 db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_MILENAGE, "CededEffacedAceFacedBadFadedBeef", false, "BeefedCafeFaceAcedAddedDecadeFee", 5)) --> 0
@@ -965,23 +940,13 @@ DAUC IMSI='123456789000000': No 2G Auth Data
   .u.umts.ind_bitlen = 5,
 }
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': Calling to generate 3 vectors
-DAUC IMSI='123456789000000': Generated 3 vectors
-DAUC IMSI='123456789000000': Updating SQN=0 in DB
-
 db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_NONE, "asdfasdfasd", false, "asdfasdfasdf", 99999)) --> 0
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': No 3G Auth Data
-
 
 --- Set auth data, 2G and 3G
 
@@ -1006,11 +971,6 @@ db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> 0
   .u.umts.ind_bitlen = 5,
 }
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3
-DAUC IMSI='123456789000000': Calling to generate 3 vectors
-DAUC IMSI='123456789000000': Generated 3 vectors
-DAUC IMSI='123456789000000': Updating SQN=0 in DB
-
 
 --- Set invalid auth data
 
@@ -1219,23 +1179,16 @@ struct hlr_subscriber {
   .imsi = '123456789000000',
 }
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -126
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': No 3G Auth Data
-
 db_subscr_delete_by_id(dbc, id) --> 0
 
 db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> -ENOENT
 DAUC Cannot read subscriber from db: IMSI='123456789000000': No such subscriber
 
-db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -2
-DAUC IMSI='123456789000000': No such subscriber
-
 ===== test_subscr_aud: SUCCESS
 
 
@@ -1266,7 +1219,7 @@ struct hlr_subscriber {
   .imsi = '123456789000000',
 }
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
@@ -1277,7 +1230,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data
 db_update_sqn(dbc, id, 123) --> -ENOENT
 DAUC Cannot update SQN for subscriber ID=1: no auc_3g entry for such subscriber
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 
@@ -1285,7 +1238,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data
 db_update_sqn(dbc, id, 543) --> -ENOENT
 DAUC Cannot update SQN for subscriber ID=1: no auc_3g entry for such subscriber
 
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
+db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -2
 DAUC IMSI='123456789000000': No 2G Auth Data
 DAUC IMSI='123456789000000': No 3G Auth Data
 

tests/gsup/Makefile.am

@@ -1,41 +0,0 @@
-AM_CPPFLAGS = \
-	$(all_includes) \
-	-I$(top_srcdir)/src \
-	$(NULL)
-
-AM_CFLAGS = \
-	-Wall \
-	-ggdb3 \
-	$(LIBOSMOCORE_CFLAGS) \
-	$(LIBOSMOGSM_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) \
-	$(NULL)
-
-AM_LDFLAGS = \
-	$(NULL)
-
-EXTRA_DIST = \
-	gsup_test.ok \
-	gsup_test.err \
-	$(NULL)
-
-noinst_PROGRAMS = \
-	gsup_test \
-	$(NULL)
-
-gsup_test_SOURCES = \
-	gsup_test.c \
-	$(NULL)
-
-gsup_test_LDADD = \
-	$(top_srcdir)/src/luop.c \
-	$(top_srcdir)/src/gsup_server.c \
-	$(top_srcdir)/src/gsup_router.c \
-	$(LIBOSMOCORE_LIBS) \
-	$(LIBOSMOGSM_LIBS) \
-	$(LIBOSMOABIS_LIBS) \
-	$(NULL)
-
-.PHONY: update_exp
-update_exp:
-	$(builddir)/gsup_test >"$(srcdir)/gsup_test.ok" 2>"$(srcdir)/gsup_test.err"

tests/gsup/gsup_test.c

@@ -1,91 +0,0 @@
-/* (C) 2018 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
- *
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string.h>
-
-#include <osmocom/core/logging.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/application.h>
-#include <osmocom/gsm/gsup.h>
-
-#include "logging.h"
-#include "luop.h"
-
-struct osmo_gsup_server;
-
-/* override osmo_gsup_addr_send() to not actually send anything. */
-int osmo_gsup_addr_send(struct osmo_gsup_server *gs,
-			const uint8_t *addr, size_t addrlen,
-			struct msgb *msg)
-{
-	LOGP(DMAIN, LOGL_DEBUG, "%s\n", msgb_hexdump(msg));
-	msgb_free(msg);
-	return 0;
-}
-
-int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi,
-			  struct hlr_subscriber *subscr)
-{
-	return 0;
-}
-
-/* Verify that the internally allocated msgb is large enough */
-void test_gsup_tx_insert_subscr_data()
-{
-	struct lu_operation luop = {
-		.state = LU_S_LU_RECEIVED,
-		.subscr = {
-			.imsi = "123456789012345",
-			.msisdn = "987654321098765",
-			.nam_cs = true,
-			.nam_ps = true,
-		},
-		.is_ps = true,
-	};
-
-	lu_op_tx_insert_subscr_data(&luop);
-}
-
-const struct log_info_cat default_categories[] = {
-	[DMAIN] = {
-		.name = "DMAIN",
-		.description = "Main Program",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-};
-
-static struct log_info info = {
-	.cat = default_categories,
-	.num_cat = ARRAY_SIZE(default_categories),
-};
-
-int main(int argc, char **argv)
-{
-	void *ctx = talloc_named_const(NULL, 0, "gsup_test");
-	osmo_init_logging2(ctx, &info);
-	log_set_print_filename(osmo_stderr_target, 0);
-	log_set_print_timestamp(osmo_stderr_target, 0);
-	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_category(osmo_stderr_target, 1);
-
-	test_gsup_tx_insert_subscr_data();
-
-	printf("Done.\n");
-	return EXIT_SUCCESS;
-}

tests/gsup/gsup_test.err

@@ -1,2 +0,0 @@
-DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a 28 01 01 
-DMAIN LU OP state change: LU RECEIVED -> ISD SENT

tests/gsup/gsup_test.ok

@@ -1 +0,0 @@
-Done.

tests/test_nodes.vty

@@ -13,12 +13,7 @@ OsmoHLR> list
 ...
   show logging vty
   show alarms
-  show talloc-context (application|all) (full|brief|DEPTH)
-  show talloc-context (application|all) (full|brief|DEPTH) tree ADDRESS
-  show talloc-context (application|all) (full|brief|DEPTH) filter REGEXP
-  show gsup-connections
   subscriber (imsi|msisdn|id) IDENT show
-  show subscriber (imsi|msisdn|id) IDENT
 
 OsmoHLR> enable
 OsmoHLR# list
@@ -71,14 +66,6 @@ OsmoHLR(config-hlr)# list
   exit
   end
   gsup
-  euse NAME
-  no euse NAME
-  ussd route prefix PREFIX internal (own-msisdn|own-imsi)
-  ussd route prefix PREFIX external EUSE
-  no ussd route prefix PREFIX
-  ussd default-route external EUSE
-  no ussd default-route
-  ncss-guard-timeout <0-255>
 
 OsmoHLR(config-hlr)# gsup
 OsmoHLR(config-hlr-gsup)# list
@@ -109,15 +96,22 @@ Current configuration:
 !
 !
 log stderr
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging print extended-timestamp 1
+  logging level all debug
+  logging level main debug
+  logging level db debug
+  logging level auc debug
 ...
- logging level main notice
- logging level db notice
- logging level auc notice
- logging level ss info
-...
+!
+line vty
+ no login
+!
+ctrl
+ bind 127.0.0.1
 hlr
  gsup
   bind ip 127.0.0.1
- ussd route prefix *#100# internal own-msisdn
- ussd route prefix *#101# internal own-imsi
 end

tests/test_subscriber.vty

@@ -3,10 +3,9 @@ OsmoHLR> enable
 OsmoHLR# list
 ...
   subscriber (imsi|msisdn|id) IDENT show
-  show subscriber (imsi|msisdn|id) IDENT
   subscriber imsi IDENT create
   subscriber (imsi|msisdn|id) IDENT delete
-  subscriber (imsi|msisdn|id) IDENT update msisdn (none|MSISDN)
+  subscriber (imsi|msisdn|id) IDENT update msisdn MSISDN
   subscriber (imsi|msisdn|id) IDENT update aud2g none
   subscriber (imsi|msisdn|id) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor) ki KI
   subscriber (imsi|msisdn|id) IDENT update aud3g none
@@ -34,13 +33,6 @@ OsmoHLR# subscriber id 1 show
 OsmoHLR# subscriber msisdn 12345 show
 % No subscriber for msisdn = '12345'
 
-OsmoHLR# show subscriber imsi 123456789023000
-% No subscriber for imsi = '123456789023000'
-OsmoHLR# show subscriber id 1
-% No subscriber for id = '1'
-OsmoHLR# show subscriber msisdn 12345
-% No subscriber for msisdn = '12345'
-
 OsmoHLR# subscriber imsi 1234567890230001 create
 % Not a valid IMSI: 1234567890230001
 OsmoHLR# subscriber imsi 12345678902300x create
@@ -86,21 +78,6 @@ OsmoHLR# subscriber msisdn 12345 update msisdn 423
 OsmoHLR# subscriber msisdn 12345 show
 % No subscriber for msisdn = '12345'
 
-OsmoHLR# subscriber msisdn 423 update msisdn none
-% Updated subscriber IMSI='123456789023000': removed MSISDN
-OsmoHLR# subscriber msisdn 423 show
-% No subscriber for msisdn = '423'
-OsmoHLR# subscriber imsi 123456789023000 show
-    ID: 1
-    IMSI: 123456789023000
-    MSISDN: none
-OsmoHLR# subscriber imsi 123456789023000 update msisdn 423
-% Updated subscriber IMSI='123456789023000' to MSISDN='423'
-OsmoHLR# subscriber msisdn 423 show
-    ID: 1
-    IMSI: 123456789023000
-    MSISDN: 423
-
 OsmoHLR# subscriber imsi 123456789023000 show
     ID: 1
     IMSI: 123456789023000
@@ -119,10 +96,6 @@ OsmoHLR# subscriber imsi 123456789023000 update ?
   aud2g   Set 2G authentication data
   aud3g   Set UMTS authentication data (3G, and 2G with UMTS AKA)
 
-OsmoHLR# subscriber imsi 123456789023000 update msisdn ?
-  none    Remove MSISDN (phone number)
-  MSISDN  New MSISDN (phone number)
-
 OsmoHLR# subscriber imsi 123456789023000 update aud2g ?
   none       Delete 2G authentication data
   comp128v1  Use COMP128v1 algorithm

tests/test_subscriber_errors.ctrl

@@ -62,26 +62,26 @@ GET 28 subscriber.by-id--9223372036854775809.info
 ERROR 28 Invalid value part of 'by-xxx-value' selector.
 
 GET 29 subscriber.by-id-1+1.info
-ERROR 29 GET variable contains invalid characters
+ERROR 29 Invalid value part of 'by-xxx-value' selector.
 GET 30 subscriber.by-id--.info
 ERROR 30 Invalid value part of 'by-xxx-value' selector.
 GET 31 subscriber.by-id-+1.info
-ERROR 31 GET variable contains invalid characters
+ERROR 31 Invalid value part of 'by-xxx-value' selector.
 GET 32 subscriber.by-id-+-1.info
-ERROR 32 GET variable contains invalid characters
+ERROR 32 Invalid value part of 'by-xxx-value' selector.
 GET 33 subscriber.by-id--+1.info
-ERROR 33 GET variable contains invalid characters
+ERROR 33 Invalid value part of 'by-xxx-value' selector.
 GET 34 subscriber.by-id-++1.info
-ERROR 34 GET variable contains invalid characters
+ERROR 34 Invalid value part of 'by-xxx-value' selector.
 GET 35 subscriber.by-id---1.info
 ERROR 35 Invalid value part of 'by-xxx-value' selector.
 
 GET 36 subscriber.by-id- 1.info
-ERROR 36 GET with trailing characters
+ERROR 36 Command not present.
 GET 37 subscriber.by-id-+ 1.info
-ERROR 37 GET variable contains invalid characters
+ERROR 37 Command not present.
 GET 38 subscriber.by-id-- 1.info
-ERROR 38 GET with trailing characters
+ERROR 38 Command not present.
 
 
 SET 39 subscriber.by-imsi-901990000000001.info foo
@@ -97,9 +97,9 @@ SET 43 subscriber.by-imsi-901990000000001.cs-enabled nonsense
 ERROR 43 Value failed verification.
 
 SET 44 subscriber.by-imsi-901990000000001.ps-enabled
-ERROR 44 SET incomplete
+ERROR err Command parser error.
 SET 45 subscriber.by-imsi-901990000000001.cs-enabled
-ERROR 45 SET incomplete
+ERROR err Command parser error.
 
 GET 46 subscriber.by-imsi-1234567890123456.ps-enabled
 ERROR 46 Invalid value part of 'by-xxx-value' selector.

tests/testsuite.at

@@ -15,13 +15,6 @@ cat $abs_srcdir/auc/auc_ts_55_205_test_sets.err > experr
 AT_CHECK([$abs_top_builddir/tests/auc/auc_ts_55_205_test_sets], [], [expout], [experr])
 AT_CLEANUP
 
-AT_SETUP([gsup])
-AT_KEYWORDS([gsup])
-cat $abs_srcdir/gsup/gsup_test.ok > expout
-cat $abs_srcdir/gsup/gsup_test.err > experr
-AT_CHECK([$abs_top_builddir/tests/gsup/gsup_test], [], [expout], [experr])
-AT_CLEANUP
-
 AT_SETUP([gsup_server])
 AT_KEYWORDS([gsup_server])
 cat $abs_srcdir/gsup_server/gsup_server_test.ok > expout