diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-29 22:37:51 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 22:45:42 +0100 |
commit | c036b79918dbeb2baefff177be51dfdd9dac1588 (patch) | |
tree | 86dbac47aa1a05ffe3f0bf5341664c92a98ba300 /src/libmsc/transaction.c | |
parent | d03e7289156f1b54926a5a63ce97a3ef954f0c9d (diff) |
rename gsm_subscriber_connection to ran_conn
In preparation for inter-BSC and inter-MSC handover, we need to separate the
subscriber management logic from the actual RAN connections. What better time
to finally rename gsm_subscriber_connection.
* Name choice:
In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk
of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it
"bss_conn": in 3G a BSS is called RNS, IIUC.
The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network.
* Rationale:
A subscriber in the MSC so far has only one RAN connection, but e.g. for
inter-BSC handover, a second one needs to be created to handover to. Most of
the items in the former gsm_subscriber_connection are actually related to the
RAN, with only a few MM and RTP related items. So, as a first step, just rename
it to ran_conn, to cosmetically prepare for moving the not strictly RAN related
items away later.
Also:
- Rename some functions from msc_subscr_conn_* to ran_conn_*
- Rename "Subscr_Conn" FSM instance name to "RAN_conn"
- Rename SUBSCR_CONN_* to RAN_CONN_*
Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a
Diffstat (limited to 'src/libmsc/transaction.c')
-rw-r--r-- | src/libmsc/transaction.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index cffbe0dac..5c80e5f3c 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -40,7 +40,7 @@ void _gsm911_nc_ss_trans_free(struct gsm_trans *trans); * \param[in] trans_id Transaction ID of transaction * \returns Matching transaction, if any */ -struct gsm_trans *trans_find_by_id(struct gsm_subscriber_connection *conn, +struct gsm_trans *trans_find_by_id(struct ran_conn *conn, uint8_t proto, uint8_t trans_id) { struct gsm_trans *trans; @@ -78,7 +78,7 @@ struct gsm_trans *trans_find_by_callref(struct gsm_network *net, * \param[in] sm_rp_mr RP Message Reference (see GSM TS 04.11, section 8.2.3) * \returns Matching transaction, NULL otherwise */ -struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn, +struct gsm_trans *trans_find_by_sm_rp_mr(struct ran_conn *conn, uint8_t sm_rp_mr) { struct gsm_network *net = conn->network; @@ -140,8 +140,8 @@ struct gsm_trans *trans_alloc(struct gsm_network *net, */ void trans_free(struct gsm_trans *trans) { - enum msc_subscr_conn_use conn_usage_token = MSC_CONN_USE_UNTRACKED; - struct gsm_subscriber_connection *conn; + enum ran_conn_use conn_usage_token = MSC_CONN_USE_UNTRACKED; + struct ran_conn *conn; switch (trans->protocol) { case GSM48_PDISC_CC: @@ -174,7 +174,7 @@ void trans_free(struct gsm_trans *trans) talloc_free(trans); if (conn) - msc_subscr_conn_put(conn, conn_usage_token); + ran_conn_put(conn, conn_usage_token); } /*! allocate an unused transaction ID for the given subscriber @@ -220,7 +220,7 @@ int trans_assign_trans_id(struct gsm_network *net, struct vlr_subscr *vsub, * \param[in] conn Connection to check * \returns 1 in case there is a transaction, 0 otherwise */ -struct gsm_trans *trans_has_conn(const struct gsm_subscriber_connection *conn) +struct gsm_trans *trans_has_conn(const struct ran_conn *conn) { struct gsm_trans *trans; @@ -236,7 +236,7 @@ struct gsm_trans *trans_has_conn(const struct gsm_subscriber_connection *conn) * facilities, which will then send the necessary release indications. * \param[in] conn Connection that is going to be closed. */ -void trans_conn_closed(struct gsm_subscriber_connection *conn) +void trans_conn_closed(struct ran_conn *conn) { struct gsm_trans *trans; |