cellular-infrastructure
/
osmo-gbproxy
mirror of https://gerrit.osmocom.org/osmo-gbproxy
9
0
Fork 0
Code Issues Releases Wiki Activity

gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc 

The MSC-pooling chapter in OsmoBSC mentions that overlapping NRI ranges will
warn if configured though the VTY interface, but fail when started with
such a config.

The manual for OsmoGbProxy promises a similar behaviour, this patch implements
it.

Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d
This commit is contained in:
Daniel Willmann 2021-02-10 13:34:56 +01:00 committed by laforge
parent 6cfedc4932
commit fe5d3b7a46
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gb_proxy_vty.c
View File

@ -283,6 +283,7 @@ DEFUN_ATTR(cfg_sgsn_nri_add, cfg_sgsn_nri_add_cmd,
struct gbproxy_sgsn *sgsn = vty->index; struct gbproxy_sgsn *sgsn = vty->index;
struct gbproxy_sgsn *other_sgsn; struct gbproxy_sgsn *other_sgsn;
bool before; bool before;
bool overlaps = false;
int rc; int rc;
const char *message; const char *message;
struct osmo_nri_range add_range; struct osmo_nri_range add_range;
@ -307,13 +308,17 @@ DEFUN_ATTR(cfg_sgsn_nri_add, cfg_sgsn_nri_add_cmd,
if (osmo_nri_range_overlaps_ranges(&add_range, other_sgsn->pool.nri_ranges)) { if (osmo_nri_range_overlaps_ranges(&add_range, other_sgsn->pool.nri_ranges)) {
uint16_t nsei = sgsn->nse->nsei; uint16_t nsei = sgsn->nse->nsei;
uint16_t other_nsei = other_sgsn->nse->nsei; uint16_t other_nsei = other_sgsn->nse->nsei;
overlaps = true;
NRI_WARN(sgsn, "NRI range [%d..%d] overlaps between NSE %05d and NSE %05d." NRI_WARN(sgsn, "NRI range [%d..%d] overlaps between NSE %05d and NSE %05d."
" For overlaps, NSE %05d has higher priority than NSE %05d", " For overlaps, NSE %05d has higher priority than NSE %05d",
add_range.first, add_range.last, nsei, other_nsei, add_range.first, add_range.last, nsei, other_nsei,
before ? other_nsei : nsei, before ? nsei : other_nsei); before ? other_nsei : nsei, before ? nsei : other_nsei);
} }
} }
return CMD_SUCCESS; if (overlaps)
return CMD_WARNING;
else
return CMD_SUCCESS;
} }
DEFUN_ATTR(cfg_sgsn_nri_del, cfg_sgsn_nri_del_cmd, DEFUN_ATTR(cfg_sgsn_nri_del, cfg_sgsn_nri_del_cmd,