diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-05-25 00:05:03 +0200 |
---|---|---|
committer | neels <nhofmeyr@sysmocom.de> | 2020-05-29 20:16:40 +0000 |
commit | b281b1cdb670dbd26354c1f45ce85a477bf5ed15 (patch) | |
tree | fe80920661e9b1250ab4ce9bb85e52c96c3c2b0c | |
parent | 39a0af3bf4bc1db1554fdd55b0920e87efaa568b (diff) |
drop MSC types "local" vs "normal"
Another legacy feature. All that this setting effectively does is prevent MSCs
from being contacted for non-emergency calls. To select which MSCs shall handle
emergency calls, there is the allow_emerg flag.
Change-Id: I7fc630d9c35be9a69a0d378d3de2b2312c69690d
-rw-r--r-- | include/osmocom/bsc/bsc_msc_data.h | 6 | ||||
-rw-r--r-- | src/osmo-bsc/bsc_rf_ctrl.c | 4 | ||||
-rw-r--r-- | src/osmo-bsc/gsm_08_08.c | 2 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_vty.c | 16 |
4 files changed, 4 insertions, 24 deletions
diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index b4973451f..364fa727b 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -50,11 +50,6 @@ struct osmo_bsc_rf; struct gsm_network; -enum { - MSC_CON_TYPE_NORMAL, - MSC_CON_TYPE_LOCAL, -}; - /* Constants for the MSC rate counters */ enum { /* Rx message counters */ @@ -118,7 +113,6 @@ struct bsc_msc_data { struct gsm_network *network; int allow_emerg; - int type; /* Connection data */ struct osmo_plmn_id core_plmn; diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index 0aa8e494a..73156e6dc 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -400,7 +400,6 @@ static int msc_signal_handler(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { struct gsm_network *net; - struct msc_signal_data *msc; struct osmo_bsc_rf *rf; /* check if we want to handle this signal */ @@ -408,13 +407,10 @@ static int msc_signal_handler(unsigned int subsys, unsigned int signal, return 0; net = handler_data; - msc = signal_data; /* check if we have the needed information */ if (!net->bsc_data) return 0; - if (msc->data->type != MSC_CON_TYPE_NORMAL) - return 0; rf = net->bsc_data->rf_ctrl; switch (signal) { diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 70559c065..9ccdb3b24 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -197,8 +197,6 @@ static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn, round_robin: llist_for_each_entry(msc, &bsc->mscs, entry) { - if (!is_emerg && msc->type != MSC_CON_TYPE_NORMAL) - continue; if (is_emerg && !msc->allow_emerg) continue; diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index f6f512f72..51a660b63 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -137,8 +137,6 @@ static void write_msc(struct vty *vty, struct bsc_msc_data *msc) } - vty_out(vty, " type %s%s", msc->type == MSC_CON_TYPE_NORMAL ? - "normal" : "local", VTY_NEWLINE); vty_out(vty, " allow-emergency %s%s", msc->allow_emerg ? "allow" : "deny", VTY_NEWLINE); @@ -361,19 +359,13 @@ ALIAS_DEPRECATED(deprecated_no_ussd_text, cfg_net_bsc_no_missing_msc_text_cmd, "no missing-msc-text", NO_STR LEGACY_STR); -DEFUN(cfg_net_msc_type, +DEFUN_DEPRECATED(cfg_net_msc_type, cfg_net_msc_type_cmd, "type (normal|local)", - "Select the MSC type\n" - "Plain GSM MSC\n" "Special MSC for local call routing\n") + LEGACY_STR LEGACY_STR) { - struct bsc_msc_data *data = bsc_msc_data(vty); - - if (strcmp(argv[0], "normal") == 0) - data->type = MSC_CON_TYPE_NORMAL; - else if (strcmp(argv[0], "local") == 0) - data->type = MSC_CON_TYPE_LOCAL; - + vty_out(vty, "%% 'msc' / 'type' config is deprecated and no longer has any effect%s", + VTY_NEWLINE); return CMD_SUCCESS; } |