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 submitted this change. ( 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, 4 insertions(+), 24 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified 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 f6f512f..51a660b 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); @@ -361,19 +359,13 @@ 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; } -- 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: 4 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200529/26648d39/attachment.htm>