[S] Change in osmo-msc[master]: libvlr: fix auth_fsm_term(): use proper value-string for cause

14 Feb 2024

fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/35964?usp=email )


Change subject: libvlr: fix auth_fsm_term(): use proper value-string for cause
......................................................................

libvlr: fix auth_fsm_term(): use proper value-string for cause

Change-Id: Ia0868dce2da5cb78c30cf518870c3d91144499b9
---
M src/libvlr/vlr_auth_fsm.c
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_hlr_reject.err
M tests/msc_vlr/msc_vlr_test_umts_authen.err
4 files changed, 22 insertions(+), 13 deletions(-)



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

diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c
index 5207464..b5052b0 100644
--- a/src/libvlr/vlr_auth_fsm.c
+++ b/src/libvlr/vlr_auth_fsm.c
@@ -257,7 +257,7 @@
 	LOGPFSM(fi, "Authentication terminating with result %s%s%s\n",
 		auth_fsm_result_str[result],
 		cause ? ", cause " : "",
-		cause ? get_value_string(gsm48_gmm_cause_names, cause) : "");
+		cause ? gsm48_reject_value_name(cause) : "");
 
 	/* Do one final state transition (mostly for logging purpose)
 	 * and set the parent_term_event according to result */
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index 6317820..94c1694 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -3271,7 +3271,7 @@
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received
Event VLR_AUTH_E_MS_AUTH_RESP
 DVLR SUBSCR(IMSI-901700000004620) AUTH on GERAN received SRES/RES:  (0 bytes)
 DVLR SUBSCR(IMSI-901700000004620) AUTH SRES/RES missing
-DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause Illegal MS
+DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause ILLEGAL_MS
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg
to VLR_SUB_AS_AUTH_FAILED
 GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000004026f00a0101
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index 26d5736..305e1b8 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -43,7 +43,7 @@
 DREF VLR subscr IMSI-901700000004620 + vlr_gsup_rx: now used by 2
(active-conn,vlr_gsup_rx)
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Received Event VLR_AUTH_E_HLR_SAI_NACK
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
GSUP: rx Auth Info Error cause: 2: IMSI unknown in HLR
-DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause IMSI unknown in HLR
+DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause IMSI_UNKNOWN_IN_HLR
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
state_chg to VLR_SUB_AS_AUTH_FAILED
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing
from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)
@@ -142,7 +142,7 @@
 DREF VLR subscr IMSI-901700000004620 + vlr_gsup_rx: now used by 2
(active-conn,vlr_gsup_rx)
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Received Event VLR_AUTH_E_HLR_SAI_NACK
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
GSUP: rx Auth Info Error cause: 17: Network failure
-DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause Network failure
+DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause NETWORK_FAILURE
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
state_chg to VLR_SUB_AS_AUTH_FAILED
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing
from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)
@@ -738,7 +738,7 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + vlr_gsup_rx: now used by 3
(attached,active-conn,vlr_gsup_rx)
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Received Event VLR_AUTH_E_HLR_SAI_NACK
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
GSUP: rx Auth Info Error cause: 17: Network failure
-DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause Network failure
+DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause NETWORK_FAILURE
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
state_chg to VLR_SUB_AS_AUTH_FAILED
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU)
@@ -1006,7 +1006,7 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + vlr_gsup_rx: now used by 3
(attached,active-conn,vlr_gsup_rx)
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Received Event VLR_AUTH_E_HLR_SAI_NACK
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
GSUP: rx Auth Info Error cause: 2: IMSI unknown in HLR
-DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause IMSI unknown in HLR
+DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result NO_AUTH_INFO, cause IMSI_UNKNOWN_IN_HLR
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
state_chg to VLR_SUB_AS_AUTH_FAILED
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
 DVLR
VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU)
@@ -1104,7 +1104,7 @@
 <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f00a0101
 DREF VLR subscr IMSI-901700000004620 + vlr_gsup_rx: now used by 2
