diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 01:08:36 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 22:46:13 +0100 |
| commit | 3c20a5ee7483108fed857b61050b7282327d5c83 (patch) | |
| tree | 4c55c23ed4f24c6827e9a1d461d2bb9da561edf5 /tests | |
| parent | c036b79918dbeb2baefff177be51dfdd9dac1588 (diff) | |
rename some RAN conn related stuff to ran_conn_*
Following previous rename of gsm_subscriber_connection:
Some functions and #defines are still called like "msc_conn" or just "msc_",
while they are clearly about a RAN conn.
To avoid confusion with the future separate concepts of MSC roles and a RAN
connection, rename all those to match the common "ran_conn" prefix.
Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/msc_vlr/msc_vlr_test_call.c | 2 | ||||
| -rw-r--r-- | tests/msc_vlr/msc_vlr_tests.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 5819e51a6..ef88c5af6 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -404,7 +404,7 @@ static void test_call_mt2() cc_to_mncc_expect_tx("", MNCC_REL_CNF); dtap_expect_tx("032d"); /* CC: Release */ expect_iu_release(); - msc_clear_request(g_conn, 0); + ran_conn_clear_request(g_conn, 0); OSMO_ASSERT(cc_to_mncc_tx_confirmed); OSMO_ASSERT(iu_release_sent); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 92e0accd7..2443e3107 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -186,7 +186,7 @@ void conn_conclude_cm_service_req(struct ran_conn *conn, OSMO_ASSERT(conn->received_cm_service_request); conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); ASSERT_RELEASE_CLEAR(via_ran); } @@ -225,14 +225,14 @@ void rx_from_ms(struct msgb *msg) g_conn = conn_new(); reset_l3_seq_nr(); patch_l3_seq_nr(msg); - msc_compl_l3(g_conn, msg, 23); + ran_conn_compl_l3(g_conn, msg, 23); } else { patch_l3_seq_nr(msg); if ((gsm48_hdr_pdisc(gh) == GSM48_PDISC_RR) && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL)) - msc_cipher_mode_compl(g_conn, msg, 0); + ran_conn_cipher_mode_compl(g_conn, msg, 0); else - msc_dtap(g_conn, msg); + ran_conn_dtap(g_conn, msg); } if (!conn_exists(g_conn)) @@ -842,7 +842,7 @@ void ms_sends_security_mode_complete() OSMO_ASSERT(g_conn); OSMO_ASSERT(g_conn->via_ran == RAN_UTRAN_IU); OSMO_ASSERT(g_conn->iu.ue_ctx); - msc_rx_sec_mode_compl(g_conn); + ran_conn_rx_sec_mode_compl(g_conn); } void bss_sends_clear_complete() |