Change in osmo-msc[master]: send the RAT type (GERAN-A / UTRAN-Iu) to HLR on LU

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
Thu Jan 3 02:17:22 UTC 2019 

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


Change subject: send the RAT type (GERAN-A / UTRAN-Iu) to HLR on LU
......................................................................

send the RAT type (GERAN-A / UTRAN-Iu) to HLR on LU

Use new OSMO_GSUP_RAT_TYPES_IE to transmit the subscriber's RAT type to the
HLR.

Depends: I3e399ca8a85421f77a9a15e608413d1507722955 (osmo-hlr)
Change-Id: I1b0c43c5ab03bc4dd146fdb3f5479b131d4f3b67
---
M src/libvlr/vlr.c
M tests/msc_vlr/msc_vlr_test_authen_reuse.c
M tests/msc_vlr/msc_vlr_test_authen_reuse.err
M tests/msc_vlr/msc_vlr_test_call.c
M tests/msc_vlr/msc_vlr_test_call.err
M tests/msc_vlr/msc_vlr_test_gsm_authen.c
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_gsm_ciph.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_test_hlr_reject.c
M tests/msc_vlr/msc_vlr_test_hlr_reject.err
M tests/msc_vlr/msc_vlr_test_hlr_timeout.c
M tests/msc_vlr/msc_vlr_test_hlr_timeout.err
M tests/msc_vlr/msc_vlr_test_ms_timeout.c
M tests/msc_vlr/msc_vlr_test_ms_timeout.err
M tests/msc_vlr/msc_vlr_test_no_authen.c
M tests/msc_vlr/msc_vlr_test_no_authen.err
M tests/msc_vlr/msc_vlr_test_reject_concurrency.c
M tests/msc_vlr/msc_vlr_test_reject_concurrency.err
M tests/msc_vlr/msc_vlr_test_rest.c
M tests/msc_vlr/msc_vlr_test_rest.err
M tests/msc_vlr/msc_vlr_test_ss.c
M tests/msc_vlr/msc_vlr_test_ss.err
M tests/msc_vlr/msc_vlr_test_umts_authen.c
M tests/msc_vlr/msc_vlr_test_umts_authen.err
25 files changed, 177 insertions(+), 175 deletions(-)



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

diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index 7aad502..2f9139d 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -638,6 +638,8 @@
 
 	gsup_msg.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST;
 	gsup_msg.cn_domain = vsub->vlr->cfg.is_ps ? OSMO_GSUP_CN_DOMAIN_PS : OSMO_GSUP_CN_DOMAIN_CS;
+	gsup_msg.rat_types[0] = vsub->cs.attached_via_ran;
+	gsup_msg.rat_types_len = 1;
 	rc = vlr_subscr_tx_gsup_message(vsub, &gsup_msg);
 
 	return rc;
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
index bdbdae3..cee6046 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
@@ -85,7 +85,7 @@
 
 	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-		gsup_expect_tx("04010809710000000156f0280102");
+		gsup_expect_tx("04010809710000000156f0280102290101");
 		ms_sends_msg("0554" "e229c19e" "2104" "791f2e41");
 		VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -98,7 +98,7 @@
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 		btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");
-		gsup_expect_tx("04010809710000000156f0280102");
+		gsup_expect_tx("04010809710000000156f0280102290102");
 		ms_sends_security_mode_complete();
 		VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
index e721579..5da6426 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
@@ -73,8 +73,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -503,8 +503,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
@@ -941,8 +941,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1452,8 +1452,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
@@ -1984,8 +1984,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -2319,8 +2319,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index b5f6b6c..e9140f8 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -122,7 +122,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000000156f0280102");
+	gsup_expect_tx("04010809710000000156f0280102290102");
 	ms_sends_security_mode_complete();
 	VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err
index 8f65c58..5a77f37 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -89,8 +89,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
@@ -472,8 +472,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
@@ -854,8 +854,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
@@ -1202,8 +1202,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
@@ -1547,8 +1547,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 46dd9a1..a2e22e6 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -75,7 +75,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -269,7 +269,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -446,7 +446,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05545afc8d72");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -551,7 +551,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -654,7 +654,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -785,7 +785,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000000156f0280102");
+	gsup_expect_tx("04010809710000000156f0280102290101");
 	ms_sends_msg("0554" "9b36efdf");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index 920f717..6d6595b 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -91,8 +91,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -538,8 +538,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -954,8 +954,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1188,8 +1188,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1419,8 +1419,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1663,8 +1663,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index a641ec2..f362116 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -77,7 +77,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0632");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -292,7 +292,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0632");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -531,7 +531,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0632");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -641,7 +641,7 @@
 	vlr_subscr_put(vsub);
 
 	btw("MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("063217094b32244332244372f5");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -736,7 +736,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0632");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -915,7 +915,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000000156f0280102");
+	gsup_expect_tx("04010809710000000156f0280102290101");
 	ms_sends_msg("0632");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -1109,7 +1109,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0632");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -1330,7 +1330,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0632");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index f0be4d7..9b9c303 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -98,8 +98,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
