diff options
| author | Max <msuraev@sysmocom.de> | 2016-04-07 12:27:11 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-04-12 10:15:02 -0400 |
| commit | 714b170f895dfdc2f0d725ab110baf3dc14ef874 (patch) | |
| tree | 173a97c9280642127eb102e9c5c19fad50b7493c /openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | |
| parent | 7a301d357612347723e59c7f16a97227814d406e (diff) | |
NAT: allow allocating BSC in arbitrary order
Check for existing BSC before allocating new one.
Track number of remaining BSCs on deallocation.
Explicitly use BSC number in allocation function.
Diffstat (limited to 'openbsc/src/osmo-bsc_nat/bsc_nat_vty.c')
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 5af6d9743..4348d6fb8 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -799,17 +799,11 @@ DEFUN(cfg_bsc, cfg_bsc_cmd, "bsc BSC_NR", "BSC configuration\n" "Identifier of the BSC\n") { int bsc_nr = atoi(argv[0]); - struct bsc_config *bsc; + struct bsc_config *bsc = bsc_config_num(_nat, bsc_nr); - if (bsc_nr > _nat->num_bsc) { - vty_out(vty, "%% The next unused BSC number is %u%s", - _nat->num_bsc, VTY_NEWLINE); - return CMD_WARNING; - } else if (bsc_nr == _nat->num_bsc) { - /* allocate a new one */ - bsc = bsc_config_alloc(_nat, "unknown"); - } else - bsc = bsc_config_num(_nat, bsc_nr); + /* allocate a new one */ + if (!bsc) + bsc = bsc_config_alloc(_nat, "unknown", bsc_nr); if (!bsc) return CMD_WARNING; |