(active-conn,vlr_gsup_rx)
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Received Event VLR_AUTH_E_HLR_SAI_ACK
-DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result FAILURE, cause Network failure
+DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
Authentication terminating with result FAILURE, cause NETWORK_FAILURE
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}:
state_chg to VLR_SUB_AS_AUTH_FAILED
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing
from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU)
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err
b/tests/msc_vlr/msc_vlr_test_umts_authen.err
index dad0877..aacff39 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -2647,7 +2647,7 @@
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received
Event VLR_AUTH_E_MS_AUTH_RESP
 DVLR SUBSCR(IMSI-901700000010650) AUTH on GERAN received SRES/RES: e229c19e791f2e (7
bytes)
 DVLR SUBSCR(IMSI-901700000010650) AUTH SRES/RES has invalid length: 7. Expected either 4
(GSM AKA) or 8 (UMTS AKA)
-DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause Illegal MS
+DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause ILLEGAL_MS
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg
to VLR_SUB_AS_AUTH_FAILED
 GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
@@ -2763,7 +2763,7 @@
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received
Event VLR_AUTH_E_MS_AUTH_RESP
 DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e791f2e (7 bytes)
 DVLR SUBSCR(IMSI-901700000010650) AUTH RES has invalid length: 7. Expected 8 (UMTS AKA)
-DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause Illegal MS
+DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause ILLEGAL_MS
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg
to VLR_SUB_AS_AUTH_FAILED
 GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
@@ -2879,7 +2879,7 @@
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received
Event VLR_AUTH_E_MS_AUTH_RESP
 DVLR SUBSCR(IMSI-901700000010650) AUTH on GERAN received SRES/RES: e229c19e791f2e4123 (9
bytes)
 DVLR SUBSCR(IMSI-901700000010650) AUTH SRES/RES has invalid length: 9. Expected either 4
(GSM AKA) or 8 (UMTS AKA)
-DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause Illegal MS
+DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause ILLEGAL_MS
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg
to VLR_SUB_AS_AUTH_FAILED
 GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
@@ -2995,7 +2995,7 @@
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received
Event VLR_AUTH_E_MS_AUTH_RESP
 DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e791f2e4123 (9
bytes)
 DVLR SUBSCR(IMSI-901700000010650) AUTH RES has invalid length: 9. Expected 8 (UMTS AKA)
-DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause Illegal MS
+DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause ILLEGAL_MS
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg
to VLR_SUB_AS_AUTH_FAILED
 GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
@@ -3111,7 +3111,7 @@
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received
Event VLR_AUTH_E_MS_AUTH_RESP
 DVLR SUBSCR(IMSI-901700000010650) AUTH on GERAN received SRES/RES: e229c19e (4 bytes)
 DVLR SUBSCR(IMSI-901700000010650) GSM AUTH failure: mismatching sres (expected sres=9b 36
ef df )
-DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause Illegal MS
+DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause ILLEGAL_MS
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg
to VLR_SUB_AS_AUTH_FAILED
 GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101
 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)
@@ -3227,7 +3227,7 @@
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received
Event VLR_AUTH_E_MS_AUTH_RESP
 DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e (4 bytes)
 DVLR SUBSCR(IMSI-901700000010650) AUTH via UTRAN, cannot allow GSM AKA (MS is R99
capable, vec has UMTS AKA tokens, res_len=4 is INVALID on UTRAN)
-DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause Illegal MS
+DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}:
Authentication terminating with result FAILURE, cause ILLEGAL_MS
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg
to VLR_SUB_AS_AUTH_FAILED
 GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101
 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}:
Terminating (cause = OSMO_FSM_TERM_REGULAR)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35964?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ia0868dce2da5cb78c30cf518870c3d91144499b9
Gerrit-Change-Number: 35964
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt;
Gerrit-MessageType: newchange



    

2025

2024

2023

2022

[S] Change in osmo-msc[master]: libvlr: fix auth_fsm_term(): use proper value-string for cause