gsup_router.c: gsup_route_find(): support blob

Do not require the blob (addr, addr_len) passed to gsup_route_find()
to be nul-terminated. We already have the length, so the nul-termination
is redundant.

This is needed for the upcoming gsup message forwarding patch [1]: we
want to be able to directly pass non-nul-terminated source and
destination name blobs to gsup_route_find().

I have looked into fixing all code that calls gsup_route_find() to never
pass a nul-terminated blob combination. But this is a can of worms,
because it involves both gsup client and server code. Wireshark shows
that clients are sending the nul-terminated string in TLV IEs of IPA
messages. The server assumes that this is the case in various places.
So we would need to fix it in both (server and client), but then we
would lose backwards compatibility with old servers and clients.

[1]: change-id Ia4f345abc877baaf0a8f73b8988e6514d9589bf5

Related: OS#3793
Change-Id: I01a45900e14d41bcd338f50ad85d9fabf2c61405

.gitignore

@@ -2,8 +2,6 @@
 *.lo
 *.la
 *.db
-*.db-shm
-*.db-wal
 *.pyc
 .*.sw?
 .version
@@ -40,7 +38,6 @@ src/gsupclient/gsup-test-client
 tests/atconfig
 tests/testsuite
 tests/testsuite.log
-tests/testsuite.dir
 
 tests/auc/auc_3g_test
 tests/auc/auc_ts_55_205_test_sets.c

configure.ac

@@ -34,10 +34,10 @@ PKG_PROG_PKG_CONFIG([0.20])
 
 PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1])
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0)
 PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0)
 
 PKG_CHECK_MODULES(SQLITE3, sqlite3)
@@ -59,21 +59,6 @@ then
 	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
 fi
 
