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/msc_vty.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/msc_vty.c')
-rw-r--r-- | src/libmsc/msc_vty.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 401586ea3..589eca077 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -489,7 +489,7 @@ static void vty_conn_hdr(struct vty *vty) VTY_NEWLINE); } -static void vty_dump_one_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) +static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn) { vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s", conn->a.conn_id, @@ -507,10 +507,10 @@ static void vty_dump_one_conn(struct vty *vty, const struct gsm_subscriber_conne DEFUN(show_msc_conn, show_msc_conn_cmd, "show connection", SHOW_STR "Subscriber Connections\n") { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; vty_conn_hdr(vty); - llist_for_each_entry(conn, &gsmnet->subscr_conns, entry) + llist_for_each_entry(conn, &gsmnet->ran_conns, entry) vty_dump_one_conn(vty, conn); return CMD_SUCCESS; @@ -628,7 +628,7 @@ static void subscr_dump_full_vty(struct vty *vty, struct vlr_subscr *vsub) /* Connection */ if (vsub->msc_conn_ref) { - struct gsm_subscriber_connection *conn = vsub->msc_conn_ref; + struct ran_conn *conn = vsub->msc_conn_ref; vty_conn_hdr(vty); vty_dump_one_conn(vty, conn); } @@ -1003,7 +1003,7 @@ DEFUN(subscriber_ussd_notify, "Text of USSD message to send\n") { char *text; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct vlr_subscr *vsub = get_vsub_by_argv(gsmnet, argv[0], argv[1]); int level; @@ -1095,7 +1095,7 @@ DEFUN(subscriber_mstest_close, "Loop Type F\n" "Loop Type I\n") { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct vlr_subscr *vsub = get_vsub_by_argv(gsmnet, argv[0], argv[1]); const char *loop_str; int loop_mode; @@ -1128,7 +1128,7 @@ DEFUN(subscriber_mstest_open, SUBSCR_HELP "Send a TS 04.14 MS Test Command to subscriber\n" "Open a TCH Loop inside the MS\n") { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct vlr_subscr *vsub = get_vsub_by_argv(gsmnet, argv[0], argv[1]); if (!vsub) { |