<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18499">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drop MSC types "local" vs "normal"<br><br>Another legacy feature. All that this setting effectively does is prevent MSCs<br>from being contacted for non-emergency calls. To select which MSCs shall handle<br>emergency calls, there is the allow_emerg flag.<br><br>Change-Id: I7fc630d9c35be9a69a0d378d3de2b2312c69690d<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/bsc_rf_ctrl.c<br>M src/osmo-bsc/gsm_08_08.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>4 files changed, 0 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/18499/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index b497345..364fa72 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -50,11 +50,6 @@</span><br><span> struct osmo_bsc_rf;</span><br><span> struct gsm_network;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">-    MSC_CON_TYPE_NORMAL,</span><br><span style="color: hsl(0, 100%, 40%);">-    MSC_CON_TYPE_LOCAL,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Constants for the MSC rate counters */</span><br><span> enum {</span><br><span>         /* Rx message counters */</span><br><span>@@ -118,7 +113,6 @@</span><br><span>      struct gsm_network *network;</span><br><span> </span><br><span>     int allow_emerg;</span><br><span style="color: hsl(0, 100%, 40%);">-        int type;</span><br><span> </span><br><span>        /* Connection data */</span><br><span>        struct osmo_plmn_id core_plmn;</span><br><span>diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>index 0aa8e49..73156e6 100644</span><br><span>--- a/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>+++ b/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>@@ -400,7 +400,6 @@</span><br><span>                    void *handler_data, void *signal_data)</span><br><span> {</span><br><span>  struct gsm_network *net;</span><br><span style="color: hsl(0, 100%, 40%);">-        struct msc_signal_data *msc;</span><br><span>         struct osmo_bsc_rf *rf;</span><br><span> </span><br><span>  /* check if we want to handle this signal */</span><br><span>@@ -408,13 +407,10 @@</span><br><span>                 return 0;</span><br><span> </span><br><span>        net = handler_data;</span><br><span style="color: hsl(0, 100%, 40%);">-     msc = signal_data;</span><br><span> </span><br><span>       /* check if we have the needed information */</span><br><span>        if (!net->bsc_data)</span><br><span>               return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       if (msc->data->type != MSC_CON_TYPE_NORMAL)</span><br><span style="color: hsl(0, 100%, 40%);">-               return 0;</span><br><span> </span><br><span>        rf = net->bsc_data->rf_ctrl;</span><br><span>   switch (signal) {</span><br><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 70559c0..9ccdb3b 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -197,8 +197,6 @@</span><br><span> </span><br><span> round_robin:</span><br><span>     llist_for_each_entry(msc, &bsc->mscs, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">-           if (!is_emerg && msc->type != MSC_CON_TYPE_NORMAL)</span><br><span style="color: hsl(0, 100%, 40%);">-                   continue;</span><br><span>            if (is_emerg && !msc->allow_emerg)</span><br><span>                        continue;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index f86da65..5837316 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -137,8 +137,6 @@</span><br><span> </span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   vty_out(vty, " type %s%s", msc->type == MSC_CON_TYPE_NORMAL ?</span><br><span style="color: hsl(0, 100%, 40%);">-                                      "normal" : "local", VTY_NEWLINE);</span><br><span>        vty_out(vty, " allow-emergency %s%s", msc->allow_emerg ?</span><br><span>                                        "allow" : "deny", VTY_NEWLINE);</span><br><span> </span><br><span>@@ -317,22 +315,6 @@</span><br><span>       return CMD_ERR_INCOMPLETE;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_net_msc_type,</span><br><span style="color: hsl(0, 100%, 40%);">-      cfg_net_msc_type_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-      "type (normal|local)",</span><br><span style="color: hsl(0, 100%, 40%);">-      "Select the MSC type\n"</span><br><span style="color: hsl(0, 100%, 40%);">-      "Plain GSM MSC\n" "Special MSC for local call routing\n")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-  struct bsc_msc_data *data = bsc_msc_data(vty);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  if (strcmp(argv[0], "normal") == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-           data->type = MSC_CON_TYPE_NORMAL;</span><br><span style="color: hsl(0, 100%, 40%);">-    else if (strcmp(argv[0], "local") == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-               data->type = MSC_CON_TYPE_LOCAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> DEFUN(cfg_net_msc_emerg,</span><br><span>       cfg_net_msc_emerg_cmd,</span><br><span>       "allow-emergency (allow|deny)",</span><br><span>@@ -780,7 +762,6 @@</span><br><span>    install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd);</span><br><span>  install_element(MSC_NODE, &cfg_net_msc_dest_cmd);</span><br><span>        install_element(MSC_NODE, &cfg_net_msc_no_dest_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-        install_element(MSC_NODE, &cfg_net_msc_type_cmd);</span><br><span>        install_element(MSC_NODE, &cfg_net_msc_emerg_cmd);</span><br><span>       install_element(MSC_NODE, &cfg_net_msc_amr_12_2_cmd);</span><br><span>    install_element(MSC_NODE, &cfg_net_msc_amr_10_2_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18499">change 18499</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/18499"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7fc630d9c35be9a69a0d378d3de2b2312c69690d </div>
<div style="display:none"> Gerrit-Change-Number: 18499 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>