-AC_ARG_ENABLE([sqlite_talloc],
-		AC_HELP_STRING([--enable-sqlite-talloc],
-				[Configure SQLite3 to use talloc memory allocator [default=no]]),
-		[sqlite_talloc="$enableval"],[sqlite_talloc="no"])
-if test "x$sqlite_talloc" = "xyes" ; then
-	# Older versions of SQLite3 (at least 3.8.2) become unstable with talloc.
-	# Feel free to relax to 3.24.0 > VER > 3.8.2 if it works for you.
-	# FIXME: PKG_CHECK_MODULES() may return cached result here!
-	PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.24.0)
-	AC_DEFINE([SQLITE_USE_TALLOC], 1, [Use talloc for SQLite3])
-fi
-AC_MSG_CHECKING([whether to use talloc for SQLite3])
-AC_MSG_RESULT([$sqlite_talloc])
-AM_CONDITIONAL([DB_SQLITE_DEBUG], [test "x$sqlite_talloc" = "xyes"])
-
 AC_ARG_ENABLE(werror,
 	[AS_HELP_STRING(
 		[--enable-werror],

contrib/jenkins.sh

@@ -58,5 +58,4 @@ if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
 	make -C "$base/doc/manuals" publish
 fi
 
-$MAKE maintainer-clean
 osmo-clean-workspace.sh

debian/changelog

@@ -1,69 +1,3 @@
-osmo-hlr (1.1.0) unstable; urgency=medium
-
-  [ Oliver Smith ]
-  * docs: running: document --db-upgrade
-  * Add IMEI column to subscriber table
-  * Optionally store IMEI in subscriber table
-  * VTY tests: fill DB before running test
-  * VTY: integrate IMEI
-  * hlr.c: replace deprecated osmo_gsup_get_err_msg_type()
-  * hlr.c: move hlr_ctx to the top
-  * tests: use -no-install libtool flag to avoid ./lt-* scripts
-  * Cosmetic: gsup_route_find: comment addr, addrlen
-  * USSD: save MO USSD's originating MSC's vlr_number
-  * USSD: don't use gsm0480_msgb_alloc_name()
-  * hlr.c: forward GSUP messages between clients
-  * db_hlr.c: db_subscr_create(): add flags argument
-  * db_hlr.c: add db_subscr_exists_by_imsi()
-  * Create subscribers on demand
-  * Document subscribers create on demand feature
-  * debian: create -doc subpackage with pdf manuals
-  * db_test: set timezone to work around mktime bug
-  * db_hlr: zero-initialize "struct tm"
-  * rx_check_imei_req(): fix IMEI bounds checking
-  * contrib/jenkins.sh: run "make maintainer-clean"
-  * VTY: add subscriber update network-access-mode
-  * manuals: improve subscribers create on demand
-  * gitignore: ignore everything generated in db_test
-  * db_auc.c: verify hex key sizes read from DB
-
-  [ Max ]
-  * Log ip:port when adding GSUP routes
-  * Add link to project wiki to .service file
-  * Enable statsd support
-
-  [ Vadim Yanitskiy ]
-  * hlr.c: properly terminate the process on SIGTERM
-  * hlr.c: fix: also store the session state in read_cb_forward()
-  * hlr.c: fix: properly print the original message type in read_cb_forward()
-  * hlr.c: check the presence of msgb->l2h in read_cb()
-  * hlr.c: fix possible msgb memleaks in read_cb()
-  * db_hlr.c: add db_subscr_exists_by_msisdn()
-  * src/db.h: use GSM23003_MSISDN_MAX_DIGITS for MSISDN buffer size
-  * src/hlr.c: fix deprecation warning: use gsm48_decode_bcd_number2()
-  * hlr_ussd.c: fix: properly pass invokeID in handle_ussd_own_msisdn()
-  * hlr_ussd.c: rx_proc_ss_req(): fix NULL pointer dereference
-  * build: fix mess with 'db_test_SOURCES' and 'db_test_LDADD'
-  * tests/db_test: close the database when test is finished
-  * src/db.c: integrate SQLite3 with talloc allocator
-
-  [ Neels Hofmeyr ]
-  * USSD: fix routing to multiple MSC
-  * fix error logging for GSUP route
-  * add missing error log: invalid IMSI
-  * osmo-hlr: allow configuring db path from cfg file
-  * use new OSMO_IMSI_BUF_SIZE
-
-  [ Daniel Willmann ]
-  * manuals: Add script to update vty/counter documentation from docker
-  * manuals: Update vty documentation
-
-  [ Pau Espin Pedrol ]
-  * Remove undefined param passed to logging_vty_add_cmds
-  * configure.ac: Require libosmocore 1.2.0
-
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 07 Aug 2019 16:14:23 +0200
-
 osmo-hlr (1.0.0) unstable; urgency=medium
 
   [ Stefan Sperling ]

doc/manuals/chapters/subscribers.adoc

@@ -72,58 +72,19 @@ transceiving only RAND and SRES, may be applicable. (See 3GPP TS 33.102, chapter
 Usually a HLR will only allow mobile equipment (ME) on the network, if the HLR
 has a subscriber entry with the ME's IMSI. But OsmoHLR can also be configured to
 automatically create new entries for new IMSIs, with the
-`subscriber-create-on-demand` VTY option. The obvious use case is creating the
+subscriber-create-on-demand VTY option. The obvious use case is creating the
 new subscriber entry and then allowing the ME to use both the CS
 (Circuit Switched) and PS (Packet Switched) NAM (Network Access Mode).
 
-.osmo-hlr.cfg
-----
-hlr
- subscriber-create-on-demand 5 cs+ps
-----
-
 On the other hand, operators might only want to give network access to IMSIs, of
 which they know the owner. In order to do that, one can set the default NAM to
-`none` and manually approve new subscribers by changing the NAM (e.g. over the
-VTY, see the example below).
+"none" and manually approve new subscribers by enabling their nam_cs and nam_ps
+parameters (e.g. over the VTY).
 
 Oftentimes it is hard to know, which IMSI belongs to which ME, but the IMEI is
 readily available. If you configure your MSC to send IMEI checking requests to
 the HLR, before sending location update requests, the subscribers created on
 demand can also have the IMEI stored in the HLR database. With OsmoMSC, this
-is done by writing `check-imei-rqd early` in the `msc` section of osmo-msc.cfg.
+is done by writing "check-imei-rqd early" in the "msc" section of osmo-msc.cfg.
 Then enable storing the IMEI when receiving check IMEI requests with
-`store-imei` in the OsmoHLR configuration.
-
-.osmo-msc.cfg
-----
-msc
- check-imei-rqd early
-----
-
-.osmo-hlr.cfg
-----
-hlr
- subscriber-create-on-demand 5 none
- store-imei
-----
-
-.Example: Enabling CS and PS NAM via VTY for a known IMEI
-----
-OsmoHLR> enable
-OsmoHLR# subscriber imei 35761300444848 show
-    ID: 1
-    IMSI: 123456789023000
-    MSISDN: 58192 <1>
-    IMEI: 35761300444848
-    CS disabled <2>
-    PS disabled <2>
-OsmoHLR# subscriber imei 35761300444848 update network-access-mode cs+ps
-OsmoHLR# subscriber imei 35761300444848 show
-    ID: 1
-    IMSI: 123456789023000
-    MSISDN: 58192
-    IMEI: 35761300444848
-----
-<1> Randomly generated 5 digit MSISDN
-<2> Disabled CS and PS NAM prevent the subscriber from accessing the network
+"store-imei" in the OsmoHLR configuration.

doc/manuals/vty/hlr_vty_reference.xml

@@ -811,22 +811,6 @@
         <param name='IMEI' doc='Set IMEI (use for debug only!)' />
       </params>
     </command>
-    <command id='subscriber (imsi|msisdn|id|imei) IDENT update network-access-mode (none|cs|ps|cs+ps)'>
-      <params>
-        <param name='subscriber' doc='Subscriber management commands' />
-        <param name='imsi' doc='Identify subscriber by IMSI' />
-        <param name='msisdn' doc='Identify subscriber by MSISDN (phone number)' />
-        <param name='id' doc='Identify subscriber by database ID' />
-        <param name='imei' doc='Identify subscriber by IMEI' />
-        <param name='IDENT' doc='IMSI/MSISDN/ID/IMEI of the subscriber' />
-        <param name='update' doc='Set or update subscriber data' />
-        <param name='network-access-mode' doc='Set Network Access Mode (NAM) of the subscriber' />
-        <param name='none' doc='Do not allow access to circuit switched or packet switched services' />
-        <param name='cs' doc='Allow access to circuit switched services only' />
-        <param name='ps' doc='Allow access to packet switched services only' />
-        <param name='cs+ps' doc='Allow access to both circuit and packet switched services' />
-      </params>
-    </command>
   </node>
   <node id='config'>
     <name>config</name>

src/Makefile.am

@@ -87,6 +87,21 @@ osmo_hlr_db_tool_LDADD = \
 	$(SQLITE3_LIBS) \
 	$(NULL)
 
+db_test_SOURCES = \
+	auc.c \
+	db.c \
+	db_auc.c \
+	db_test.c \
+	logging.c \
+	rand_fake.c \
+	$(NULL)
+
+db_test_LDADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(SQLITE3_LIBS) \
+	$(NULL)
+
 osmo_euse_demo_SOURCES = \
 	osmo-euse-demo.c \
 	$(NULL)
@@ -97,11 +112,6 @@ osmo_euse_demo_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
 
-if DB_SQLITE_DEBUG
-osmo_hlr_SOURCES += db_debug.c
-osmo_hlr_db_tool_SOURCES += db_debug.c
-endif
-
 BOOTSTRAP_SQL = $(top_srcdir)/sql/hlr.sql
 
 db_bootstrap.h: $(BOOTSTRAP_SQL) $(srcdir)/db_sql2c.sed

src/db.c

@@ -365,17 +365,6 @@ struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logg
 	LOGP(DDB, LOGL_INFO, "Compiled against SQLite3 lib version %s\n", SQLITE_VERSION);
 	LOGP(DDB, LOGL_INFO, "Running with SQLite3 lib version %s\n", sqlite3_libversion());
 
-#ifdef SQLITE_USE_TALLOC
-	/* Configure SQLite3 to use talloc memory allocator */
-	rc = db_sqlite3_use_talloc(ctx);
-	if (rc == SQLITE_OK) {
-		LOGP(DDB, LOGL_NOTICE, "SQLite3 is configured to use talloc\n");
-	} else {
-		LOGP(DDB, LOGL_ERROR, "Failed to configure SQLite3 "
-		     "to use talloc, using default memory allocator\n");
-	}
-#endif
-
 	dbc->fname = talloc_strdup(dbc, fname);
 
 	for (i = 0; i < 0xfffff; i++) {

src/db.h

@@ -39,11 +39,6 @@ struct db_context {
 	sqlite3_stmt *stmt[_NUM_DB_STMT];
 };
 
-/* Optional feature to make SQLite3 using talloc */
-#ifdef SQLITE_USE_TALLOC
-int db_sqlite3_use_talloc(void *ctx);
-#endif
-
 void db_remove_reset(sqlite3_stmt *stmt);
 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);

src/db_auc.c

@@ -73,32 +73,6 @@ out:
 	return ret;
 }
 
-/* hexparse a specific column of a sqlite prepared statement into dst (with length check)
- * returns 0 for success, -EIO on error */
-static int hexparse_stmt(uint8_t *dst, size_t dst_len, sqlite3_stmt *stmt, int col, const char *col_name,
-			 const char *imsi)
-{
-	const uint8_t *text;
-	size_t col_len;
-
-	/* Bytes are stored as hex strings in database, hence divide length by two */
-	col_len = sqlite3_column_bytes(stmt, col) / 2;
-
-	if (col_len != dst_len) {
-		LOGAUC(imsi, LOGL_ERROR, "Error reading %s, expected length %lu but has length %lu\n", col_name,
-		       dst_len, col_len);
-		return -EIO;
-	}
-
-	text = sqlite3_column_text(stmt, col);
-	if (!text) {
-		LOGAUC(imsi, LOGL_ERROR, "Error reading %s\n", col_name);
-		return -EIO;
-	}
-	osmo_hexparse((void *)text, dst, dst_len);
-	return 0;
-}
-
 /* 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,
@@ -139,34 +113,49 @@ int db_get_auth_data(struct db_context *dbc, const char *imsi,
 	/* obtain result values using sqlite3_column_*() */
 	if (sqlite3_column_type(stmt, 1) == SQLITE_INTEGER) {
 		/* we do have some 2G authentication data */
-		if (hexparse_stmt(aud2g->u.gsm.ki, sizeof(aud2g->u.gsm.ki), stmt, 2, "Ki", imsi))
-			goto end_2g;
+		const uint8_t *ki;
+
 		aud2g->algo = sqlite3_column_int(stmt, 1);
+		ki = sqlite3_column_text(stmt, 2);
+#if 0
+		if (sqlite3_column_bytes(stmt, 2) != sizeof(aud2g->u.gsm.ki)) {
+			LOGAUC(imsi, LOGL_ERROR, "Error reading Ki: %d\n", rc);
+			goto end_2g;
+		}
+#endif
+		osmo_hexparse((void*)ki, (void*)&aud2g->u.gsm.ki, sizeof(aud2g->u.gsm.ki));
 		aud2g->type = OSMO_AUTH_TYPE_GSM;
 	} else
 		LOGAUC(imsi, LOGL_DEBUG, "No 2G Auth Data\n");
-end_2g:
+//end_2g:
 	if (sqlite3_column_type(stmt, 3) == SQLITE_INTEGER) {
 		/* we do have some 3G authentication data */
-		if (hexparse_stmt(aud3g->u.umts.k, sizeof(aud3g->u.umts.k), stmt, 4, "K", imsi)) {
+		const uint8_t *k, *op, *opc;
+
+		aud3g->algo = sqlite3_column_int(stmt, 3);
+		k = sqlite3_column_text(stmt, 4);
+		if (!k) {
+			LOGAUC(imsi, LOGL_ERROR, "Error reading K: %d\n", rc);
 			ret = -EIO;
 			goto out;
 		}
-		aud3g->algo = sqlite3_column_int(stmt, 3);
-
+		osmo_hexparse((void*)k, (void*)&aud3g->u.umts.k, sizeof(aud3g->u.umts.k));
 		/* UMTS Subscribers can have either OP or OPC */
-		if (sqlite3_column_text(stmt, 5)) {
-			if (hexparse_stmt(aud3g->u.umts.opc, sizeof(aud3g->u.umts.opc), stmt, 5, "OP", imsi)) {
-				ret = -EIO;
-				goto out;
-			}
-			aud3g->u.umts.opc_is_op = 1;
-		} else {
-			if (hexparse_stmt(aud3g->u.umts.opc, sizeof(aud3g->u.umts.opc), stmt, 6, "OPC", imsi)) {
+		op = sqlite3_column_text(stmt, 5);
+		if (!op) {
+			opc = sqlite3_column_text(stmt, 6);
+			if (!opc) {
+				LOGAUC(imsi, LOGL_ERROR, "Error reading OPC: %d\n", rc);
 				ret = -EIO;
 				goto out;
 			}
+			osmo_hexparse((void*)opc, (void*)&aud3g->u.umts.opc,
+					sizeof(aud3g->u.umts.opc));
 			aud3g->u.umts.opc_is_op = 0;
+		} else {
+			osmo_hexparse((void*)op, (void*)&aud3g->u.umts.opc,
+					sizeof(aud3g->u.umts.opc));
+			aud3g->u.umts.opc_is_op = 1;
 		}
 		aud3g->u.umts.sqn = sqlite3_column_int64(stmt, 7);
 		aud3g->u.umts.ind_bitlen = sqlite3_column_int(stmt, 8);

src/db_debug.c

@@ -1,86 +0,0 @@
-/*
- * libtalloc based memory allocator for SQLite3.
- *
- * (C) 2019 by Vadim Yanitskiy <axilirator@gmail.com>
- *
- * 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 <sqlite3.h>
-#include <talloc.h>
-#include <errno.h>
-
-/* Dedicated talloc context for SQLite */
-static void *db_sqlite_ctx = NULL;
-
-static void *tall_xMalloc(int size)
-{
-	return talloc_size(db_sqlite_ctx, size);
-}
-
-static void tall_xFree(void *ptr)
-{
-	talloc_free(ptr);
-}
-
-static void *tall_xRealloc(void *ptr, int size)
-{
-	return talloc_realloc_fn(db_sqlite_ctx, ptr, size);
-}
-
-static int tall_xSize(void *ptr)
-{
-	return talloc_total_size(ptr);
-}
-
-/* DUMMY: talloc doesn't round up the allocation size */
-static int tall_xRoundup(int size) { return size; }
-
-/* DUMMY: nothing to initialize */
-static int tall_xInit(void *data) { return 0; }
-
-/* DUMMY: nothing to deinitialize */
-static void tall_xShutdown(void *data) {  }
-
-/* Interface between SQLite and talloc memory allocator */
-static const struct sqlite3_mem_methods tall_sqlite_if = {
-	/* Memory allocation function */
-	.xMalloc = &tall_xMalloc,
-	/* Free a prior allocation */
-	.xFree = &tall_xFree,
-	/* Resize an allocation */
-	.xRealloc = &tall_xRealloc,
-	/* Return the size of an allocation */
-	.xSize = &tall_xSize,
-	/* Round up request size to allocation size */
-	.xRoundup = &tall_xRoundup,
-	/* Initialize the memory allocator */
-	.xInit = &tall_xInit,
-	/* Deinitialize the memory allocator */
-	.xShutdown = &tall_xShutdown,
-	/* Argument to xInit() and xShutdown() */
-	.pAppData = NULL,
-};
-
-int db_sqlite3_use_talloc(void *ctx)
-{
-	if (db_sqlite_ctx != NULL)
-		return -EEXIST;
-
-	db_sqlite_ctx = talloc_named_const(ctx, 0, "SQLite3");
-	return sqlite3_config(SQLITE_CONFIG_MALLOC, &tall_sqlite_if);
-}

src/gsup_router.c

@@ -40,8 +40,14 @@ struct osmo_gsup_conn *gsup_route_find(struct osmo_gsup_server *gs,
 	struct gsup_route *gr;
 
 	llist_for_each_entry(gr, &gs->routes, list) {
-		if (talloc_total_size(gr->addr) == addrlen &&
-		    !memcmp(gr->addr, addr, addrlen))
+		size_t gr_addrlen = talloc_total_size(gr->addr); /* gr->addr is a nul-terminated string */
+
+		/* FIXME: despite passing addrlen, a lot of code assumes that addr is also nul-terminated */
+		if (gr_addrlen == addrlen && !memcmp(gr->addr, addr, addrlen))
+			return gr->conn;
+
+		/* Compare addr as non-nul-terminated blob */
+		if (gr_addrlen - 1 == addrlen && !memcmp(gr->addr, addr, addrlen))
 			return gr->conn;
 	}
 	return NULL;

src/hlr.c

@@ -846,7 +846,7 @@ int main(int argc, char **argv)
 	vty_init(&vty_info);
 	ctrl_vty_init(hlr_ctx);
 	handle_options(argc, argv);
-	hlr_vty_init();
+	hlr_vty_init(&hlr_log_info);
 
 	rc = vty_read_config_file(cmdline_opts.config_file, NULL);
 	if (rc < 0) {

src/hlr_ussd.c

@@ -336,11 +336,11 @@ static int handle_ussd_own_msisdn(struct osmo_gsup_conn *conn, struct ss_session
 		ss_tx_ussd_7bit(ss, true, req->invoke_id, buf);
 		break;
 	case -ENOENT:
-		ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_UNKNOWN_SUBSCRIBER);
+		ss_tx_error(ss, true, GSM0480_ERR_CODE_UNKNOWN_SUBSCRIBER);
 		break;
 	case -EIO:
 	default:
-		ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SYSTEM_FAILURE);
+		ss_tx_error(ss, true, GSM0480_ERR_CODE_SYSTEM_FAILURE);
 		break;
 	}
 	return 0;
@@ -519,11 +519,6 @@ int rx_proc_ss_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *
 			/* FIXME: Send a Reject component? */
 			goto out_err;
 		}
-	} else if (gsup->session_state != OSMO_GSUP_SESSION_STATE_END) {
-		LOGP(DSS, LOGL_ERROR, "%s/0x%082x: Missing SS payload for '%s'\n",
-		     gsup->imsi, gsup->session_id,
-		     osmo_gsup_session_state_name(gsup->session_state));
-		goto out_err;
 	}
 
 	switch (gsup->session_state) {
@@ -611,18 +606,13 @@ int rx_proc_ss_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *
 				gsup->imsi, gsup->session_id);
 			goto out_err;
 		}
-
-		/* SS payload is optional for END */
-		if (gsup->ss_info && gsup->ss_info_len) {
-			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);
-			}
+		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:

src/hlr_vty.c

@@ -429,9 +429,9 @@ int hlr_vty_is_config_node(struct vty *vty, int node)
 	}
 }
 
-void hlr_vty_init(void)
+void hlr_vty_init(const struct log_info *cat)
 {
-	logging_vty_add_cmds();
+	logging_vty_add_cmds(cat);
 	osmo_talloc_vty_add_cmds();
 	osmo_stats_vty_add_cmds();
 

src/hlr_vty.h

@@ -35,4 +35,4 @@ enum hlr_vty_node {
 
 int hlr_vty_is_config_node(struct vty *vty, int node);
 int hlr_vty_go_parent(struct vty *vty);
-void hlr_vty_init(void);
+void hlr_vty_init(const struct log_info *cat);

src/hlr_vty_subscr.c

@@ -577,33 +577,6 @@ DEFUN(subscriber_imei,
 	return CMD_SUCCESS;
 }
 
-DEFUN(subscriber_nam,
-      subscriber_nam_cmd,
-      SUBSCR_UPDATE "network-access-mode (none|cs|ps|cs+ps)",
-      SUBSCR_UPDATE_HELP
-      "Set Network Access Mode (NAM) of the subscriber\n"
-      "Do not allow access to circuit switched or packet switched services\n"
-      "Allow access to circuit switched services only\n"
-      "Allow access to packet switched services only\n"
-      "Allow access to both circuit and packet switched services\n")
-{
-	struct hlr_subscriber subscr;
-	const char *id_type = argv[0];
-	const char *id = argv[1];
-	bool nam_cs = strstr(argv[2], "cs");
-	bool nam_ps = strstr(argv[2], "ps");
-
-	if (get_subscr_by_argv(vty, id_type, id, &subscr))
-		return CMD_WARNING;
-
-	if (nam_cs != subscr.nam_cs)
-		hlr_subscr_nam(g_hlr, &subscr, nam_cs, 0);
-	if (nam_ps != subscr.nam_ps)
-		hlr_subscr_nam(g_hlr, &subscr, nam_ps, 1);
-
-	return CMD_SUCCESS;
-}
-
 
 void hlr_vty_subscriber_init(void)
 {
@@ -617,5 +590,4 @@ void hlr_vty_subscriber_init(void)
 	install_element(ENABLE_NODE, &subscriber_no_aud3g_cmd);
 	install_element(ENABLE_NODE, &subscriber_aud3g_cmd);
 	install_element(ENABLE_NODE, &subscriber_imei_cmd);
-	install_element(ENABLE_NODE, &subscriber_nam_cmd);
 }

tests/db/Makefile.am

@@ -26,20 +26,16 @@ db_test_SOURCES = \
 	$(NULL)
 
 db_test_LDADD = \
-	$(top_builddir)/src/logging.o \
-	$(top_builddir)/src/db_auc.o \
-	$(top_builddir)/src/db_hlr.o \
-	$(top_builddir)/src/db.o \
+	$(top_srcdir)/src/db.c \
+	$(top_srcdir)/src/db_hlr.c \
+	$(top_srcdir)/src/db_auc.c \
+	$(top_srcdir)/src/logging.c \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(NULL)
 
-if DB_SQLITE_DEBUG
-db_test_LDADD += $(top_builddir)/src/db_debug.o
-endif
-
 .PHONY: db_test.db update_exp manual manual-nonverbose manual-gdb
 db_test.db:
 	rm -f db_test.db

tests/db/db_test.c

@@ -208,17 +208,6 @@ void dump_aud(const char *label, struct osmo_sub_auth_data *aud)
 #undef Phex
 }
 
-void db_raw_sql(struct db_context *dbc, const char *sql)
-{
-	sqlite3_stmt *stmt;
-
-	fprintf(stderr, "raw SQL: %s\n", sql);
-	ASSERT_RC(sqlite3_prepare_v2(dbc->db, sql, -1, &stmt, NULL), SQLITE_OK);
-	ASSERT_RC(sqlite3_step(stmt), SQLITE_DONE);
-	db_remove_reset(stmt);
-	sqlite3_finalize(stmt);
-}
-
 static const char *imsi0 = "123456789000000";
 static const char *imsi1 = "123456789000001";
 static const char *imsi2 = "123456789000002";
@@ -760,70 +749,6 @@ static void test_subscr_aud()
 	comment_end();
 }
 
-/* Make each key too short in this test. Note that we can't set them longer than the allowed size without changing the
- * table structure. */
-static void test_subscr_aud_invalid_len()
-{
-	int64_t id;
-
-	comment_start();
-	comment("Create subscriber");
-	ASSERT_RC(db_subscr_create(dbc, imsi0, DB_SUBSCR_FLAG_NAM_CS | DB_SUBSCR_FLAG_NAM_PS), 0);
-	ASSERT_SEL(imsi, imsi0, 0);
-	id = g_subscr.id;
-
-
-	/* Invalid Ki length */
-	comment("Set auth data, 2G only, with invalid Ki length");
-	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		  mk_aud_2g(OSMO_AUTH_ALG_COMP128v1, "0123456789abcdef0123456789abcdef")),
-		  0);
-	/* Use raw SQL to avoid length check in db_subscr_update_aud_by_id(). This changes all rows in the table, which
-         * is fine for this test (implicit WHERE 1). */
-	db_raw_sql(dbc, "UPDATE auc_2g SET ki = '0123456789abcdef0123456789abcde'");
-	ASSERT_SEL_AUD(imsi0, -ENOKEY, id);
-
-	comment("Remove 2G auth data");
-	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		  mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)),
-		  0);
-
-	/* Invalid K length */
-	comment("Set auth data, 3G only, with invalid K length");
-	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		mk_aud_3g(OSMO_AUTH_ALG_MILENAGE,
-			  "BeefedCafeFaceAcedAddedDecadeFee", true,
-			  "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)),
-		0);
-	db_raw_sql(dbc, "UPDATE auc_3g SET k = 'C01ffedC1cadaeAc1d1f1edAcac1aB0'");
-	ASSERT_SEL_AUD(imsi0, -EIO, id);
-
-	/* Invalid OP length */
-	comment("Set auth data, 3G only, with invalid OP length");
-	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		mk_aud_3g(OSMO_AUTH_ALG_MILENAGE,
-			  "BeefedCafeFaceAcedAddedDecadeFee", true,
-			  "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)),
-		0);
-	db_raw_sql(dbc, "UPDATE auc_3g SET op = 'BeefedCafeFaceAcedAddedDecadeFe'");
-	ASSERT_SEL_AUD(imsi0, -EIO, id);
-
-	/* Invalid OPC length */
-	comment("Set auth data, 3G only, with invalid OPC length");
-	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		mk_aud_3g(OSMO_AUTH_ALG_MILENAGE,
-			  "BeefedCafeFaceAcedAddedDecadeFee", false,
-			  "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)),
-		0);
-	db_raw_sql(dbc, "UPDATE auc_3g SET opc = 'BeefedCafeFaceAcedAddedDecadeFe'");
-	ASSERT_SEL_AUD(imsi0, -EIO, id);
-
-
-	comment("Delete subscriber");
-	ASSERT_RC(db_subscr_delete_by_id(dbc, id), 0);
-	comment_end();
-}
-
 static void test_subscr_sqn()
 {
 	int64_t id;
@@ -975,11 +900,9 @@ int main(int argc, char **argv)
 
 	test_subscr_create_update_sel_delete();
 	test_subscr_aud();
-	test_subscr_aud_invalid_len();
 	test_subscr_sqn();
 
 	printf("Done\n");
-	db_close(dbc);
 	return 0;
 }
 

