diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-31 18:45:59 +0200 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-03 02:13:04 +0200 |
commit | 4d3a66b3f8d39ecf1eefbe44d2bea28698ed8dd5 (patch) | |
tree | 8789a6be41cc342fe075c5123138ec849107d8d2 /tests/msc_vlr | |
parent | ae73d2b16f8c80afd60d37a8b7d60773c207ee35 (diff) |
cosmetic: rename gsm_subscriber_connection->conn_fsm to ->fi
Match osmo-bsc's naming of the subscriber connection's FSM instance; 'conn->fi'
makes more sense anyway than 'conn->conn_fsm'.
BTW, an upcoming commit will do away with the legacy from libbsc/libmsc duality
and firmly glue the conn allocation to the fi.
Related: OS#3122
Change-Id: If442f2ba78d9722b1065ec30c9a13f372b6a8caa
Diffstat (limited to 'tests/msc_vlr')
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_authen_reuse.c | 4 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_call.c | 6 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_gsm_authen.c | 6 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_gsm_ciph.c | 6 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_ms_timeout.c | 2 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_no_authen.c | 4 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_reject_concurrency.c | 2 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_rest.c | 8 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_umts_authen.c | 2 |
9 files changed, 20 insertions, 20 deletions
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index 6fd1e66b4..c9a9d0954 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -166,7 +166,7 @@ static void _test_auth_reuse(enum ran_type via_ran, "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); @@ -217,7 +217,7 @@ static void _test_auth_reuse(enum ran_type via_ran, "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == false, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 7f97c3596..6359865c7 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -172,7 +172,7 @@ static void test_call_mo() "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); @@ -355,7 +355,7 @@ static void test_call_mo_to_unknown() "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); @@ -434,7 +434,7 @@ static void test_call_mo_to_unknown_timeout() "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index dda84f667..517630667 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -99,7 +99,7 @@ static void test_gsm_authen() cm_service_result_sent = RES_NONE; ms_sends_msg("05247803305886089910070000006402"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); @@ -316,7 +316,7 @@ static void test_gsm_authen_tmsi() cm_service_result_sent = RES_NONE; ms_sends_msg("05247803305886" "05f4" "03020100"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); @@ -804,7 +804,7 @@ static void test_gsm_milenage_authen() "03305886" /* classmark 2: GSM phase 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index d8ea6ba9a..8a05b3f2d 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -101,7 +101,7 @@ static void test_ciph() auth_request_expect_rand = "12aca96fb4ffdea5c985cbafa9b6e18b"; ms_sends_msg("05247803305886089910070000006402"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); @@ -340,7 +340,7 @@ static void test_ciph_tmsi() auth_request_expect_autn = NULL; ms_sends_msg("05247803305886" "05f4" "03020100"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); @@ -934,7 +934,7 @@ static void test_gsm_ciph_in_umts_env() "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index c81f5b5ea..a36027c91 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -148,7 +148,7 @@ static void test_ms_timeout_cm_auth_resp() cm_service_result_sent = RES_NONE; ms_sends_msg("05247803305886089910070000006402"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 59c56034e..b20f9d7d9 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -65,7 +65,7 @@ static void test_no_authen() cm_service_result_sent = RES_NONE; ms_sends_msg("05247803305886089910070000006402"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); EXPECT_ACCEPTED(true); @@ -227,7 +227,7 @@ static void test_no_authen_tmsi() cm_service_result_sent = RES_NONE; ms_sends_msg("05247803305886" "05f4" "03020100"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); EXPECT_ACCEPTED(true); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index 08fc9e7a3..ceab109c3 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -109,7 +109,7 @@ static void _normal_cm_service_req() cm_service_result_sent = RES_NONE; ms_sends_msg("05247803305886089910070000006402"); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d"); EXPECT_ACCEPTED(true); diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 1a403c32d..3f843f06e 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -36,8 +36,8 @@ static void test_early_stage() btw("conn_fsm present, in state NEW"); OSMO_ASSERT(msc_create_conn_fsm(g_conn, "test") == 0); - OSMO_ASSERT(g_conn->conn_fsm); - OSMO_ASSERT(g_conn->conn_fsm->state == SUBSCR_CONN_S_NEW); + OSMO_ASSERT(g_conn->fi); + OSMO_ASSERT(g_conn->fi->state == SUBSCR_CONN_S_NEW); EXPECT_ACCEPTED(false); thwart_rx_non_initial_requests(); @@ -48,13 +48,13 @@ static void test_early_stage() OSMO_ASSERT(g_conn->vsub); /* mark as silent call so it sticks around */ g_conn->silent_call = 1; - osmo_fsm_inst_state_chg(g_conn->conn_fsm, SUBSCR_CONN_S_ACCEPTED, 0, 0); + osmo_fsm_inst_state_chg(g_conn->fi, SUBSCR_CONN_S_ACCEPTED, 0, 0); EXPECT_CONN_COUNT(1); EXPECT_ACCEPTED(true); btw("CLOSE event marks conn_fsm as released and frees the conn"); expect_bssap_clear(); - osmo_fsm_inst_dispatch(g_conn->conn_fsm, SUBSCR_CONN_E_CN_CLOSE, NULL); + osmo_fsm_inst_dispatch(g_conn->fi, SUBSCR_CONN_E_CN_CLOSE, NULL); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); EXPECT_CONN_COUNT(0); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index b5a55fc98..7b410df1d 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -196,7 +196,7 @@ static void _test_umts_authen(enum ran_type via_ran) "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); OSMO_ASSERT(g_conn); - OSMO_ASSERT(g_conn->conn_fsm); + OSMO_ASSERT(g_conn->fi); OSMO_ASSERT(g_conn->vsub); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); VERBOSE_ASSERT(auth_request_sent, == true, "%d"); |