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 /src/libmsc/gsm_04_08.c | |
| 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 'src/libmsc/gsm_04_08.c')
| -rw-r--r-- | src/libmsc/gsm_04_08.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 407144e9b..97a632b64 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -687,7 +687,7 @@ accept_reuse: if (!conn->received_cm_service_request) { conn->received_cm_service_request = true; - ran_conn_get(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_get(conn, RAN_CONN_USE_CM_SERVICE); } ran_conn_update_id(conn, conn->complete_layer3_type, mi_string); return conn->network->vlr->ops.tx_cm_serv_acc(conn); @@ -1332,7 +1332,7 @@ void cm_service_request_concludes(struct ran_conn *conn, gsm48_pdisc_msgtype_name(pdisc, msg_type)); } conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); } /* TS 24.007 11.2.3.2.3 Message Type Octet / Duplicate Detection */ @@ -1584,7 +1584,7 @@ static int msc_vlr_tx_cm_serv_rej(void *msc_conn_ref, enum gsm48_reject_value ca if (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); } return rc; @@ -1594,7 +1594,7 @@ static int msc_vlr_tx_cm_serv_rej(void *msc_conn_ref, enum gsm48_reject_value ca osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc), gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc); -int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) +int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { struct gsm_network *net = conn->network; struct gsm0808_encrypt_info ei; @@ -1640,7 +1640,7 @@ int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retriev vlr_subscr_name(conn->vsub), request_classmark_for_a5_n, request_classmark); - return msc_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); + return ran_conn_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); } if (ei.perm_algo_len == 0) { @@ -1701,7 +1701,7 @@ int msc_vlr_set_ciph_mode(void *msc_conn_ref, switch (conn->via_ran) { case RAN_GERAN_A: - return msc_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); + return ran_conn_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); case RAN_UTRAN_IU: #ifdef BUILD_IU @@ -1723,7 +1723,7 @@ int msc_vlr_set_ciph_mode(void *msc_conn_ref, return -ENOTSUP; } -void msc_rx_sec_mode_compl(struct ran_conn *conn) +void ran_conn_rx_sec_mode_compl(struct ran_conn *conn) { struct vlr_ciph_result vlr_res = {}; |