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/silent_call.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/silent_call.c')
-rw-r--r-- | src/libmsc/silent_call.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 988889440..6c6e217d2 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -36,7 +36,7 @@ static int paging_cb_silent(unsigned int hooknum, unsigned int event, struct msgb *msg, void *_conn, void *_data) { - struct gsm_subscriber_connection *conn = _conn; + struct ran_conn *conn = _conn; struct scall_signal_data sigdata; int rc = 0; @@ -57,7 +57,7 @@ static int paging_cb_silent(unsigned int hooknum, unsigned int event, conn->lchan->ts->nr, conn->lchan->ts->trx->arfcn); #endif conn->silent_call = 1; - msc_subscr_conn_get(conn, MSC_CONN_USE_SILENT_CALL); + ran_conn_get(conn, MSC_CONN_USE_SILENT_CALL); /* increment lchan reference count */ osmo_signal_dispatch(SS_SCALL, S_SCALL_SUCCESS, &sigdata); break; @@ -76,7 +76,7 @@ static int paging_cb_silent(unsigned int hooknum, unsigned int event, #if 0 /* receive a layer 3 message from a silent call */ -int silent_call_rx(struct gsm_subscriber_connection *conn, struct msgb *msg) +int silent_call_rx(struct ran_conn *conn, struct msgb *msg) { /* FIXME: do something like sending it through a UDP port */ LOGP(DLSMS, LOGL_NOTICE, "Discarding L3 message from a silent call.\n"); @@ -95,7 +95,7 @@ static const struct msg_match silent_call_accept[] = { }; /* decide if we need to reroute a message as part of a silent call */ -int silent_call_reroute(struct gsm_subscriber_connection *conn, struct msgb *msg) +int silent_call_reroute(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); uint8_t pdisc = gsm48_hdr_pdisc(gh); @@ -138,7 +138,7 @@ int gsm_silent_call_start(struct vlr_subscr *vsub, void *data, int type) /* end a silent call with a given subscriber */ int gsm_silent_call_stop(struct vlr_subscr *vsub) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; conn = connection_for_subscr(vsub); if (!conn) { @@ -162,7 +162,7 @@ int gsm_silent_call_stop(struct vlr_subscr *vsub) #endif conn->silent_call = 0; - msc_subscr_conn_put(conn, MSC_CONN_USE_SILENT_CALL); + ran_conn_put(conn, MSC_CONN_USE_SILENT_CALL); return 0; } |