<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18765">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC pooling: make NRI mappings VTY configurable<br><br>Use the osmo_nri_ranges API to manage each MSC's NRI ranges by VTY<br>configuration.<br><br>Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/net_init.c<br>M src/osmo-bsc/osmo_bsc_msc.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>A tests/nri_cfg.vty<br>7 files changed, 367 insertions(+), 1 deletion(-)<br><br></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 43adaec..6e29bfe 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>@@ -179,6 +179,8 @@</span><br><span> /* UDP socket for proxying MGCP via SCCPlite/IPA */</span><br><span> struct osmo_fd ofd;</span><br><span> } mgcp_ipa;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_ranges *nri_ranges;</span><br><span> };</span><br><span> </span><br><span> int osmo_bsc_msc_init(struct bsc_msc_data *msc);</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index bc4c017..38047d2 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1716,6 +1716,9 @@</span><br><span> </span><br><span> /* Don't refuse to start with mutually exclusive codec settings */</span><br><span> bool allow_unusable_timeslots;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t nri_bitlen;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_ranges *null_nri_ranges;</span><br><span> };</span><br><span> </span><br><span> struct gsm_audio_support {</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 80658ec..916ab96 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <osmocom/ctrl/control_if.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm23236.h></span><br><span> </span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span>@@ -1110,6 +1111,7 @@</span><br><span> {</span><br><span> struct gsm_network *gsmnet = gsmnet_from_vty(vty);</span><br><span> int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *r;</span><br><span> </span><br><span> vty_out(vty, "network%s", VTY_NEWLINE);</span><br><span> vty_out(vty, " network country code %s%s", osmo_mcc_name(gsmnet->plmn.mcc), VTY_NEWLINE);</span><br><span>@@ -1159,6 +1161,16 @@</span><br><span> if (gsmnet->allow_unusable_timeslots)</span><br><span> vty_out(vty, " allow-unusable-timeslots%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmnet->nri_bitlen != OSMO_NRI_BITLEN_DEFAULT)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " nri bitlen %u%s", gsmnet->nri_bitlen, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(r, &gsmnet->null_nri_ranges->entries, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " nri null add %d", r->first);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (r->first != r->last)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %d", r->last);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -2058,6 +2070,60 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_STR "Mapping of Network Resource Indicators to this MSC, for MSC pooling\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NULL_NRI_STR "Define NULL-NRI values that cause re-assignment of an MS to a different MSC, for MSC pooling.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_FIRST_LAST_STR "First value of the NRI value range, should not surpass the configured 'nri bitlen'.\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Last value of the NRI value range, should not surpass the configured 'nri bitlen' and be larger than the" \</span><br><span style="color: hsl(120, 100%, 40%);">+ " first value; if omitted, apply only the first value.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_ARGS_TO_STR_FMT "%s%s%s"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_ARGS_TO_STR_ARGS(ARGC, ARGV) ARGV[0], (ARGC>1)? ".." : "", (ARGC>1)? ARGV[1] : ""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_net_nri_bitlen,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_net_nri_bitlen_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "nri bitlen <1-15>",</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set number of bits that an NRI has, to extract from TMSI identities (always starting just after the TMSI's most significant octet).\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "bit count (default: " OSMO_STRINGIFY_VAL(NRI_BITLEN_DEFAULT) ")\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *gsmnet = gsmnet_from_vty(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmnet->nri_bitlen = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_net_nri_null_add, cfg_net_nri_null_add_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "nri null add <0-32767> [<0-32767>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_STR NULL_NRI_STR "Add NULL-NRI value (or range)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_FIRST_LAST_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *message;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_ranges_vty_add(&message, NULL, bsc_gsmnet->null_nri_ranges, argc, argv,</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_gsmnet->nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% %s: " NRI_ARGS_TO_STR_FMT, message, NRI_ARGS_TO_STR_ARGS(argc, argv));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_net_nri_null_del, cfg_net_nri_null_del_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "nri null del <0-32767> [<0-32767>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_STR NULL_NRI_STR "Remove NRI value or range from the NRI mapping for this MSC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_FIRST_LAST_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *message;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_ranges_vty_del(&message, NULL, bsc_gsmnet->null_nri_ranges, argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% %s: " NRI_ARGS_TO_STR_FMT "%s", message, NRI_ARGS_TO_STR_ARGS(argc, argv),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* per-BTS configuration */</span><br><span> DEFUN(cfg_bts,</span><br><span> cfg_bts_cmd,</span><br><span>@@ -5400,6 +5466,9 @@</span><br><span> install_element(GSMNET_NODE, &cfg_net_neci_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_dtx_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_pag_any_tch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSMNET_NODE, &cfg_net_nri_bitlen_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSMNET_NODE, &cfg_net_nri_null_add_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSMNET_NODE, &cfg_net_nri_null_del_cmd);</span><br><span> </span><br><span> install_element(GSMNET_NODE, &cfg_bts_cmd);</span><br><span> install_node(&bts_node, config_write_bts);</span><br><span>diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c</span><br><span>index 34403fa..353099d 100644</span><br><span>--- a/src/osmo-bsc/net_init.c</span><br><span>+++ b/src/osmo-bsc/net_init.c</span><br><span>@@ -18,6 +18,7 @@</span><br><span> */</span><br><span> </span><br><span> #include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm23236.h></span><br><span> </span><br><span> #include <osmocom/bsc/osmo_bsc.h></span><br><span> #include <osmocom/bsc/gsm_04_08_rr.h></span><br><span>@@ -90,5 +91,8 @@</span><br><span> net->mgw.tdefs = g_mgw_tdefs;</span><br><span> osmo_tdefs_reset(net->mgw.tdefs);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ net->null_nri_ranges = osmo_nri_ranges_alloc(net);</span><br><span style="color: hsl(120, 100%, 40%);">+ net->nri_bitlen = OSMO_NRI_BITLEN_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return net;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index 30b54f3..ce07518 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <osmocom/core/socket.h></span><br><span> </span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm23236.h></span><br><span> </span><br><span> #include <osmocom/abis/ipa.h></span><br><span> </span><br><span>@@ -228,6 +229,8 @@</span><br><span> msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0");</span><br><span> msc_data->mgcp_ipa.local_port = 0; /* dynamic */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ msc_data->nri_ranges = osmo_nri_ranges_alloc(msc_data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return msc_data;</span><br><span> }</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 34a56de..c860cfe 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>@@ -29,6 +29,7 @@</span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm23236.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/mgcp_client/mgcp_client.h></span><br><span> </span><br><span>@@ -52,8 +53,10 @@</span><br><span> 1,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define MSC_NR_RANGE "<0-1000>"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_net_msc, cfg_net_msc_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "msc [<0-1000>]", "Configure MSC details\n" "MSC connection to configure\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "msc [" MSC_NR_RANGE "]", "Configure MSC details\n" "MSC connection to configure\n")</span><br><span> {</span><br><span> int index = argc == 1 ? atoi(argv[0]) : 0;</span><br><span> struct bsc_msc_data *msc;</span><br><span>@@ -99,6 +102,8 @@</span><br><span> vty_out(vty, " amr-payload bandwith-efficient%s", VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void msc_write_nri(struct vty *vty, struct bsc_msc_data *msc, bool verbose);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void write_msc(struct vty *vty, struct bsc_msc_data *msc)</span><br><span> {</span><br><span> vty_out(vty, "msc %d%s", msc->nr, VTY_NEWLINE);</span><br><span>@@ -170,6 +175,8 @@</span><br><span> vty_out(vty, " osmux %s%s", msc->use_osmux == OSMUX_USAGE_ON ? "on" : "only",</span><br><span> VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_write_nri(vty, msc, false);</span><br><span> }</span><br><span> </span><br><span> static int config_write_msc(struct vty *vty)</span><br><span>@@ -784,6 +791,128 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_STR "Mapping of Network Resource Indicators to this MSC, for MSC pooling\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_FIRST_LAST_STR "First value of the NRI value range, should not surpass the configured 'nri bitlen'.\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Last value of the NRI value range, should not surpass the configured 'nri bitlen' and be larger than the" \</span><br><span style="color: hsl(120, 100%, 40%);">+ " first value; if omitted, apply only the first value.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_WARN(MSC, FORMAT, args...) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Warning: msc %d: " FORMAT "%s", MSC->nr, ##args, VTY_NEWLINE); \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "msc %d: " FORMAT "\n", MSC->nr, ##args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_ARGS_TO_STR_FMT "%s%s%s"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NRI_ARGS_TO_STR_ARGS(ARGC, ARGV) ARGV[0], (ARGC>1)? ".." : "", (ARGC>1)? ARGV[1] : ""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_nri_add, cfg_msc_nri_add_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "nri add <0-32767> [<0-32767>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_STR "Add NRI value or range to the NRI mapping for this MSC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_FIRST_LAST_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *other_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool before;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *message;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range add_range;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_ranges_vty_add(&message, &add_range, msc->nri_ranges, argc, argv, bsc_gsmnet->nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_WARN(msc, "%s: " NRI_ARGS_TO_STR_FMT, message, NRI_ARGS_TO_STR_ARGS(argc, argv));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Issue a warning about NRI range overlaps (but still allow them).</span><br><span style="color: hsl(120, 100%, 40%);">+ * Overlapping ranges will map to whichever MSC comes fist in the bsc_gsmnet->mscs llist,</span><br><span style="color: hsl(120, 100%, 40%);">+ * which is not necessarily in the order of increasing msc->nr. */</span><br><span style="color: hsl(120, 100%, 40%);">+ before = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(other_msc, &bsc_gsmnet->mscs, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (other_msc == msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ before = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_range_overlaps_ranges(&add_range, other_msc->nri_ranges)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_WARN(msc, "NRI range [%d..%d] overlaps between msc %d and msc %d."</span><br><span style="color: hsl(120, 100%, 40%);">+ " For overlaps, msc %d has higher priority than msc %d",</span><br><span style="color: hsl(120, 100%, 40%);">+ add_range.first, add_range.last, msc->nr, other_msc->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ before ? other_msc->nr : msc->nr, before ? msc->nr : other_msc->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_nri_del, cfg_msc_nri_del_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "nri del <0-32767> [<0-32767>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_STR "Remove NRI value or range from the NRI mapping for this MSC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_FIRST_LAST_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *message;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_ranges_vty_del(&message, NULL, msc->nri_ranges, argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NRI_WARN(msc, "%s: " NRI_ARGS_TO_STR_FMT, message, NRI_ARGS_TO_STR_ARGS(argc, argv));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void msc_write_nri(struct vty *vty, struct bsc_msc_data *msc, bool verbose)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *r;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (verbose) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "msc %d%s", msc->nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&msc->nri_ranges->entries)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %% no NRI mappings%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(r, &msc->nri_ranges->entries, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_range_validate(r, 255))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %% INVALID RANGE:");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " nri add %d", r->first);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (r->first != r->last)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %d", r->last);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_show_nri, cfg_msc_show_nri_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show nri",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR NRI_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_write_nri(vty, msc, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_nri, show_nri_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show nri [" MSC_NR_RANGE "]",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR NRI_STR "Optional MSC number to limit to\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int msc_nr = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = osmo_msc_data_find(bsc_gsmnet, msc_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such MSC%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_write_nri(vty, msc, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(msc, &bsc_gsmnet->mscs, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_write_nri(vty, msc, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int bsc_vty_init_extra(void)</span><br><span> {</span><br><span> struct gsm_network *net = bsc_gsmnet;</span><br><span>@@ -831,6 +960,9 @@</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_bsc_addr_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_msc_addr_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_asp_proto_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_nri_add_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_nri_del_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_show_nri_cmd);</span><br><span> </span><br><span> /* Deprecated: ping time config, kept to support legacy config files. */</span><br><span> install_element(MSC_NODE, &cfg_net_msc_no_ping_time_cmd);</span><br><span>@@ -842,6 +974,7 @@</span><br><span> install_element_ve(&show_pos_cmd);</span><br><span> install_element_ve(&logging_fltr_imsi_cmd);</span><br><span> install_element_ve(&show_subscr_all_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_nri_cmd);</span><br><span> </span><br><span> install_element(ENABLE_NODE, &gen_position_trap_cmd);</span><br><span> </span><br><span>diff --git a/tests/nri_cfg.vty b/tests/nri_cfg.vty</span><br><span>new file mode 100644</span><br><span>index 0000000..680b8ef</span><br><span>--- /dev/null</span><br><span>+++ b/tests/nri_cfg.vty</span><br><span>@@ -0,0 +1,152 @@</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC> show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ % no NRI mappings</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC> enable</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# configure terminal</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# list</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add <0-32767> [<0-32767>]</span><br><span style="color: hsl(120, 100%, 40%);">+ nri del <0-32767> [<0-32767>]</span><br><span style="color: hsl(120, 100%, 40%);">+ show nri</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri ?</span><br><span style="color: hsl(120, 100%, 40%);">+ add Add NRI value or range to the NRI mapping for this MSC</span><br><span style="color: hsl(120, 100%, 40%);">+ del Remove NRI value or range from the NRI mapping for this MSC</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <0-32767> First value of the NRI value range, should not surpass the configured 'nri bitlen'.</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 23 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<0-32767>] Last value of the NRI value range, should not surpass the configured 'nri bitlen' and be larger than the first value; if omitted, apply only the first value.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 23</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 256 511</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 100 200</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 1024 1024</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 0: Warning: NRI range surpasses current NRI bitlen: 1024..1024</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 23</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 100 200</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 256 511</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# ### Do msc 2 first, to see that the order of mscs in the internal list is not determined by the msc->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# ### and whichever was configured first gets higher priority for overlaps.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 2: NRI range [200..300] overlaps between msc 2 and msc 0. For overlaps, msc 0 has higher priority than msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 1024 1025</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 2: Warning: NRI range surpasses current NRI bitlen: 1024..1025</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 2: NRI range [1024..1025] overlaps between msc 2 and msc 0. For overlaps, msc 0 has higher priority than msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 42</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 512 767</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 1: NRI range [200..300] overlaps between msc 1 and msc 0. For overlaps, msc 0 has higher priority than msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 1: NRI range [200..300] overlaps between msc 1 and msc 2. For overlaps, msc 2 has higher priority than msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 1024 1025</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 1: Warning: NRI range surpasses current NRI bitlen: 1024..1025</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 1: NRI range [1024..1025] overlaps between msc 1 and msc 0. For overlaps, msc 0 has higher priority than msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+% Warning: msc 1: NRI range [1024..1025] overlaps between msc 1 and msc 2. For overlaps, msc 2 has higher priority than msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 42</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 512 767</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024 1025</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# do show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 23</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 100 200</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 256 511</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024</span><br><span style="color: hsl(120, 100%, 40%);">+msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024 1025</span><br><span style="color: hsl(120, 100%, 40%);">+msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 42</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 512 767</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024 1025</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# network</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net)# nri bitlen 11</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+network</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ nri bitlen 11</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 23</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 100 200</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 256 511</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024 1025</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 42</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 512 767</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1024 1025</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri del 0 10000</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri del 0 10000</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri del 0 10000</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# exit</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# do show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ % no NRI mappings</span><br><span style="color: hsl(120, 100%, 40%);">+msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+ % no NRI mappings</span><br><span style="color: hsl(120, 100%, 40%);">+msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+ % no NRI mappings</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config)# msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 0 1000</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 0 1000</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri del 23</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri del 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri del 1000 2000</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 0 22</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 24 199</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 301 999</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 23</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 0 199</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 301 999</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 200 300</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 0 999</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# nri add 1000</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-msc)# show nri</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 0 1000</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18765">change 18765</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/+/18765"/><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: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 </div>
<div style="display:none"> Gerrit-Change-Number: 18765 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>