tests/db/db_test.err

@@ -1338,91 +1338,6 @@ DAUC IMSI='123456789000000': No such subscriber
 ===== test_subscr_aud: SUCCESS
 
 
-===== test_subscr_aud_invalid_len
-
---- Create subscriber
-
-db_subscr_create(dbc, imsi0, DB_SUBSCR_FLAG_NAM_CS | DB_SUBSCR_FLAG_NAM_PS) --> 0
-
-db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0
-struct hlr_subscriber {
-  .id = 1,
-  .imsi = '123456789000000',
-}
-
-
---- Set auth data, 2G only, with invalid Ki length
-
-db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_COMP128v1, "0123456789abcdef0123456789abcdef")) --> 0
-
-raw SQL: UPDATE auc_2g SET ki = '0123456789abcdef0123456789abcde'
-sqlite3_prepare_v2(dbc->db, sql, -1, &stmt, NULL) --> SQLITE_OK
-
-sqlite3_step(stmt) --> SQLITE_DONE
-
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -126
-DAUC IMSI='123456789000000': Error reading Ki, expected length 16 but has length 15
-DAUC IMSI='123456789000000': No 3G Auth Data
-
-
-
---- Remove 2G auth data
-
-db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)) --> 0
-
-
---- Set auth data, 3G only, with invalid K length
-
-db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_MILENAGE, "BeefedCafeFaceAcedAddedDecadeFee", true, "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)) --> 0
-
-raw SQL: UPDATE auc_3g SET k = 'C01ffedC1cadaeAc1d1f1edAcac1aB0'
-sqlite3_prepare_v2(dbc->db, sql, -1, &stmt, NULL) --> SQLITE_OK
-
-sqlite3_step(stmt) --> SQLITE_DONE
-
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -5
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': Error reading K, expected length 16 but has length 15
-
-
-
---- Set auth data, 3G only, with invalid OP length
-
-db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_MILENAGE, "BeefedCafeFaceAcedAddedDecadeFee", true, "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)) --> 0
-
-raw SQL: UPDATE auc_3g SET op = 'BeefedCafeFaceAcedAddedDecadeFe'
-sqlite3_prepare_v2(dbc->db, sql, -1, &stmt, NULL) --> SQLITE_OK
-
-sqlite3_step(stmt) --> SQLITE_DONE
-
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -5
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': Error reading OP, expected length 16 but has length 15
-
-
-
---- Set auth data, 3G only, with invalid OPC length
-
-db_subscr_update_aud_by_id(dbc, id, mk_aud_3g(OSMO_AUTH_ALG_MILENAGE, "BeefedCafeFaceAcedAddedDecadeFee", false, "C01ffedC1cadaeAc1d1f1edAcac1aB0a", 5)) --> 0
-
-raw SQL: UPDATE auc_3g SET opc = 'BeefedCafeFaceAcedAddedDecadeFe'
-sqlite3_prepare_v2(dbc->db, sql, -1, &stmt, NULL) --> SQLITE_OK
-
-sqlite3_step(stmt) --> SQLITE_DONE
-
-db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> -5
-DAUC IMSI='123456789000000': No 2G Auth Data
-DAUC IMSI='123456789000000': Error reading OPC, expected length 16 but has length 15
-
-
-
---- Delete subscriber
-
-db_subscr_delete_by_id(dbc, id) --> 0
-
-===== test_subscr_aud_invalid_len: SUCCESS
-
-
 ===== test_subscr_sqn
 
 --- Set SQN for unknown subscriber

