vty: Allow setting LAC as hexadecimal value
The LAC value currently configured is now printed as hexadecimal value too. It can still be entered as a decimal value in order to keep backward compatibility, though the hexadecimal one is now preferred. Related: OS#5631 Depends: libosmocore.git Ia2b7fbbf5502c28374c21dbff548232680da27d4 Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52
This commit is contained in:
parent
30bdf9a4c7
commit
57c2e68da2
|
@ -8,3 +8,4 @@
|
||||||
# If any interfaces have been removed or changed since the last public release: c:r:0.
|
# If any interfaces have been removed or changed since the last public release: c:r:0.
|
||||||
#library what description / commit summary line
|
#library what description / commit summary line
|
||||||
libosmogsm >1.7.0 BTS_FEAT_OSMUX, RSL_IE_OSMO_OSMUX_CID
|
libosmogsm >1.7.0 BTS_FEAT_OSMUX, RSL_IE_OSMO_OSMUX_CID
|
||||||
|
libosmocore >1.7.0 vty hexadecimal range support (location_area_code)
|
||||||
|
|
|
@ -33,7 +33,7 @@ network
|
||||||
band GSM900
|
band GSM900
|
||||||
om2000 version-limit oml gen 12 rev 10
|
om2000 version-limit oml gen 12 rev 10
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
|
|
|
@ -33,7 +33,7 @@ network
|
||||||
band GSM900
|
band GSM900
|
||||||
om2000 version-limit oml gen 12 rev 10
|
om2000 version-limit oml gen 12 rev 10
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
|
|
|
@ -33,7 +33,7 @@ network
|
||||||
band GSM900
|
band GSM900
|
||||||
om2000 version-limit oml gen 12 rev 10
|
om2000 version-limit oml gen 12 rev 10
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
|
|
|
@ -39,7 +39,7 @@ network
|
||||||
type rbs2000
|
type rbs2000
|
||||||
band PCS1900
|
band PCS1900
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 33
|
ms max power 33
|
||||||
|
|
|
@ -27,7 +27,7 @@ network
|
||||||
type nokia_site
|
type nokia_site
|
||||||
band GSM1900
|
band GSM1900
|
||||||
cell_identity 1
|
cell_identity 1
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ network
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
cell_identity 6969
|
cell_identity 6969
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
cell reselection hysteresis 4
|
cell reselection hysteresis 4
|
||||||
|
|
|
@ -4,7 +4,7 @@ network
|
||||||
bts 0
|
bts 0
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band GSM-1800
|
band GSM-1800
|
||||||
location_area_code 23
|
location_area_code 0x0017
|
||||||
ipa unit-id 1800 0
|
ipa unit-id 1800 0
|
||||||
trx 0
|
trx 0
|
||||||
rf_locked 0
|
rf_locked 0
|
||||||
|
|
|
@ -23,7 +23,7 @@ network
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
cell_identity 6969
|
cell_identity 6969
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
cell reselection hysteresis 4
|
cell reselection hysteresis 4
|
||||||
|
|
|
@ -22,7 +22,7 @@ network
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
cell reselection hysteresis 4
|
cell reselection hysteresis 4
|
||||||
|
|
|
@ -39,7 +39,7 @@ network
|
||||||
type bs11
|
type bs11
|
||||||
band GSM900
|
band GSM900
|
||||||
cell_identity 1
|
cell_identity 1
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
oml e1 line 2 timeslot 1 sub-slot full
|
oml e1 line 2 timeslot 1 sub-slot full
|
||||||
|
|
|
@ -26,7 +26,7 @@ network
|
||||||
type nanobts <2>
|
type nanobts <2>
|
||||||
band DCS1800 <3>
|
band DCS1800 <3>
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
|
@ -104,7 +104,7 @@ network
|
||||||
type nanobts
|
type nanobts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
|
@ -197,7 +197,7 @@ network
|
||||||
band GSM900
|
band GSM900
|
||||||
om2000 version-limit oml gen 12 rev 10 <2>
|
om2000 version-limit oml gen 12 rev 10 <2>
|
||||||
cell_identity 0
|
cell_identity 0
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
training_sequence_code 7
|
training_sequence_code 7
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
|
|
|
@ -108,7 +108,7 @@ network
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
description The new BTS in Baikonur
|
description The new BTS in Baikonur
|
||||||
location_area_code 2342
|
location_area_code 0x0926
|
||||||
cell_identity 5
|
cell_identity 5
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ip.access unit_id 8888 0
|
ip.access unit_id 8888 0
|
||||||
|
|
|
@ -223,15 +223,15 @@ network
|
||||||
network
|
network
|
||||||
|
|
||||||
bts 0
|
bts 0
|
||||||
# this cell's LAC=23 CI=5
|
# this cell's LAC=0x0017 CI=5
|
||||||
location_area_code 23
|
location_area_code 0x0017
|
||||||
cell_identity 5
|
cell_identity 5
|
||||||
# reference bts 1
|
# reference bts 1
|
||||||
neighbor lac-ci 23 6
|
neighbor lac-ci 23 6
|
||||||
|
|
||||||
bts 1
|
bts 1
|
||||||
# this cell's LAC=23 CI=6
|
# this cell's LAC=0x0017 CI=6
|
||||||
location_area_code 23
|
location_area_code 0x0017
|
||||||
cell_identity 6
|
cell_identity 6
|
||||||
# reference bts 0
|
# reference bts 0
|
||||||
neighbor lac-ci 23 5
|
neighbor lac-ci 23 5
|
||||||
|
@ -252,8 +252,8 @@ desirable to use the `neighbor bts <0-255>` format, or omit the redundant
|
||||||
network
|
network
|
||||||
|
|
||||||
bts 0
|
bts 0
|
||||||
# this cell's LAC=23 CI=5
|
# this cell's LAC=0x0017 CI=5
|
||||||
location_area_code 23
|
location_area_code 0x0017
|
||||||
cell_identity 5
|
cell_identity 5
|
||||||
# this cell's ARFCN=1 BSIC=1
|
# this cell's ARFCN=1 BSIC=1
|
||||||
trx 0
|
trx 0
|
||||||
|
@ -263,8 +263,8 @@ network
|
||||||
neighbor lac-ci 23 6 arfcn 2 bsic 2
|
neighbor lac-ci 23 6 arfcn 2 bsic 2
|
||||||
|
|
||||||
bts 1
|
bts 1
|
||||||
# LAC=23 CI=6
|
# LAC=0x0017 CI=6
|
||||||
location_area_code 23
|
location_area_code 0x0017
|
||||||
cell_identity 6
|
cell_identity 6
|
||||||
# this cell's ARFCN=2 BSIC=2
|
# this cell's ARFCN=2 BSIC=2
|
||||||
trx 0
|
trx 0
|
||||||
|
@ -286,8 +286,8 @@ Indication and 3.2.1.9 HANDOVER REQUIRED).
|
||||||
# BSC Alpha's osmo-bsc.cfg
|
# BSC Alpha's osmo-bsc.cfg
|
||||||
network
|
network
|
||||||
bts 0
|
bts 0
|
||||||
# this cell's LAC=23 CI=6
|
# this cell's LAC=0x0017 CI=6
|
||||||
location_area_code 23
|
location_area_code 0x0017
|
||||||
cell_identity 6
|
cell_identity 6
|
||||||
# this cell's ARFCN=2 BSIC=2
|
# this cell's ARFCN=2 BSIC=2
|
||||||
trx 0
|
trx 0
|
||||||
|
@ -299,8 +299,8 @@ network
|
||||||
# BSC Beta's osmo-bsc.cfg
|
# BSC Beta's osmo-bsc.cfg
|
||||||
network
|
network
|
||||||
bts 0
|
bts 0
|
||||||
# this cell's LAC=42 CI=3
|
# this cell's LAC=0x002A CI=3
|
||||||
location_area_code 42
|
location_area_code 0x002A
|
||||||
cell_identity 3
|
cell_identity 3
|
||||||
# this cell's ARFCN=1 BSIC=3
|
# this cell's ARFCN=1 BSIC=3
|
||||||
trx 0
|
trx 0
|
||||||
|
|
|
@ -276,17 +276,15 @@ DEFUN_USRATTR(cfg_bts_ci,
|
||||||
DEFUN_USRATTR(cfg_bts_lac,
|
DEFUN_USRATTR(cfg_bts_lac,
|
||||||
cfg_bts_lac_cmd,
|
cfg_bts_lac_cmd,
|
||||||
X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),
|
X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),
|
||||||
"location_area_code <0-65535>",
|
"location_area_code (<0-65535>|<0x0000-0xffff>)",
|
||||||
"Set the Location Area Code (LAC) of this BTS\n" "LAC\n")
|
"Set the Location Area Code (LAC) of this BTS\n"
|
||||||
|
"LAC in decimal format\n"
|
||||||
|
"LAC in hexadecimal format\n")
|
||||||
{
|
{
|
||||||
struct gsm_bts *bts = vty->index;
|
struct gsm_bts *bts = vty->index;
|
||||||
int lac = atoi(argv[0]);
|
int lac;
|
||||||
|
if (osmo_str_to_int(&lac, argv[0], 0, 0, 0xffff) < 0)
|
||||||
if (lac < 0 || lac > 0xffff) {
|
|
||||||
vty_out(vty, "%% LAC %d is not in the valid range (0-65535)%s",
|
|
||||||
lac, VTY_NEWLINE);
|
|
||||||
return CMD_WARNING;
|
return CMD_WARNING;
|
||||||
}
|
|
||||||
|
|
||||||
if (lac == GSM_LAC_RESERVED_DETACHED || lac == GSM_LAC_RESERVED_ALL_BTS) {
|
if (lac == GSM_LAC_RESERVED_DETACHED || lac == GSM_LAC_RESERVED_ALL_BTS) {
|
||||||
vty_out(vty, "%% LAC %d is reserved by GSM 04.08%s",
|
vty_out(vty, "%% LAC %d is reserved by GSM 04.08%s",
|
||||||
|
@ -4307,7 +4305,7 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts)
|
||||||
vty_out(vty, " description %s%s", bts->description, VTY_NEWLINE);
|
vty_out(vty, " description %s%s", bts->description, VTY_NEWLINE);
|
||||||
vty_out(vty, " band %s%s", gsm_band_name(bts->band), VTY_NEWLINE);
|
vty_out(vty, " band %s%s", gsm_band_name(bts->band), VTY_NEWLINE);
|
||||||
vty_out(vty, " cell_identity %u%s", bts->cell_identity, VTY_NEWLINE);
|
vty_out(vty, " cell_identity %u%s", bts->cell_identity, VTY_NEWLINE);
|
||||||
vty_out(vty, " location_area_code %u%s", bts->location_area_code,
|
vty_out(vty, " location_area_code 0x%04x%s", bts->location_area_code,
|
||||||
VTY_NEWLINE);
|
VTY_NEWLINE);
|
||||||
if (bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED)
|
if (bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED)
|
||||||
vty_out(vty, " dtx uplink%s%s",
|
vty_out(vty, " dtx uplink%s%s",
|
||||||
|
|
|
@ -3,7 +3,7 @@ network
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
cell_identity 123
|
cell_identity 123
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
base_station_id_code 55
|
base_station_id_code 55
|
||||||
ms max power 15
|
ms max power 15
|
||||||
cell reselection hysteresis 4
|
cell reselection hysteresis 4
|
||||||
|
|
|
@ -20,7 +20,7 @@ network
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
cell_identity 6969
|
cell_identity 6969
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
base_station_id_code 63
|
base_station_id_code 63
|
||||||
ms max power 15
|
ms max power 15
|
||||||
cell reselection hysteresis 4
|
cell reselection hysteresis 4
|
||||||
|
@ -77,7 +77,7 @@ network
|
||||||
type osmo-bts
|
type osmo-bts
|
||||||
band DCS1800
|
band DCS1800
|
||||||
cell_identity 123
|
cell_identity 123
|
||||||
location_area_code 1
|
location_area_code 0x0001
|
||||||
base_station_id_code 55
|
base_station_id_code 55
|
||||||
ms max power 15
|
ms max power 15
|
||||||
cell reselection hysteresis 4
|
cell reselection hysteresis 4
|
||||||
|
|
|
@ -257,7 +257,7 @@ static struct gsm_bts *_create_bts(int num_trx, const char * const *ts_args, int
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bts->location_area_code = 23;
|
bts->location_area_code = 0x0017;
|
||||||
bts->cell_identity = ci++;
|
bts->cell_identity = ci++;
|
||||||
bts->c0->arfcn = arfcn++;
|
bts->c0->arfcn = arfcn++;
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@ int main(int argc, char **argv)
|
||||||
bts->c0->arfcn = 866;
|
bts->c0->arfcn = 866;
|
||||||
bts->cell_identity = 1337;
|
bts->cell_identity = 1337;
|
||||||
bts->network->plmn = (struct osmo_plmn_id){ .mcc=1, .mnc=1 };
|
bts->network->plmn = (struct osmo_plmn_id){ .mcc=1, .mnc=1 };
|
||||||
bts->location_area_code = 1;
|
bts->location_area_code = 0x0001;
|
||||||
bts->gprs.rac = 0;
|
bts->gprs.rac = 0;
|
||||||
uint8_t attr_bts_expected[] =
|
uint8_t attr_bts_expected[] =
|
||||||
{ 0x19, 0x73, 0x6d, 0x67, 0x61, 0x5b, 0x55, 0x18, 0x06, 0x0e, 0x00,
|
{ 0x19, 0x73, 0x6d, 0x67, 0x61, 0x5b, 0x55, 0x18, 0x06, 0x0e, 0x00,
|
||||||
|
|
|
@ -21,7 +21,7 @@ OsmoBSC(config-net)# neighbor-resolution bind 1.2.3.4 ?
|
||||||
OsmoBSC(config-net)# bts 0
|
OsmoBSC(config-net)# bts 0
|
||||||
OsmoBSC(config-net-bts)# type osmo-bts
|
OsmoBSC(config-net-bts)# type osmo-bts
|
||||||
OsmoBSC(config-net-bts)# base_station_id_code 10
|
OsmoBSC(config-net-bts)# base_station_id_code 10
|
||||||
OsmoBSC(config-net-bts)# location_area_code 20
|
OsmoBSC(config-net-bts)# location_area_code 0x0014
|
||||||
OsmoBSC(config-net-bts)# cell_identity 30
|
OsmoBSC(config-net-bts)# cell_identity 30
|
||||||
OsmoBSC(config-net-bts)# trx 0
|
OsmoBSC(config-net-bts)# trx 0
|
||||||
OsmoBSC(config-net-bts-trx)# arfcn 40
|
OsmoBSC(config-net-bts-trx)# arfcn 40
|
||||||
|
@ -31,7 +31,7 @@ OsmoBSC(config-net-bts)# exit
|
||||||
OsmoBSC(config-net)# bts 1
|
OsmoBSC(config-net)# bts 1
|
||||||
OsmoBSC(config-net-bts)# type osmo-bts
|
OsmoBSC(config-net-bts)# type osmo-bts
|
||||||
OsmoBSC(config-net-bts)# base_station_id_code 11
|
OsmoBSC(config-net-bts)# base_station_id_code 11
|
||||||
OsmoBSC(config-net-bts)# location_area_code 21
|
OsmoBSC(config-net-bts)# location_area_code 0x0015
|
||||||
OsmoBSC(config-net-bts)# cell_identity 31
|
OsmoBSC(config-net-bts)# cell_identity 31
|
||||||
OsmoBSC(config-net-bts)# trx 0
|
OsmoBSC(config-net-bts)# trx 0
|
||||||
OsmoBSC(config-net-bts-trx)# arfcn 41
|
OsmoBSC(config-net-bts-trx)# arfcn 41
|
||||||
|
@ -41,7 +41,7 @@ OsmoBSC(config-net-bts)# exit
|
||||||
OsmoBSC(config-net)# bts 2
|
OsmoBSC(config-net)# bts 2
|
||||||
OsmoBSC(config-net-bts)# type osmo-bts
|
OsmoBSC(config-net-bts)# type osmo-bts
|
||||||
OsmoBSC(config-net-bts)# base_station_id_code 12
|
OsmoBSC(config-net-bts)# base_station_id_code 12
|
||||||
OsmoBSC(config-net-bts)# location_area_code 22
|
OsmoBSC(config-net-bts)# location_area_code 0x0016
|
||||||
OsmoBSC(config-net-bts)# cell_identity 65535
|
OsmoBSC(config-net-bts)# cell_identity 65535
|
||||||
OsmoBSC(config-net-bts)# trx 0
|
OsmoBSC(config-net-bts)# trx 0
|
||||||
OsmoBSC(config-net-bts-trx)# arfcn 42
|
OsmoBSC(config-net-bts-trx)# arfcn 42
|
||||||
|
@ -53,7 +53,7 @@ OsmoBSC(config-net)# show running-config
|
||||||
bts 0
|
bts 0
|
||||||
...
|
...
|
||||||
cell_identity 30
|
cell_identity 30
|
||||||
location_area_code 20
|
location_area_code 0x0014
|
||||||
base_station_id_code 10
|
base_station_id_code 10
|
||||||
...
|
...
|
||||||
trx 0
|
trx 0
|
||||||
|
@ -63,7 +63,7 @@ OsmoBSC(config-net)# show running-config
|
||||||
bts 1
|
bts 1
|
||||||
...
|
...
|
||||||
cell_identity 31
|
cell_identity 31
|
||||||
location_area_code 21
|
location_area_code 0x0015
|
||||||
base_station_id_code 11
|
base_station_id_code 11
|
||||||
...
|
...
|
||||||
trx 0
|
trx 0
|
||||||
|
@ -73,7 +73,7 @@ OsmoBSC(config-net)# show running-config
|
||||||
bts 2
|
bts 2
|
||||||
...
|
...
|
||||||
cell_identity 65535
|
cell_identity 65535
|
||||||
location_area_code 22
|
location_area_code 0x0016
|
||||||
base_station_id_code 12
|
base_station_id_code 12
|
||||||
...
|
...
|
||||||
trx 0
|
trx 0
|
||||||
|
|
Loading…
Reference in New Issue