Change in osmo-msc[master]: use osmo_lu_type_name() from libosmocore

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Fri Jan 11 00:41:50 UTC 2019


Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12523


Change subject: use osmo_lu_type_name() from libosmocore
......................................................................

use osmo_lu_type_name() from libosmocore

Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7
---
M src/libmsc/gsm_04_08.c
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_test_hlr_reject.err
M tests/msc_vlr/msc_vlr_test_hlr_timeout.err
M tests/msc_vlr/msc_vlr_test_ms_timeout.err
M tests/msc_vlr/msc_vlr_test_no_authen.err
M tests/msc_vlr/msc_vlr_test_reject_concurrency.err
M tests/msc_vlr/msc_vlr_test_rest.err
M tests/msc_vlr/msc_vlr_test_ss.err
10 files changed, 63 insertions(+), 72 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/23/12523/1

diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 7ff8681..41797cd 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -308,14 +308,6 @@
 	return vlr_subscr_rx_id_resp(conn->vsub, gh->data+1, gh->data[0]);
 }
 
-/* FIXME: to libosmogsm */
-static const struct value_string lupd_names[] = {
-	{ GSM48_LUPD_NORMAL, "NORMAL" },
-	{ GSM48_LUPD_PERIODIC, "PERIODIC" },
-	{ GSM48_LUPD_IMSI_ATT, "IMSI ATTACH" },
-	{ 0, NULL }
-};
-
 /* Chapter 9.2.15: Receive Location Updating Request.
  * Keep this function non-static for direct invocation by unit tests. */
 int mm_rx_loc_upd_req(struct ran_conn *conn, struct msgb *msg)
@@ -342,7 +334,7 @@
 		LOGP(DMM, LOGL_ERROR,
 		     "Cannot accept another LU, conn already busy establishing authenticity;"
 		     " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n",
-		     gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type));
+		     gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type));
 		return -EINVAL;
 	}
 
@@ -350,15 +342,14 @@
 		LOGP(DMM, LOGL_ERROR,
 		     "Cannot accept another LU, conn already established;"
 		     " extraneous LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n",
-		     gsm48_mi_type_name(mi_type), mi_string, get_value_string(lupd_names, lu->type));
+		     gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type));
 		return -EINVAL;
 	}
 
 	ran_conn_update_id(conn, COMPLETE_LAYER3_LU, mi_string);
 
 	DEBUGP(DMM, "LOCATION UPDATING REQUEST: MI(%s)=%s type=%s\n",
-	       gsm48_mi_type_name(mi_type), mi_string,
-	       get_value_string(lupd_names, lu->type));
+	       gsm48_mi_type_name(mi_type), mi_string, osmo_lu_type_name(lu->type));
 
 	osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, &lu->mi_len);
 
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index e834e91..e50df6d 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -9,7 +9,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -452,7 +452,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -897,7 +897,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976)
@@ -1096,7 +1096,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1325,7 +1325,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -2011,7 +2011,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 69ad9a2..32d9f6b 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -9,7 +9,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -504,7 +504,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1036,7 +1036,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1269,7 +1269,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1491,7 +1491,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -2220,7 +2220,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -2712,7 +2712,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index 1a3d67c..cb7d026 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -9,7 +9,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -89,7 +89,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -171,7 +171,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -320,7 +320,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -468,7 +468,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -617,7 +617,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -697,7 +697,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -847,7 +847,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -925,7 +925,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1004,7 +1004,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1086,7 +1086,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
index 7e49d01..03718e5 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
@@ -10,7 +10,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -98,7 +98,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
index 8e99883..76004cd 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
@@ -10,7 +10,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -118,7 +118,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -356,7 +356,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -556,7 +556,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err
index f865d87..1d7da68 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err
@@ -9,7 +9,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -324,7 +324,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -641,7 +641,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:50462976){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(TMSI)=50462976 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:50462976){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:50462976)
@@ -823,7 +823,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1004,7 +1004,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1211,7 +1211,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1378,7 +1378,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1577,7 +1577,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1739,7 +1739,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1939,7 +1939,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -2167,7 +2167,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index 76431fb..0963d66 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -9,7 +9,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -45,7 +45,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -160,7 +160,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -194,7 +194,7 @@
   MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
 DREF IMSI:901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
-DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DREF IMSI:901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
@@ -282,7 +282,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -411,7 +411,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -535,7 +535,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -669,7 +669,7 @@
   MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
 DREF MSISDN:46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
-DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DREF MSISDN:46071: MSC conn use - dtap == 1 (0x8: cm_service)
   lu_result_sent == 0
   llist_count(&net->ran_conns) == 1
@@ -724,7 +724,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -916,7 +916,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1096,7 +1096,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1252,7 +1252,7 @@
   MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
 DREF MSISDN:46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
-DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DREF MSISDN:46071: MSC conn use - dtap == 1 (0x20: trans_sms)
   lu_result_sent == 0
   llist_count(&net->ran_conns) == 1
@@ -1315,7 +1315,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -1554,7 +1554,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err
index 1b33b2d..ff52aa3 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.err
+++ b/tests/msc_vlr/msc_vlr_test_rest.err
@@ -101,7 +101,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -216,7 +216,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -362,7 +362,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:591536962){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(TMSI)=591536962 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:591536962){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:591536962)
diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err
index 5dcdbbe..7454b50 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.err
+++ b/tests/msc_vlr/msc_vlr_test_ss.err
@@ -9,7 +9,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
@@ -205,7 +205,7 @@
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
-DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
+DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI-ATTACH
 DMM LU/new-LAC: 1/23
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
 DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)

-- 
To view, visit https://gerrit.osmocom.org/12523
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib562bb5fb272c0c3ae0849f32b28faa2c26f9bb7
Gerrit-Change-Number: 12523
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190111/5544e62c/attachment.htm>


More information about the gerrit-log mailing list