tests/test_subscriber.vty

@@ -12,7 +12,6 @@ OsmoHLR# list
   subscriber (imsi|msisdn|id|imei) IDENT update aud3g none
   subscriber (imsi|msisdn|id|imei) IDENT update aud3g milenage k K (op|opc) OP_C [ind-bitlen] [<0-28>]
   subscriber (imsi|msisdn|id|imei) IDENT update imei (none|IMEI)
-  subscriber (imsi|msisdn|id|imei) IDENT update network-access-mode (none|cs|ps|cs+ps)
 
 OsmoHLR# subscriber?
   subscriber  Subscriber management commands
@@ -126,11 +125,10 @@ OsmoHLR# subscriber msisdn 423 show
     MSISDN: 423
 
 OsmoHLR# subscriber imsi 123456789023000 update ?
-  msisdn               Set MSISDN (phone number) of the subscriber
-  aud2g                Set 2G authentication data
-  aud3g                Set UMTS authentication data (3G, and 2G with UMTS AKA)
-  imei                 Set IMEI of the subscriber (normally populated from MSC, no need to set this manually)
-  network-access-mode  Set Network Access Mode (NAM) of the subscriber
+  msisdn  Set MSISDN (phone number) of the subscriber
+  aud2g   Set 2G authentication data
+  aud3g   Set UMTS authentication data (3G, and 2G with UMTS AKA)
+  imei    Set IMEI of the subscriber (normally populated from MSC, no need to set this manually)
 
 OsmoHLR# subscriber imsi 123456789023000 update msisdn ?
   none    Remove MSISDN (phone number)
