mscsplit: abis vty: decouple from global bsc_gsmnet variable
Publish gsmnet_from_vty() in openbsc/vty.h and use in the abis VTY functions. Change-Id: Ib65a18db06b8bc4fc7d56bf56dd64a52cc1cd253
This commit is contained in:
parent
43d86bfc94
commit
663debcb90
|
@ -46,4 +46,6 @@ struct log_info;
|
||||||
int bsc_vty_init(const struct log_info *cat, struct gsm_network *network);
|
int bsc_vty_init(const struct log_info *cat, struct gsm_network *network);
|
||||||
int bsc_vty_init_extra(void);
|
int bsc_vty_init_extra(void);
|
||||||
|
|
||||||
|
struct gsm_network *gsmnet_from_vty(struct vty *vty);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -94,7 +94,7 @@ DEFUN(oml_class_inst, oml_class_inst_cmd,
|
||||||
struct oml_node_state *oms;
|
struct oml_node_state *oms;
|
||||||
int bts_nr = atoi(argv[0]);
|
int bts_nr = atoi(argv[0]);
|
||||||
|
|
||||||
bts = gsm_bts_num(bsc_gsmnet, bts_nr);
|
bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);
|
||||||
if (!bts) {
|
if (!bts) {
|
||||||
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
||||||
return CMD_WARNING;
|
return CMD_WARNING;
|
||||||
|
@ -128,7 +128,7 @@ DEFUN(oml_classnum_inst, oml_classnum_inst_cmd,
|
||||||
struct oml_node_state *oms;
|
struct oml_node_state *oms;
|
||||||
int bts_nr = atoi(argv[0]);
|
int bts_nr = atoi(argv[0]);
|
||||||
|
|
||||||
bts = gsm_bts_num(bsc_gsmnet, bts_nr);
|
bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);
|
||||||
if (!bts) {
|
if (!bts) {
|
||||||
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
||||||
return CMD_WARNING;
|
return CMD_WARNING;
|
||||||
|
|
|
@ -82,7 +82,7 @@ DEFUN(om2k_class_inst, om2k_class_inst_cmd,
|
||||||
struct oml_node_state *oms;
|
struct oml_node_state *oms;
|
||||||
int bts_nr = atoi(argv[0]);
|
int bts_nr = atoi(argv[0]);
|
||||||
|
|
||||||
bts = gsm_bts_num(bsc_gsmnet, bts_nr);
|
bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);
|
||||||
if (!bts) {
|
if (!bts) {
|
||||||
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
||||||
return CMD_WARNING;
|
return CMD_WARNING;
|
||||||
|
@ -122,7 +122,7 @@ DEFUN(om2k_classnum_inst, om2k_classnum_inst_cmd,
|
||||||
struct oml_node_state *oms;
|
struct oml_node_state *oms;
|
||||||
int bts_nr = atoi(argv[0]);
|
int bts_nr = atoi(argv[0]);
|
||||||
|
|
||||||
bts = gsm_bts_num(bsc_gsmnet, bts_nr);
|
bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);
|
||||||
if (!bts) {
|
if (!bts) {
|
||||||
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);
|
||||||
return CMD_WARNING;
|
return CMD_WARNING;
|
||||||
|
|
Loading…
Reference in New Issue