@@ -598,8 +598,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
@@ -1133,8 +1133,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
@@ -1375,8 +1375,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - Subscriber has the IMEISV
@@ -1592,8 +1592,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
@@ -1848,8 +1848,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
@@ -2324,8 +2324,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
@@ -2820,8 +2820,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
index 13bed42..6aae71c 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
@@ -114,7 +114,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -203,7 +203,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -326,7 +326,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -371,7 +371,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -400,7 +400,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -424,7 +424,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index 063928f..b331922 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -236,8 +236,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -385,8 +385,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -537,8 +537,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -769,8 +769,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1037,8 +1037,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -1120,8 +1120,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
index b23a7a7..3911ae3 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
@@ -73,7 +73,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
index f7939f0..b70243a 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
@@ -119,8 +119,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
index 3702a0c..d1d10c6 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
@@ -125,7 +125,7 @@
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 	btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("05542d8b2c3e");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
@@ -198,7 +198,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
index 682f200..7ec719f 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
@@ -182,8 +182,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -380,8 +380,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c
index 3162149..1095595 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -35,7 +35,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -177,7 +177,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -327,7 +327,7 @@
 	BTW("subscriber sends LU Request, this time with the TMSI");
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130" "05f4" "03020100");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -400,7 +400,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -471,7 +471,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -555,7 +555,7 @@
 	OSMO_ASSERT(dtap_tx_confirmed);
 
 	btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0559094332244332244372f5");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -618,7 +618,7 @@
 	OSMO_ASSERT(dtap_tx_confirmed);
 
 	btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0559094332244332244372f5");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -698,7 +698,7 @@
 	OSMO_ASSERT(dtap_tx_confirmed);
 
 	btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0559094332244332244372f5");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -754,7 +754,7 @@
 	OSMO_ASSERT(dtap_tx_confirmed);
 
 	btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0559095332244332244372f6");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -840,7 +840,7 @@
 	OSMO_ASSERT(dtap_tx_confirmed);
 
 	btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0559094332244332244372f5");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -934,7 +934,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err
index 11d6e8b..3235892 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err
@@ -29,8 +29,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -348,8 +348,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -667,8 +667,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -853,8 +853,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -1036,8 +1036,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -1261,8 +1261,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1430,8 +1430,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1631,8 +1631,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1793,8 +1793,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1997,8 +1997,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -2211,8 +2211,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
index 66d2e39..8200bda 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
@@ -30,7 +30,7 @@
 
 	btw("Location Update Request on one connection");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -73,7 +73,7 @@
 {
 	btw("Location Update Request");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index 3d428aa..3e2e478 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -29,8 +29,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -182,8 +182,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -306,8 +306,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -437,8 +437,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -563,8 +563,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -755,8 +755,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -950,8 +950,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -1133,8 +1133,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -1355,8 +1355,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -1597,8 +1597,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c
index 4587383..3f2bb7a 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.c
+++ b/tests/msc_vlr/msc_vlr_test_rest.c
@@ -85,7 +85,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -116,7 +116,7 @@
 	BTW("verify that the MS can send another LU request");
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -168,7 +168,7 @@
 	thwart_rx_non_initial_requests();
 
 	btw("MS tells us the IMSI, causes a GSUP LU request to HLR");
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("0559089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err
index 7a1102f..8476309 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.err
+++ b/tests/msc_vlr/msc_vlr_test_rest.err
@@ -121,8 +121,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -236,8 +236,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -414,8 +414,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_TMSI-0x23422342_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_TMSI-0x23422342_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000004620_TMSI-0x23422342: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_TMSI-0x23422342_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c
index 0390196..ab0386c 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.c
+++ b/tests/msc_vlr/msc_vlr_test_ss.c
@@ -47,7 +47,7 @@
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
-	gsup_expect_tx("04010809710000004026f0280102");
+	gsup_expect_tx("04010809710000004026f0280102290101");
 	ms_sends_msg("050802008168000130089910070000006402");
 	OSMO_ASSERT(gsup_tx_confirmed);
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err
index 6e0684e..671eddc 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.err
+++ b/tests/msc_vlr/msc_vlr_test_ss.err
@@ -29,8 +29,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -228,8 +228,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000004026f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
+DVLR GSUP tx: 04010809710000004026f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c
index beeea22..b5bedbc 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c
@@ -124,7 +124,7 @@
 
 	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-		gsup_expect_tx("04010809710000000156f0280102");
+		gsup_expect_tx("04010809710000000156f0280102290101");
 		ms_sends_msg("0554" "e229c19e" "2104" "791f2e41");
 		VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -137,7 +137,7 @@
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 		btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");
-		gsup_expect_tx("04010809710000000156f0280102");
+		gsup_expect_tx("04010809710000000156f0280102290102");
 		ms_sends_security_mode_complete();
 		VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -493,7 +493,7 @@
 
 	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
-		gsup_expect_tx("04010809710000000156f0280102");
+		gsup_expect_tx("04010809710000000156f0280102290101");
 		ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e");
 		VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
@@ -506,7 +506,7 @@
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
 		btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");
-		gsup_expect_tx("04010809710000000156f0280102");
+		gsup_expect_tx("04010809710000000156f0280102290102");
 		ms_sends_security_mode_complete();
 		VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");
 		VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err
index 6ec9525..bffb35a 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -73,8 +73,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -549,8 +549,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0
@@ -1064,8 +1064,8 @@
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290101
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290101
 DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
 DREF IMSI-901700000010650: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -1292,8 +1292,8 @@
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU)
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
-DVLR GSUP tx: 04010809710000000156f0280102
-GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102
+DVLR GSUP tx: 04010809710000000156f0280102290102
+GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000000156f0280102290102
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
   gsup_tx_confirmed == 1
   lu_result_sent == 0

-- 
To view, visit https://gerrit.osmocom.org/12455
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: I1b0c43c5ab03bc4dd146fdb3f5479b131d4f3b67
Gerrit-Change-Number: 12455
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/20190103/9b503e78/attachment.htm>

More information about the gerrit-log mailing list