<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12030">View Change</a></p><div style="white-space:pre-wrap"></div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename some RAN conn related stuff to ran_conn_*<br><br>Following previous rename of gsm_subscriber_connection:<br><br>Some functions and #defines are still called like "msc_conn" or just "msc_",<br>while they are clearly about a RAN conn.<br><br>To avoid confusion with the future separate concepts of MSC roles and a RAN<br>connection, rename all those to match the common "ran_conn" prefix.<br><br>Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640<br>---<br>M include/osmocom/msc/osmo_msc.h<br>M src/libmsc/a_iface.c<br>M src/libmsc/a_iface_bssap.c<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/gsm_04_08_cc.c<br>M src/libmsc/gsm_04_11.c<br>M src/libmsc/gsm_09_11.c<br>M src/libmsc/iucs.c<br>M src/libmsc/iucs_ranap.c<br>M src/libmsc/osmo_msc.c<br>M src/libmsc/silent_call.c<br>M src/libmsc/subscr_conn.c<br>M src/libmsc/transaction.c<br>M tests/msc_vlr/msc_vlr_test_call.c<br>M tests/msc_vlr/msc_vlr_tests.c<br>15 files changed, 104 insertions(+), 109 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h</span><br><span>index 38cb497..fe6e0cd 100644</span><br><span>--- a/include/osmocom/msc/osmo_msc.h</span><br><span>+++ b/include/osmocom/msc/osmo_msc.h</span><br><span>@@ -50,22 +50,20 @@</span><br><span> int msc_vlr_alloc(struct gsm_network *net);</span><br><span> int msc_vlr_start(struct gsm_network *net);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void msc_sapi_n_reject(struct ran_conn *conn, int dlci);</span><br><span style="color: hsl(0, 100%, 40%);">-int msc_clear_request(struct ran_conn *conn, uint32_t cause);</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_compl_l3(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, uint16_t chosen_channel);</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_dtap(struct ran_conn *conn, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka,</span><br><span style="color: hsl(0, 100%, 40%);">- bool retrieve_imeisv);</span><br><span style="color: hsl(0, 100%, 40%);">-int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv);</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_cipher_mode_compl(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, uint8_t alg_id);</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_rx_sec_mode_compl(struct ran_conn *conn);</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_classmark_chg(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *cm2, uint8_t cm2_len,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *cm3, uint8_t cm3_len);</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_assign_fail(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cause, uint8_t *rr_cause);</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci);</span><br><span style="color: hsl(120, 100%, 40%);">+int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause);</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_compl_l3(struct ran_conn *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg, uint16_t chosen_channel);</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool retrieve_imeisv);</span><br><span style="color: hsl(120, 100%, 40%);">+int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv);</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id);</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_rx_sec_mode_compl(struct ran_conn *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_classmark_chg(struct ran_conn *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *cm2, uint8_t cm2_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *cm3, uint8_t cm3_len);</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause);</span><br><span> </span><br><span> void ran_conn_init(void);</span><br><span> bool ran_conn_is_accepted(const struct ran_conn *conn);</span><br><span>@@ -79,16 +77,16 @@</span><br><span> void ran_conn_rx_iu_release_complete(struct ran_conn *conn);</span><br><span> </span><br><span> enum ran_conn_use {</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_UNTRACKED = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_COMPL_L3,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_DTAP,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_AUTH_CIPH,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_CM_SERVICE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_TRANS_CC,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_TRANS_SMS,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_TRANS_NC_SS,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_SILENT_CALL,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CONN_USE_RELEASE,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_UNTRACKED = -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_COMPL_L3,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_DTAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_AUTH_CIPH,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_CM_SERVICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_TRANS_CC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_TRANS_SMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_TRANS_NC_SS,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_SILENT_CALL,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAN_CONN_USE_RELEASE,</span><br><span> };</span><br><span> </span><br><span> extern const struct value_string ran_conn_use_names[];</span><br><span>diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c</span><br><span>index fa0cb5f..82519d6 100644</span><br><span>--- a/src/libmsc/a_iface.c</span><br><span>+++ b/src/libmsc/a_iface.c</span><br><span>@@ -629,7 +629,7 @@</span><br><span> uint32_t conn_id = conn->a.conn_id;</span><br><span> LOGPCONN(conn, LOGL_NOTICE, "Dropping orphaned RAN connection\n");</span><br><span> /* This call will/may talloc_free(conn), so we must save conn_id above */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_clear_request(conn, GSM48_CC_CAUSE_SWITCH_CONG);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_clear_request(conn, GSM48_CC_CAUSE_SWITCH_CONG);</span><br><span> </span><br><span> /* If there is still an SCCP connection active, remove it now */</span><br><span> if (check_connection_active(conn_id)) {</span><br><span>diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c</span><br><span>index 31cdb06..4d03d23 100644</span><br><span>--- a/src/libmsc/a_iface_bssap.c</span><br><span>+++ b/src/libmsc/a_iface_bssap.c</span><br><span>@@ -343,7 +343,7 @@</span><br><span> conn = ran_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id);</span><br><span> </span><br><span> /* Handover location update to the MSC code */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_compl_l3(conn, msg, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_compl_l3(conn, msg, 0);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -372,7 +372,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Inform MSC about the classmark change */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -383,9 +383,9 @@</span><br><span> {</span><br><span> /* FIXME: The field GSM0808_IE_LAYER_3_MESSAGE_CONTENTS is optional by</span><br><span> * means of the specification. So there can be messages without L3 info.</span><br><span style="color: hsl(0, 100%, 40%);">- * In this case, the code will crash becrause msc_cipher_mode_compl()</span><br><span style="color: hsl(120, 100%, 40%);">+ * In this case, the code will crash becrause ran_conn_cipher_mode_compl()</span><br><span> * is not able to deal with msg = NULL and apperently</span><br><span style="color: hsl(0, 100%, 40%);">- * msc_cipher_mode_compl() was never meant to be used without L3 data.</span><br><span style="color: hsl(120, 100%, 40%);">+ * ran_conn_cipher_mode_compl() was never meant to be used without L3 data.</span><br><span> * This needs to be discussed further! */</span><br><span> </span><br><span> uint8_t alg_id = 1;</span><br><span>@@ -407,7 +407,7 @@</span><br><span> rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE]);</span><br><span> </span><br><span> /* Hand over cipher mode complete message to the MSC */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_cipher_mode_compl(conn, msg, alg_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_cipher_mode_compl(conn, msg, alg_id);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -462,12 +462,12 @@</span><br><span> </span><br><span> /* FIXME: In AoIP, the Assignment failure will carry also an optional</span><br><span> * Codec List (BSS Supported) element. It has to be discussed if we</span><br><span style="color: hsl(0, 100%, 40%);">- * can ignore this element. If not, The msc_assign_fail() function</span><br><span style="color: hsl(0, 100%, 40%);">- * call has to change. However msc_assign_fail() does nothing in the</span><br><span style="color: hsl(120, 100%, 40%);">+ * can ignore this element. If not, The ran_conn_assign_fail() function</span><br><span style="color: hsl(120, 100%, 40%);">+ * call has to change. However ran_conn_assign_fail() does nothing in the</span><br><span> * end. So probably we can just leave it as it is. Even for AoIP */</span><br><span> </span><br><span> /* Inform the MSC about the assignment failure event */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_assign_fail(conn, cause, rr_cause_ptr);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_assign_fail(conn, cause, rr_cause_ptr);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -494,7 +494,7 @@</span><br><span> dlci = TLVP_VAL(tp, GSM0808_IE_DLCI)[0];</span><br><span> </span><br><span> /* Inform the MSC about the sapi "n" reject event */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_sapi_n_reject(conn, dlci);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_sapi_n_reject(conn, dlci);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -582,7 +582,7 @@</span><br><span> </span><br><span> /* FIXME: Seems to be related to authentication or,</span><br><span> encryption. Is this really in the right place? */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_rx_sec_mode_compl(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_rx_sec_mode_compl(conn);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -670,12 +670,12 @@</span><br><span> </span><br><span> LOGPCONN(conn, LOGL_DEBUG, "Rx DTAP %s\n", msgb_hexdump_l2(msg));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* msc_dtap expects the dtap payload in l3h */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ran_conn_dtap expects the dtap payload in l3h */</span><br><span> msg->l3h = msg->l2h + 3;</span><br><span> OMSC_LINKID_CB(msg) = dtap->link_id;</span><br><span> </span><br><span> /* Forward dtap payload into the msc */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_dtap(conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_dtap(conn, msg);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 407144e..97a632b 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -687,7 +687,7 @@</span><br><span> </span><br><span> if (!conn->received_cm_service_request) {</span><br><span> conn->received_cm_service_request = true;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_get(conn, MSC_CONN_USE_CM_SERVICE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_get(conn, RAN_CONN_USE_CM_SERVICE);</span><br><span> }</span><br><span> ran_conn_update_id(conn, conn->complete_layer3_type, mi_string);</span><br><span> return conn->network->vlr->ops.tx_cm_serv_acc(conn);</span><br><span>@@ -1332,7 +1332,7 @@</span><br><span> gsm48_pdisc_msgtype_name(pdisc, msg_type));</span><br><span> }</span><br><span> conn->received_cm_service_request = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE);</span><br><span> }</span><br><span> </span><br><span> /* TS 24.007 11.2.3.2.3 Message Type Octet / Duplicate Detection */</span><br><span>@@ -1584,7 +1584,7 @@</span><br><span> </span><br><span> if (conn->received_cm_service_request) {</span><br><span> conn->received_cm_service_request = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE);</span><br><span> }</span><br><span> </span><br><span> return rc;</span><br><span>@@ -1594,7 +1594,7 @@</span><br><span> osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc),</span><br><span> gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv)</span><br><span style="color: hsl(120, 100%, 40%);">+int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv)</span><br><span> {</span><br><span> struct gsm_network *net = conn->network;</span><br><span> struct gsm0808_encrypt_info ei;</span><br><span>@@ -1640,7 +1640,7 @@</span><br><span> vlr_subscr_name(conn->vsub), request_classmark_for_a5_n,</span><br><span> request_classmark);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return msc_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ran_conn_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv);</span><br><span> }</span><br><span> </span><br><span> if (ei.perm_algo_len == 0) {</span><br><span>@@ -1701,7 +1701,7 @@</span><br><span> </span><br><span> switch (conn->via_ran) {</span><br><span> case RAN_GERAN_A:</span><br><span style="color: hsl(0, 100%, 40%);">- return msc_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ran_conn_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv);</span><br><span> </span><br><span> case RAN_UTRAN_IU:</span><br><span> #ifdef BUILD_IU</span><br><span>@@ -1723,7 +1723,7 @@</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void msc_rx_sec_mode_compl(struct ran_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_rx_sec_mode_compl(struct ran_conn *conn)</span><br><span> {</span><br><span> struct vlr_ciph_result vlr_res = {};</span><br><span> </span><br><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index 516fc51..8ac87c1 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -322,7 +322,7 @@</span><br><span> vlr_subscr_msisdn_or_name(transt->vsub));</span><br><span> OSMO_ASSERT(conn);</span><br><span> /* Assign conn */</span><br><span style="color: hsl(0, 100%, 40%);">- transt->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC);</span><br><span style="color: hsl(120, 100%, 40%);">+ transt->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC);</span><br><span> transt->paging_request = NULL;</span><br><span> /* send SETUP request to called party */</span><br><span> gsm48_cc_tx_setup(transt, &transt->cc.msg);</span><br><span>@@ -2005,7 +2005,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Assign conn */</span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC);</span><br><span> trans->dlci = 0x00; /* SAPI=0, not SACCH */</span><br><span> vlr_subscr_put(vsub);</span><br><span> } else {</span><br><span>@@ -2160,7 +2160,7 @@</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span> /* Assign transaction */</span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC);</span><br><span> trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */</span><br><span> cm_service_request_concludes(conn, msg);</span><br><span> }</span><br><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index d214f2e..d012443 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -148,7 +148,7 @@</span><br><span> switch (event) {</span><br><span> case GSM_PAGING_SUCCEEDED:</span><br><span> /* Associate transaction with established connection */</span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS);</span><br><span> /* Confirm successful connection establishment */</span><br><span> gsm411_smc_recv(&trans->sms.smc_inst,</span><br><span> GSM411_MMSMS_EST_CNF, NULL, 0);</span><br><span>@@ -1010,7 +1010,7 @@</span><br><span> conn = connection_for_subscr(vsub);</span><br><span> if (conn) {</span><br><span> /* Associate transaction with connection */</span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS);</span><br><span> /* Generate unique RP Message Reference */</span><br><span> trans->sms.sm_rp_mr = conn->next_rp_ref++;</span><br><span> }</span><br><span>@@ -1140,7 +1140,7 @@</span><br><span> gsm411_smr_init(&trans->sms.smr_inst, 0, 1,</span><br><span> gsm411_rl_recv, gsm411_mn_send);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS);</span><br><span> trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */</span><br><span> </span><br><span> new_trans = 1;</span><br><span>diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c</span><br><span>index e1ea681..c0a0bdd 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -113,7 +113,7 @@</span><br><span> /* Count active NC SS/USSD sessions */</span><br><span> osmo_counter_inc(conn->network->active_nc_ss);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS);</span><br><span> trans->dlci = OMSC_LINKID_CB(msg);</span><br><span> cm_service_request_concludes(conn, msg);</span><br><span> }</span><br><span>@@ -232,7 +232,7 @@</span><br><span> vlr_subscr_msisdn_or_name(transt->vsub));</span><br><span> </span><br><span> /* Assign connection */</span><br><span style="color: hsl(0, 100%, 40%);">- transt->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);</span><br><span style="color: hsl(120, 100%, 40%);">+ transt->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS);</span><br><span> transt->paging_request = NULL;</span><br><span> </span><br><span> /* Send stored message */</span><br><span>@@ -324,7 +324,7 @@</span><br><span> conn = connection_for_subscr(vsub);</span><br><span> if (conn) {</span><br><span> /* Assign connection */</span><br><span style="color: hsl(0, 100%, 40%);">- trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS);</span><br><span> trans->dlci = 0x00; /* SAPI=0, not SACCH */</span><br><span> return trans;</span><br><span> }</span><br><span>diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c</span><br><span>index f9ed759..1e4ab19 100644</span><br><span>--- a/src/libmsc/iucs.c</span><br><span>+++ b/src/libmsc/iucs.c</span><br><span>@@ -172,7 +172,7 @@</span><br><span> uint8_t pdisc = gh->proto_discr & 0x0f;</span><br><span> OSMO_ASSERT(pdisc != GSM48_PDISC_RR);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msc_dtap(conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_dtap(conn, msg);</span><br><span> } else {</span><br><span> /* allocate a new connection */</span><br><span> </span><br><span>@@ -189,7 +189,7 @@</span><br><span> abort();</span><br><span> </span><br><span> /* ownership of conn hereby goes to the MSC: */</span><br><span style="color: hsl(0, 100%, 40%);">- msc_compl_l3(conn, msg, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_compl_l3(conn, msg, 0);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c</span><br><span>index 7358080..a657857 100644</span><br><span>--- a/src/libmsc/iucs_ranap.c</span><br><span>+++ b/src/libmsc/iucs_ranap.c</span><br><span>@@ -96,7 +96,7 @@</span><br><span> </span><br><span> /* TODO evalute ies */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msc_rx_sec_mode_compl(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_rx_sec_mode_compl(conn);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c</span><br><span>index f2fe85c..45dfd73 100644</span><br><span>--- a/src/libmsc/osmo_msc.c</span><br><span>+++ b/src/libmsc/osmo_msc.c</span><br><span>@@ -79,7 +79,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a SAPI-N-REJECT from BSC */</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_sapi_n_reject(struct ran_conn *conn, int dlci)</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci)</span><br><span> {</span><br><span> int sapi = dlci & 0x7;</span><br><span> </span><br><span>@@ -90,21 +90,21 @@</span><br><span> /* receive a Level 3 Complete message.</span><br><span> * Ownership of the conn is completely passed to the conn FSM, i.e. for both acceptance and rejection,</span><br><span> * the conn FSM shall decide when to release this conn. It may already be discarded before this exits. */</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_compl_l3(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, uint16_t chosen_channel)</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_compl_l3(struct ran_conn *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg, uint16_t chosen_channel)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_get(conn, MSC_CONN_USE_COMPL_L3);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_get(conn, RAN_CONN_USE_COMPL_L3);</span><br><span> gsm0408_dispatch(conn, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_COMPL_L3);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_COMPL_L3);</span><br><span> }</span><br><span> </span><br><span> /* Receive a DTAP message from BSC */</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_dtap(struct ran_conn *conn, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_get(conn, MSC_CONN_USE_DTAP);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_get(conn, RAN_CONN_USE_DTAP);</span><br><span> gsm0408_dispatch(conn, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_DTAP);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_DTAP);</span><br><span> }</span><br><span> </span><br><span> /* Receive an ASSIGNMENT COMPLETE from BSC */</span><br><span>@@ -116,16 +116,15 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive an ASSIGNMENT FAILURE from BSC */</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_assign_fail(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cause, uint8_t *rr_cause)</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause)</span><br><span> {</span><br><span> LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n");</span><br><span> }</span><br><span> </span><br><span> /* Receive a CLASSMARK CHANGE from BSC */</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_classmark_chg(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *cm2, uint8_t cm2_len,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *cm3, uint8_t cm3_len)</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_classmark_chg(struct ran_conn *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *cm2, uint8_t cm2_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *cm3, uint8_t cm3_len)</span><br><span> {</span><br><span> struct gsm_classmark *cm;</span><br><span> </span><br><span>@@ -159,8 +158,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a CIPHERING MODE COMPLETE from BSC */</span><br><span style="color: hsl(0, 100%, 40%);">-void msc_cipher_mode_compl(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, uint8_t alg_id)</span><br><span style="color: hsl(120, 100%, 40%);">+void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id)</span><br><span> {</span><br><span> struct vlr_ciph_result ciph_res = { .cause = VLR_CIPH_REJECT };</span><br><span> </span><br><span>@@ -207,7 +205,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a CLEAR REQUEST from BSC */</span><br><span style="color: hsl(0, 100%, 40%);">-int msc_clear_request(struct ran_conn *conn, uint32_t cause)</span><br><span style="color: hsl(120, 100%, 40%);">+int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause)</span><br><span> {</span><br><span> ran_conn_close(conn, cause);</span><br><span> return 1;</span><br><span>@@ -250,7 +248,7 @@</span><br><span> {</span><br><span> OSMO_ASSERT(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (balance_token != MSC_CONN_USE_UNTRACKED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (balance_token != RAN_CONN_USE_UNTRACKED) {</span><br><span> uint32_t flag = 1 << balance_token;</span><br><span> OSMO_ASSERT(balance_token < 32);</span><br><span> if (conn->use_tokens & flag)</span><br><span>@@ -271,13 +269,12 @@</span><br><span> }</span><br><span> </span><br><span> /* decrement the ref-count. Once it reaches zero, we release */</span><br><span style="color: hsl(0, 100%, 40%);">-void _ran_conn_put(struct ran_conn *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- enum ran_conn_use balance_token,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *file, int line)</span><br><span style="color: hsl(120, 100%, 40%);">+void _ran_conn_put(struct ran_conn *conn, enum ran_conn_use balance_token,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *file, int line)</span><br><span> {</span><br><span> OSMO_ASSERT(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (balance_token != MSC_CONN_USE_UNTRACKED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (balance_token != RAN_CONN_USE_UNTRACKED) {</span><br><span> uint32_t flag = 1 << balance_token;</span><br><span> OSMO_ASSERT(balance_token < 32);</span><br><span> if (!(conn->use_tokens & flag))</span><br><span>@@ -312,16 +309,16 @@</span><br><span> }</span><br><span> </span><br><span> const struct value_string ran_conn_use_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_UNTRACKED, "UNTRACKED"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_COMPL_L3, "compl_l3"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_DTAP, "dtap"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_AUTH_CIPH, "auth+ciph"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_CM_SERVICE, "cm_service"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_TRANS_CC, "trans_cc"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_TRANS_SMS, "trans_sms"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_TRANS_NC_SS, "trans_nc_ss"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_SILENT_CALL, "silent_call"},</span><br><span style="color: hsl(0, 100%, 40%);">- {MSC_CONN_USE_RELEASE, "release"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_UNTRACKED, "UNTRACKED"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_COMPL_L3, "compl_l3"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_DTAP, "dtap"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_AUTH_CIPH, "auth+ciph"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_CM_SERVICE, "cm_service"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_TRANS_CC, "trans_cc"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_TRANS_SMS, "trans_sms"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_TRANS_NC_SS, "trans_nc_ss"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_SILENT_CALL, "silent_call"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {RAN_CONN_USE_RELEASE, "release"},</span><br><span> {0, NULL},</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c</span><br><span>index 6c6e217..c6c31a0 100644</span><br><span>--- a/src/libmsc/silent_call.c</span><br><span>+++ b/src/libmsc/silent_call.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> conn->lchan->ts->nr, conn->lchan->ts->trx->arfcn);</span><br><span> #endif</span><br><span> conn->silent_call = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_get(conn, MSC_CONN_USE_SILENT_CALL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_get(conn, RAN_CONN_USE_SILENT_CALL);</span><br><span> /* increment lchan reference count */</span><br><span> osmo_signal_dispatch(SS_SCALL, S_SCALL_SUCCESS, &sigdata);</span><br><span> break;</span><br><span>@@ -162,7 +162,7 @@</span><br><span> #endif</span><br><span> </span><br><span> conn->silent_call = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_SILENT_CALL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_SILENT_CALL);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c</span><br><span>index b1c8bc9..5fab1c6 100644</span><br><span>--- a/src/libmsc/subscr_conn.c</span><br><span>+++ b/src/libmsc/subscr_conn.c</span><br><span>@@ -94,7 +94,7 @@</span><br><span> if (conn->complete_layer3_type == COMPLETE_LAYER3_CM_SERVICE_REQ</span><br><span> && conn_accepted) {</span><br><span> conn->received_cm_service_request = true;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_get(conn, MSC_CONN_USE_CM_SERVICE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_get(conn, RAN_CONN_USE_CM_SERVICE);</span><br><span> }</span><br><span> </span><br><span> if (conn_accepted)</span><br><span>@@ -163,7 +163,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka,</span><br><span style="color: hsl(120, 100%, 40%);">+int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka,</span><br><span> bool retrieve_imeisv)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -190,14 +190,14 @@</span><br><span> * So far though, the only time we send a Classmark Request is during Ciphering. As soon</span><br><span> * as more such situations arise, we need to add state to indicate what action should</span><br><span> * follow after a Classmark Update is received (e.g.</span><br><span style="color: hsl(0, 100%, 40%);">- * msc_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that</span><br><span style="color: hsl(120, 100%, 40%);">+ * ran_conn_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that</span><br><span> * Ciphering should continue afterwards). But right now, it is accurate to always</span><br><span> * continue with Ciphering: */</span><br><span> </span><br><span> /* During Ciphering, we needed Classmark information. The Classmark Update has come in,</span><br><span> * go back into the Set Ciphering Command procedure. */</span><br><span> osmo_fsm_inst_state_chg(fi, RAN_CONN_S_AUTH_CIPH, RAN_CONN_TIMEOUT, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (msc_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ran_conn_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka,</span><br><span> conn->geran_set_cipher_mode.retrieve_imeisv)) {</span><br><span> LOGPFSML(fi, LOGL_ERROR,</span><br><span> "Sending Cipher Mode Command failed, aborting attach\n");</span><br><span>@@ -341,13 +341,13 @@</span><br><span> /* Use count for either conn->a.waiting_for_clear_complete or</span><br><span> * conn->iu.waiting_for_release_complete. 'get' it early, so we don't deallocate after tearing</span><br><span> * down active transactions. Safeguard against double-get (though it shouldn't happen). */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ran_conn_used_by(conn, MSC_CONN_USE_RELEASE))</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_get(conn, MSC_CONN_USE_RELEASE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ran_conn_used_by(conn, RAN_CONN_USE_RELEASE))</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_get(conn, RAN_CONN_USE_RELEASE);</span><br><span> </span><br><span> /* Cancel pending CM Service Requests */</span><br><span> if (conn->received_cm_service_request) {</span><br><span> conn->received_cm_service_request = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE);</span><br><span> }</span><br><span> </span><br><span> /* Cancel all VLR FSMs, if any */</span><br><span>@@ -693,7 +693,7 @@</span><br><span> }</span><br><span> if (*flag) {</span><br><span> *flag = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_RELEASE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_RELEASE);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c</span><br><span>index 5c80e5f..cf12066 100644</span><br><span>--- a/src/libmsc/transaction.c</span><br><span>+++ b/src/libmsc/transaction.c</span><br><span>@@ -140,21 +140,21 @@</span><br><span> */</span><br><span> void trans_free(struct gsm_trans *trans)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- enum ran_conn_use conn_usage_token = MSC_CONN_USE_UNTRACKED;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum ran_conn_use conn_usage_token = RAN_CONN_USE_UNTRACKED;</span><br><span> struct ran_conn *conn;</span><br><span> </span><br><span> switch (trans->protocol) {</span><br><span> case GSM48_PDISC_CC:</span><br><span> _gsm48_cc_trans_free(trans);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_usage_token = MSC_CONN_USE_TRANS_CC;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_usage_token = RAN_CONN_USE_TRANS_CC;</span><br><span> break;</span><br><span> case GSM48_PDISC_SMS:</span><br><span> _gsm411_sms_trans_free(trans);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_usage_token = MSC_CONN_USE_TRANS_SMS;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_usage_token = RAN_CONN_USE_TRANS_SMS;</span><br><span> break;</span><br><span> case GSM48_PDISC_NC_SS:</span><br><span> _gsm911_nc_ss_trans_free(trans);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_usage_token = MSC_CONN_USE_TRANS_NC_SS;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_usage_token = RAN_CONN_USE_TRANS_NC_SS;</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>index 5819e51..ef88c5a 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>@@ -404,7 +404,7 @@</span><br><span> cc_to_mncc_expect_tx("", MNCC_REL_CNF);</span><br><span> dtap_expect_tx("032d"); /* CC: Release */</span><br><span> expect_iu_release();</span><br><span style="color: hsl(0, 100%, 40%);">- msc_clear_request(g_conn, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_clear_request(g_conn, 0);</span><br><span> OSMO_ASSERT(cc_to_mncc_tx_confirmed);</span><br><span> OSMO_ASSERT(iu_release_sent);</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>index 92e0acc..2443e31 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>@@ -186,7 +186,7 @@</span><br><span> OSMO_ASSERT(conn->received_cm_service_request);</span><br><span> </span><br><span> conn->received_cm_service_request = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE);</span><br><span> </span><br><span> ASSERT_RELEASE_CLEAR(via_ran);</span><br><span> }</span><br><span>@@ -225,14 +225,14 @@</span><br><span> g_conn = conn_new();</span><br><span> reset_l3_seq_nr();</span><br><span> patch_l3_seq_nr(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- msc_compl_l3(g_conn, msg, 23);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_compl_l3(g_conn, msg, 23);</span><br><span> } else {</span><br><span> patch_l3_seq_nr(msg);</span><br><span> if ((gsm48_hdr_pdisc(gh) == GSM48_PDISC_RR)</span><br><span> && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL))</span><br><span style="color: hsl(0, 100%, 40%);">- msc_cipher_mode_compl(g_conn, msg, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_cipher_mode_compl(g_conn, msg, 0);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- msc_dtap(g_conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_dtap(g_conn, msg);</span><br><span> }</span><br><span> </span><br><span> if (!conn_exists(g_conn))</span><br><span>@@ -842,7 +842,7 @@</span><br><span> OSMO_ASSERT(g_conn);</span><br><span> OSMO_ASSERT(g_conn->via_ran == RAN_UTRAN_IU);</span><br><span> OSMO_ASSERT(g_conn->iu.ue_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- msc_rx_sec_mode_compl(g_conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_conn_rx_sec_mode_compl(g_conn);</span><br><span> }</span><br><span> </span><br><span> void bss_sends_clear_complete()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12030">change 12030</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12030"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 </div>
<div style="display:none"> Gerrit-Change-Number: 12030 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>