summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-04 03:34:50 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-09 18:34:17 +0100
commit27018f9aa3fc4b3adb6ed5373499120d4268b3c4 (patch)
tree4adac8879ec10f8443a70db100bd07f3a40c77ca
parentc89b64dd9553c3c4229ed3cf0232485fc771c2b3 (diff)
vlr: fix: don't send CM Service Accept after Ciphering Command
Ciphering Mode Command is an implicit CM Service Accept, if we're sending both we're confusing the MS. Change-Id: I3a04debe9b01c086e7f44b6139cb8796fcc71d38
-rw-r--r--openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.c4
-rw-r--r--openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err5
2 files changed, 4 insertions, 5 deletions
diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.c b/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.c
index c224de3..d026f02 100644
--- a/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.c
+++ b/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.c
@@ -203,9 +203,9 @@ void _test_umts_authen(enum ran_type via_ran)
VERBOSE_ASSERT(cipher_mode_cmd_sent, == true, "%d");
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
- btw("MS sends SecurityModeControl acceptance, VLR accepts and sends CM Service Accept");
+ btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept");
ms_sends_security_mode_complete();
- VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
+ VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
}
btw("a USSD request is serviced");
diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err b/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err
index 09bd362..5316183 100644
--- a/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -641,7 +641,7 @@ DVLR Process_Access_Request_VLR(901700000010650){PR_ARQ_S_WAIT_AUTH}: _proc_arq_
DVLR Process_Access_Request_VLR(901700000010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH
cipher_mode_cmd_sent == 1
cm_service_result_sent == 0
-- MS sends SecurityModeControl acceptance, VLR accepts and sends CM Service Accept
+- MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept
DIUCS Looking for IuCS subscriber: link_id 0x23, conn_id 2a
DIUCS 0: MSISDN:42342 Iu link 0x23, conn_id 42
DIUCS subscribers registered: 1
@@ -657,13 +657,12 @@ DVLR Process_Access_Request_VLR(901700000010650){PR_ARQ_S_WAIT_CIPH}: _proc_arq_
DVLR Process_Access_Request_VLR(901700000010650){PR_ARQ_S_WAIT_CIPH}: proc_arq_fsm_done(VLR_PR_ARQ_RES_PASSED)
DVLR Process_Access_Request_VLR(901700000010650){PR_ARQ_S_WAIT_CIPH}: state_chg to PR_ARQ_S_DONE
DVLR Process_Access_Request_VLR(901700000010650){PR_ARQ_S_DONE}: Process Access Request result: VLR_PR_ARQ_RES_PASSED
-- sending CM Service Accept for MSISDN:42342
DVLR Subscr_Conn(901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED
DVLR Subscr_Conn(901700000010650){SUBSCR_CONN_S_NEW}: SUBSCR_CONN_FROM_CM_SERVICE_REQ
DVLR Subscr_Conn(901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_ACCEPTED
DVLR Subscr_Conn(901700000010650){SUBSCR_CONN_S_ACCEPTED}: received_cm_service_request = true
DVLR Subscr_Conn(901700000010650){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_BUMP
- cm_service_result_sent == 1
+ cm_service_result_sent == 0
- a USSD request is serviced
expecting USSD:
Your extension is 42342