This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18499 ) Change subject: drop MSC types "local" vs "normal" ...................................................................... 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 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 0 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/18499/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index b497345..364fa72 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 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 0aa8e49..73156e6 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -400,7 +400,6 @@ 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 @@ 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 70559c0..9ccdb3b 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -197,8 +197,6 @@ 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 f86da65..5837316 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -137,8 +137,6 @@ } - 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); @@ -317,22 +315,6 @@ return CMD_ERR_INCOMPLETE; } -DEFUN(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") -{ - 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; - - return CMD_SUCCESS; -} - DEFUN(cfg_net_msc_emerg, cfg_net_msc_emerg_cmd, "allow-emergency (allow|deny)", @@ -780,7 +762,6 @@ install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd); install_element(MSC_NODE, &cfg_net_msc_dest_cmd); install_element(MSC_NODE, &cfg_net_msc_no_dest_cmd); - install_element(MSC_NODE, &cfg_net_msc_type_cmd); install_element(MSC_NODE, &cfg_net_msc_emerg_cmd); install_element(MSC_NODE, &cfg_net_msc_amr_12_2_cmd); install_element(MSC_NODE, &cfg_net_msc_amr_10_2_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7fc630d9c35be9a69a0d378d3de2b2312c69690d Gerrit-Change-Number: 18499 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200526/18acb647/attachment.htm>