diff options
author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-03-04 03:34:50 +0100 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-03-16 15:32:30 +0100 |
commit | 1ca587aab009da261f99b65e37ccd217a6b94a58 (patch) | |
tree | 202c6d92ff82b1abc4ecfaabfd8188cdca573c6d /openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.c | |
parent | 6da3bc7c0afd0352fb46b271b9e6a01aaa3c5cfe (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
Conflicts:
openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.c
openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err
Diffstat (limited to 'openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.c')
-rw-r--r-- | openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index a428e94f3..6b5017b78 100644 --- a/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -118,9 +118,9 @@ void test_ciph() EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS sends Ciphering Mode Complete, VLR accepts and sends CM Service Accept"); + btw("MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept"); ms_sends_msg("0632"); - VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("a USSD request is serviced"); dtap_expect_tx_ussd("Your extension is 46071\r"); @@ -349,9 +349,9 @@ void test_ciph_tmsi() EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); - btw("MS sends Ciphering Mode Complete, VLR accepts and sends CM Service Accept"); + btw("MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept"); ms_sends_msg("0632"); - VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); + VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("a USSD request is serviced"); dtap_expect_tx_ussd("Your extension is 46071\r"); |