@@ -439,35 +437,3 @@ OsmoHLR# show subscriber id 99
     IMSI: 000000000000099
     MSISDN: none
     IMEI: 12345 (INVALID LENGTH!)
-
-OsmoHLR# subscriber imsi 123456789023000 create
-% Created subscriber 123456789023000
-    ID: 101
-    IMSI: 123456789023000
-    MSISDN: none
-OsmoHLR# subscriber imsi 123456789023000 update network-access-mode none
-OsmoHLR# subscriber imsi 123456789023000 show
-    ID: 101
-    IMSI: 123456789023000
-    MSISDN: none
-    CS disabled
-    PS disabled
-OsmoHLR# subscriber imsi 123456789023000 update network-access-mode cs
-OsmoHLR# subscriber imsi 123456789023000 show
-    ID: 101
-    IMSI: 123456789023000
-    MSISDN: none
-    PS disabled
-OsmoHLR# subscriber imsi 123456789023000 update network-access-mode ps
-OsmoHLR# subscriber imsi 123456789023000 show
-    ID: 101
-    IMSI: 123456789023000
-    MSISDN: none
-    CS disabled
-OsmoHLR# subscriber imsi 123456789023000 update network-access-mode cs+ps
-OsmoHLR# subscriber imsi 123456789023000 show
-    ID: 101
-    IMSI: 123456789023000
-    MSISDN: none
-OsmoHLR# subscriber imsi 123456789023000 delete
-% Deleted subscriber for IMSI '123456789023000'