From c036b79918dbeb2baefff177be51dfdd9dac1588 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 29 Nov 2018 22:37:51 +0100 Subject: 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 --- src/libmsc/msc_ifaces.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libmsc/msc_ifaces.c') diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index b76cdb45d..8ae34fcdd 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -46,7 +46,7 @@ const struct value_string ran_type_names[] = { { 0, NULL } }; -static int msc_tx(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int msc_tx(struct ran_conn *conn, struct msgb *msg) { if (!msg) return -EINVAL; @@ -77,7 +77,7 @@ static int msc_tx(struct gsm_subscriber_connection *conn, struct msgb *msg) } -int msc_tx_dtap(struct gsm_subscriber_connection *conn, +int msc_tx_dtap(struct ran_conn *conn, struct msgb *msg) { return msc_tx(conn, msg); @@ -85,7 +85,7 @@ int msc_tx_dtap(struct gsm_subscriber_connection *conn, /* 9.2.5 CM service accept */ -int msc_gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn) +int msc_gsm48_tx_mm_serv_ack(struct ran_conn *conn) { struct msgb *msg; struct gsm48_hdr *gh; @@ -106,7 +106,7 @@ int msc_gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn) } /* 9.2.6 CM service reject */ -int msc_gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn, +int msc_gsm48_tx_mm_serv_rej(struct ran_conn *conn, enum gsm48_reject_value value) { struct msgb *msg; @@ -125,7 +125,7 @@ int msc_gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn, return msc_tx_dtap(conn, msg); } -int msc_tx_common_id(struct gsm_subscriber_connection *conn) +int msc_tx_common_id(struct ran_conn *conn) { if (!conn) return -EINVAL; -- cgit v1.2.3