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/a_iface_bssap.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/a_iface_bssap.c')
-rw-r--r-- | src/libmsc/a_iface_bssap.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 31cdb06ef..4d03d2303 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -343,7 +343,7 @@ static int bssmap_rx_l3_compl(struct osmo_sccp_user *scu, const struct a_conn_in conn = ran_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); /* Handover location update to the MSC code */ - msc_compl_l3(conn, msg, 0); + ran_conn_compl_l3(conn, msg, 0); return 0; } @@ -372,7 +372,7 @@ static int bssmap_rx_classmark_upd(struct ran_conn *conn, struct msgb *msg, } /* Inform MSC about the classmark change */ - msc_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len); + ran_conn_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len); return 0; } @@ -383,9 +383,9 @@ static int bssmap_rx_ciph_compl(struct ran_conn *conn, struct msgb *msg, { /* FIXME: The field GSM0808_IE_LAYER_3_MESSAGE_CONTENTS is optional by * means of the specification. So there can be messages without L3 info. - * In this case, the code will crash becrause msc_cipher_mode_compl() + * In this case, the code will crash becrause ran_conn_cipher_mode_compl() * is not able to deal with msg = NULL and apperently - * msc_cipher_mode_compl() was never meant to be used without L3 data. + * ran_conn_cipher_mode_compl() was never meant to be used without L3 data. * This needs to be discussed further! */ uint8_t alg_id = 1; @@ -407,7 +407,7 @@ static int bssmap_rx_ciph_compl(struct ran_conn *conn, struct msgb *msg, rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE]); /* Hand over cipher mode complete message to the MSC */ - msc_cipher_mode_compl(conn, msg, alg_id); + ran_conn_cipher_mode_compl(conn, msg, alg_id); return 0; } @@ -462,12 +462,12 @@ static int bssmap_rx_ass_fail(struct ran_conn *conn, struct msgb *msg, /* FIXME: In AoIP, the Assignment failure will carry also an optional * Codec List (BSS Supported) element. It has to be discussed if we - * can ignore this element. If not, The msc_assign_fail() function - * call has to change. However msc_assign_fail() does nothing in the + * can ignore this element. If not, The ran_conn_assign_fail() function + * call has to change. However ran_conn_assign_fail() does nothing in the * end. So probably we can just leave it as it is. Even for AoIP */ /* Inform the MSC about the assignment failure event */ - msc_assign_fail(conn, cause, rr_cause_ptr); + ran_conn_assign_fail(conn, cause, rr_cause_ptr); return 0; } @@ -494,7 +494,7 @@ static int bssmap_rx_sapi_n_rej(struct ran_conn *conn, struct msgb *msg, dlci = TLVP_VAL(tp, GSM0808_IE_DLCI)[0]; /* Inform the MSC about the sapi "n" reject event */ - msc_sapi_n_reject(conn, dlci); + ran_conn_sapi_n_reject(conn, dlci); return 0; } @@ -582,7 +582,7 @@ static int bssmap_rx_ass_compl(struct ran_conn *conn, struct msgb *msg, /* FIXME: Seems to be related to authentication or, encryption. Is this really in the right place? */ - msc_rx_sec_mode_compl(conn); + ran_conn_rx_sec_mode_compl(conn); return 0; } @@ -670,12 +670,12 @@ static int rx_dtap(const struct osmo_sccp_user *scu, const struct a_conn_info *a LOGPCONN(conn, LOGL_DEBUG, "Rx DTAP %s\n", msgb_hexdump_l2(msg)); - /* msc_dtap expects the dtap payload in l3h */ + /* ran_conn_dtap expects the dtap payload in l3h */ msg->l3h = msg->l2h + 3; OMSC_LINKID_CB(msg) = dtap->link_id; /* Forward dtap payload into the msc */ - msc_dtap(conn, msg); + ran_conn_dtap(conn, msg); return 0; } |