<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16559">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsup: indicate CN-Domain in SendAuthInfo Requests<br><br>In order for osmo-hlr to be able to 100% guarantee distinct INDs for CS and PS,<br>set CN-Domain = CS in all SendAuthInfo Requests.<br><br>In Milenage auth, it is highly desirable that osmo-hlr guarantees use of<br>distinct INDs for CS and PS domains.  If an MSC and SGSN attached at the same<br>time use the same IND bucket to generate Milenage SQN, that collision would<br>rapidly waste SQNs and load osmo-hlr with requesting new auth tuples on each<br>CS/PS Complete-Layer3.<br><br>So far, osmo-msc did not indicate the CN domain in the GSUP SendAuthInfo<br>Request, which was neither required nor evaluated. The CN-Domain is only sent<br>for the UpdateLocation Request that usually follows later.<br><br>Related: OS#4318<br>Change-Id: I22f44068268e62801cadbf6542efaf153423cd65<br>---<br>M src/libvlr/vlr.c<br>M tests/msc_vlr/msc_vlr_test_authen_reuse.c<br>M tests/msc_vlr/msc_vlr_test_authen_reuse.err<br>M tests/msc_vlr/msc_vlr_test_call.c<br>M tests/msc_vlr/msc_vlr_test_call.err<br>M tests/msc_vlr/msc_vlr_test_gsm_authen.c<br>M tests/msc_vlr/msc_vlr_test_gsm_authen.err<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.c<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.err<br>M tests/msc_vlr/msc_vlr_test_hlr_reject.c<br>M tests/msc_vlr/msc_vlr_test_hlr_reject.err<br>M tests/msc_vlr/msc_vlr_test_hlr_timeout.c<br>M tests/msc_vlr/msc_vlr_test_hlr_timeout.err<br>M tests/msc_vlr/msc_vlr_test_ms_timeout.c<br>M tests/msc_vlr/msc_vlr_test_ms_timeout.err<br>M tests/msc_vlr/msc_vlr_test_no_authen.c<br>M tests/msc_vlr/msc_vlr_test_reject_concurrency.c<br>M tests/msc_vlr/msc_vlr_test_rest.c<br>M tests/msc_vlr/msc_vlr_test_ss.c<br>M tests/msc_vlr/msc_vlr_test_umts_authen.c<br>M tests/msc_vlr/msc_vlr_test_umts_authen.err<br>M tests/msc_vlr/msc_vlr_tests.h<br>22 files changed, 148 insertions(+), 146 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/16559/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index 0f9c991..1a753dc 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -671,6 +671,7 @@</span><br><span>      gsup_msg.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST;</span><br><span>       gsup_msg.auts = auts;</span><br><span>        gsup_msg.rand = auts_rand;</span><br><span style="color: hsl(120, 100%, 40%);">+    gsup_msg.cn_domain = OSMO_GSUP_CN_DOMAIN_CS;</span><br><span> </span><br><span>     return vlr_subscr_tx_gsup_message(vsub, &gsup_msg);</span><br><span> }</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c</span><br><span>index d73a5f8..f8f9383 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> </span><br><span>        btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -85,7 +85,7 @@</span><br><span> </span><br><span>     if (via_ran == OSMO_RAT_GERAN_A) {</span><br><span>           btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-            gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+          gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>             ms_sends_msg("0554" "e229c19e" "2104" "791f2e41");</span><br><span>           VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");</span><br><span>          VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -98,7 +98,7 @@</span><br><span>             VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>             btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-             gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+          gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>             ms_sends_security_mode_complete();</span><br><span>           VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");</span><br><span>          VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -195,7 +195,7 @@</span><br><span>               " and needs to request a second auth vector from HLR");</span><br><span>                auth_request_sent = false;</span><br><span>           cm_service_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-              gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+           gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>                ms_sends_msg("052474"</span><br><span>                           "03575886" /* classmark 2 */</span><br><span>                       "089910070000106005" /* IMSI */);</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err</span><br><span>index c5dee0c..288040f 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err</span><br><span>@@ -36,7 +36,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -351,7 +351,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn)</span><br><span> DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms)</span><br><span>@@ -540,7 +540,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -875,7 +875,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn)</span><br><span> DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms)</span><br><span>@@ -1072,7 +1072,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1680,7 +1680,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2324,7 +2324,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2523,7 +2523,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn)</span><br><span> DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms)</span><br><span>@@ -2712,7 +2712,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2923,7 +2923,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn)</span><br><span> DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>index 339233c..b4e20be 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>@@ -53,7 +53,7 @@</span><br><span> </span><br><span>      btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -127,7 +127,7 @@</span><br><span>       VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-     gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_security_mode_complete();</span><br><span>   VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");</span><br><span>  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err</span><br><span>index 8c394d0..b651659 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_call.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_call.err</span><br><span>@@ -37,7 +37,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -511,7 +511,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -982,7 +982,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1407,7 +1407,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1835,7 +1835,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>index ee5af1e..6d7e88a 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0508020081680001"</span><br><span>                 "30" /* <-- Revision Level == 1, i.e. is_r99 == false */</span><br><span>                "089910070000006402");</span><br><span>@@ -76,7 +76,7 @@</span><br><span>    VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -224,7 +224,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0508020081680001"</span><br><span>                 "30" /* <-- Revision Level == 1, i.e. is_r99 == false */</span><br><span>                "089910070000006402");</span><br><span>@@ -266,7 +266,7 @@</span><br><span>  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -438,7 +438,7 @@</span><br><span>       VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05545afc8d72");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -504,7 +504,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0508020081680001"</span><br><span>                 "30" /* <-- Revision Level == 1, i.e. is_r99 == false */</span><br><span>                "089910070000006402");</span><br><span>@@ -544,7 +544,7 @@</span><br><span>  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -611,7 +611,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0508020081680001"</span><br><span>                 "30" /* <-- Revision Level == 1, i.e. is_r99 == false */</span><br><span>                "089910070000006402");</span><br><span>@@ -653,7 +653,7 @@</span><br><span>  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -705,7 +705,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0508020081680001"</span><br><span>                 "30" /* <-- Revision Level == 1, i.e. is_r99 == false */</span><br><span>                "089910070000006402");</span><br><span>@@ -746,7 +746,7 @@</span><br><span>  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -799,7 +799,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0508020081680001"</span><br><span>                 "30" /* <-- Revision Level == 1, i.e. is_r99 == false */</span><br><span>                "089910070000006402");</span><br><span>@@ -840,7 +840,7 @@</span><br><span>  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -924,7 +924,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -977,7 +977,7 @@</span><br><span>       VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0554" "9b36efdf");</span><br><span>         VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -1129,7 +1129,7 @@</span><br><span> </span><br><span>         btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0508020081680001"</span><br><span>                 "30" /* <-- Revision Level == 1, i.e. is_r99 == false */</span><br><span>                "089910070000006402");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err</span><br><span>index 3145610..ad2b80c 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err</span><br><span>@@ -36,7 +36,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -620,7 +620,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1443,7 +1443,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1755,7 +1755,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2020,7 +2020,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2286,7 +2286,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2639,7 +2639,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -3198,7 +3198,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>index 9026241..1b413f9 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>@@ -40,7 +40,7 @@</span><br><span> </span><br><span>    btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -82,7 +82,7 @@</span><br><span>     VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete(NULL);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -249,7 +249,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -292,7 +292,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete(NULL);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -484,7 +484,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -526,7 +526,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete(NULL);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -594,7 +594,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -642,7 +642,7 @@</span><br><span>   vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span>  btw("MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-        gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete("063217094b32244332244372f5");</span><br><span>    VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -695,7 +695,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -737,7 +737,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete(NULL);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -844,7 +844,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -922,7 +922,7 @@</span><br><span>       VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete(NULL);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -1067,7 +1067,7 @@</span><br><span> </span><br><span>         btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -1111,7 +1111,7 @@</span><br><span>         VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete(NULL);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -1283,7 +1283,7 @@</span><br><span> </span><br><span>         btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -1327,7 +1327,7 @@</span><br><span>         VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_ciphering_mode_complete(NULL);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>index 96a5303..5f6b370 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>@@ -36,7 +36,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -688,7 +688,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1388,7 +1388,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1707,7 +1707,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1991,7 +1991,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2351,7 +2351,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2948,7 +2948,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -3592,7 +3592,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c</span><br><span>index 45aaa8c..6cdadcb 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c</span><br><span>@@ -31,7 +31,7 @@</span><br><span> </span><br><span>         btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -58,7 +58,7 @@</span><br><span> </span><br><span>         btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -91,7 +91,7 @@</span><br><span>     BTW("Submit a used auth tuple in the VLR");</span><br><span>        btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -114,7 +114,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -147,7 +147,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -180,7 +180,7 @@</span><br><span>   BTW("Submit a used auth tuple in the VLR");</span><br><span>        btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -203,7 +203,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -237,7 +237,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -266,7 +266,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -304,7 +304,7 @@</span><br><span>   BTW("Submit a used auth tuple in the VLR");</span><br><span>        btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -328,7 +328,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -361,7 +361,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -373,7 +373,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -402,7 +402,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -426,7 +426,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err</span><br><span>index e4ea226..f0d94b4 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err</span><br><span>@@ -36,7 +36,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -137,7 +137,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -241,7 +241,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -403,7 +403,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -567,7 +567,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -729,7 +729,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -833,7 +833,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -996,7 +996,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1097,7 +1097,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c</span><br><span>index abc7c5b..4523a7c 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -73,7 +73,7 @@</span><br><span> </span><br><span>         btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err</span><br><span>index 5853643..3717533 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err</span><br><span>@@ -37,7 +37,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c</span><br><span>index 91f00ef..11afc51 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> </span><br><span>      btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -94,7 +94,7 @@</span><br><span> </span><br><span>         btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -125,7 +125,7 @@</span><br><span>   VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>     btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-    gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("05542d8b2c3e");</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -195,7 +195,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -296,7 +296,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err</span><br><span>index b909f52..6ccc82a 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err</span><br><span>@@ -37,7 +37,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -166,7 +166,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -747,7 +747,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>index 9d506d6..7b684fe 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> </span><br><span>        btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -171,7 +171,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -316,7 +316,7 @@</span><br><span>   BTW("subscriber sends LU Request, this time with the TMSI");</span><br><span>       btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130" "05f4" "03020100");</span><br><span>  OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -389,7 +389,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -464,7 +464,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -552,7 +552,7 @@</span><br><span>   OSMO_ASSERT(dtap_tx_confirmed);</span><br><span> </span><br><span>  btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-     gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0559094332244332244372f5");</span><br><span>  OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -628,7 +628,7 @@</span><br><span>   btw("HLR accepts the IMEI, VLR responds with LU Request");</span><br><span>         expect_bssap_clear();</span><br><span>        gsup_rx("32010809710000004026f0510100" HLR_TO_VLR,</span><br><span style="color: hsl(0, 100%, 40%);">-            "04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+         "04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>    OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -686,7 +686,7 @@</span><br><span>       OSMO_ASSERT(dtap_tx_confirmed);</span><br><span> </span><br><span>  btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-     gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0559094332244332244372f5");</span><br><span>  OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -742,7 +742,7 @@</span><br><span>   OSMO_ASSERT(dtap_tx_confirmed);</span><br><span> </span><br><span>  btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-     gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0559095332244332244372f6");</span><br><span>  OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -841,7 +841,7 @@</span><br><span>   btw("HLR accepts the IMEI, VLR responds with LU Request");</span><br><span>         expect_bssap_clear();</span><br><span>        gsup_rx("32010809710000004026f0510100" HLR_TO_VLR,</span><br><span style="color: hsl(0, 100%, 40%);">-            "04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+         "04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>    OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>@@ -915,7 +915,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c</span><br><span>index 648313f..dea0c29 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c</span><br><span>@@ -30,7 +30,7 @@</span><br><span> </span><br><span>        btw("Location Update Request on one connection");</span><br><span>  lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -73,7 +73,7 @@</span><br><span> {</span><br><span>        btw("Location Update Request");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c</span><br><span>index 1b998ad..029e8b5 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_rest.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_rest.c</span><br><span>@@ -89,7 +89,7 @@</span><br><span> </span><br><span>        btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -120,7 +120,7 @@</span><br><span>   BTW("verify that the MS can send another LU request");</span><br><span>     btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -172,7 +172,7 @@</span><br><span>   thwart_rx_non_initial_requests();</span><br><span> </span><br><span>        btw("MS tells us the IMSI, causes a GSUP LU request to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("0559089910070000006402");</span><br><span>    OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>index 978ceae..772429e 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span> </span><br><span>        btw("Location Update request causes a GSUP LU request to HLR");</span><br><span>    lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+  gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>     ms_sends_msg("050802008168000130089910070000006402");</span><br><span>      OSMO_ASSERT(gsup_tx_confirmed);</span><br><span>      VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>index 761db55..46f8d98 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>@@ -58,7 +58,7 @@</span><br><span> </span><br><span>    btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -137,7 +137,7 @@</span><br><span>                       VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>                     btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-                     gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+                  gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>                     ms_sends_security_mode_complete();</span><br><span>                   VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");</span><br><span>                  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -145,7 +145,7 @@</span><br><span>   } else {</span><br><span>             /* Encryption disabled */</span><br><span>            btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-               gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+          gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>             ms_sends_msg("0554" "e229c19e" "2104" "791f2e41");</span><br><span>           VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");</span><br><span>          VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -369,7 +369,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -471,7 +471,7 @@</span><br><span>                      "0108" "09710000000156f0" /* IMSI */</span><br><span>                     "260e" "979498b1f72d3e28c59fa2e72f9c" /* AUTS */</span><br><span>                 "2010" "39fa2f4e3d523d8619a73b4f65c3e14d" /* RAND */</span><br><span style="color: hsl(0, 100%, 40%);">-                VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+                  CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("051c" /* 05 = MM; 1c = Auth Failure */</span><br><span>                    "15"   /* cause = Synch Failure */</span><br><span>                 "220e" "979498b1f72d3e28c59fa2e72f9c" /* AUTS */);</span><br><span>@@ -529,7 +529,7 @@</span><br><span>                    VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span> </span><br><span>                     btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-                     gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+                  gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>                     ms_sends_security_mode_complete();</span><br><span>                   VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");</span><br><span>                  VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -537,7 +537,7 @@</span><br><span>   } else {</span><br><span>             /* Encryption disabled */</span><br><span>            btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">-               gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+          gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>             ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e");</span><br><span>           VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d");</span><br><span>          VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");</span><br><span>@@ -609,7 +609,7 @@</span><br><span> </span><br><span>       btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -709,7 +709,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>@@ -809,7 +809,7 @@</span><br><span> </span><br><span>   btw("Location Update request causes a GSUP Send Auth Info request to HLR");</span><br><span>        lu_result_sent = RES_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-      gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR);</span><br><span>        ms_sends_msg("0508" /* MM LU */</span><br><span>                 "7" /* ciph key seq: no key available */</span><br><span>                   "0" /* LU type: normal */</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err</span><br><span>index 62dc2d3..3e5dbae 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err</span><br><span>@@ -36,7 +36,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -638,7 +638,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1246,7 +1246,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1878,7 +1878,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -1905,7 +1905,7 @@</span><br><span> DRLL msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL</span><br><span> DMM msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>   gsup_tx_confirmed == 1</span><br><span>@@ -2110,7 +2110,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2137,7 +2137,7 @@</span><br><span> DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL</span><br><span> DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>   gsup_tx_confirmed == 1</span><br><span>@@ -2344,7 +2344,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2371,7 +2371,7 @@</span><br><span> DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL</span><br><span> DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>   gsup_tx_confirmed == 1</span><br><span>@@ -2588,7 +2588,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2706,7 +2706,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2824,7 +2824,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -2942,7 +2942,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -3060,7 +3060,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>@@ -3178,7 +3178,7 @@</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU)</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101</span><br><span> DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu)</span><br><span> DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h</span><br><span>index 88f80b4..23dc9da 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.h</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.h</span><br><span>@@ -270,6 +270,7 @@</span><br><span> </span><br><span> #define HLR_TO_VLR "0a0101"</span><br><span> #define VLR_TO_HLR "0a0101"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CN_DOMAIN "280102"</span><br><span> #define EUSE_TO_MSC_USSD "0a0103"</span><br><span> #define MSC_USSD_TO_EUSE "0a0103"</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16559">change 16559</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-msc/+/16559"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I22f44068268e62801cadbf6542efaf153423cd65 </div>
<div style="display:none"> Gerrit-Change-Number: 16559 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>