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/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c
index 051372c..10f3cfa 100644
--- a/src/libmsc/smpp_openbsc.c
+++ b/src/libmsc/smpp_openbsc.c
@@ -536,7 +536,7 @@
void smpp_cmd_ack(struct osmo_smpp_cmd *cmd)
{
- struct gsm_subscriber_connection *conn;
+ struct ran_conn *conn;
struct gsm_trans *trans;
if (cmd->is_report)
@@ -562,7 +562,7 @@
void smpp_cmd_err(struct osmo_smpp_cmd *cmd, uint32_t status)
{
- struct gsm_subscriber_connection *conn;
+ struct ran_conn *conn;
struct gsm_trans *trans;
int gsm411_cause;
@@ -636,7 +636,7 @@
}
static int deliver_to_esme(struct osmo_esme *esme, struct gsm_sms *sms,
- struct gsm_subscriber_connection *conn)
+ struct ran_conn *conn)
{
struct deliver_sm_t deliver;
int mode, ret;
@@ -731,13 +731,13 @@
static struct smsc *g_smsc;
-int smpp_route_smpp_first(struct gsm_sms *sms, struct gsm_subscriber_connection *conn)
+int smpp_route_smpp_first(struct gsm_sms *sms, struct ran_conn *conn)
{
return g_smsc->smpp_first;
}
int smpp_try_deliver(struct gsm_sms *sms,
- struct gsm_subscriber_connection *conn)
+ struct ran_conn *conn)
{
struct osmo_esme *esme;
struct osmo_smpp_addr dst;