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
diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c
index 63a1047..e1ea681 100644
--- a/src/libmsc/gsm_09_11.c
+++ b/src/libmsc/gsm_09_11.c
@@ -53,7 +53,7 @@
static uint32_t new_callref = 0x20000001;
/* Entry point for call independent MO SS messages */
-int gsm0911_rcv_nc_ss(struct gsm_subscriber_connection *conn, struct msgb *msg)
+int gsm0911_rcv_nc_ss(struct ran_conn *conn, struct msgb *msg)
{
struct gsm48_hdr *gh = msgb_l3(msg);
struct osmo_gsup_message gsup_msg;
@@ -113,7 +113,7 @@
/* Count active NC SS/USSD sessions */
osmo_counter_inc(conn->network->active_nc_ss);
- trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);
+ trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);
trans->dlci = OMSC_LINKID_CB(msg);
cm_service_request_concludes(conn, msg);
}
@@ -193,7 +193,7 @@
if (msg_type == GSM0480_MTYPE_RELEASE_COMPLETE)
trans_free(trans);
else
- msc_subscr_conn_communicating(conn);
+ ran_conn_communicating(conn);
/* Count established MS-initiated NC SS/USSD sessions */
if (msg_type == GSM0480_MTYPE_REGISTER)
@@ -217,7 +217,7 @@
static int handle_paging_event(unsigned int hooknum, unsigned int event,
struct msgb *msg, void *_conn, void *_transt)
{
- struct gsm_subscriber_connection *conn = _conn;
+ struct ran_conn *conn = _conn;
enum gsm_paging_event paging_event = event;
struct gsm_trans *transt = _transt;
struct gsm48_hdr *gh;
@@ -232,7 +232,7 @@
vlr_subscr_msisdn_or_name(transt->vsub));
/* Assign connection */
- transt->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);
+ transt->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);
transt->paging_request = NULL;
/* Send stored message */
@@ -272,7 +272,7 @@
static struct gsm_trans *establish_nc_ss_trans(struct gsm_network *net,
struct vlr_subscr *vsub, struct osmo_gsup_message *gsup_msg)
{
- struct gsm_subscriber_connection *conn;
+ struct ran_conn *conn;
struct gsm_trans *trans, *transt;
int tid;
@@ -324,7 +324,7 @@
conn = connection_for_subscr(vsub);
if (conn) {
/* Assign connection */
- trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);
+ trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);
trans->dlci = 0x00; /* SAPI=0, not SACCH */
return trans;
}