diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-09 21:18:08 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-09-26 02:25:46 +0200 |
| commit | 663debcb90022f1ca53b0d947162774c8a1ec9c5 (patch) | |
| tree | 83d47f42f9d10a730ac067b31d9c8dce3acc459c | |
| parent | 43d86bfc94969ac9738ce398d13bd0a974e90df0 (diff) | |
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
| -rw-r--r-- | openbsc/include/openbsc/vty.h | 2 | ||||
| -rw-r--r-- | openbsc/src/libbsc/abis_nm_vty.c | 4 | ||||
| -rw-r--r-- | openbsc/src/libbsc/abis_om2000_vty.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/openbsc/include/openbsc/vty.h b/openbsc/include/openbsc/vty.h index 78e87f04f..315db0d11 100644 --- a/openbsc/include/openbsc/vty.h +++ b/openbsc/include/openbsc/vty.h @@ -46,4 +46,6 @@ struct log_info; int bsc_vty_init(const struct log_info *cat, struct gsm_network *network); int bsc_vty_init_extra(void); +struct gsm_network *gsmnet_from_vty(struct vty *vty); + #endif diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c index a14e5c2f4..6ec0a4a21 100644 --- a/openbsc/src/libbsc/abis_nm_vty.c +++ b/openbsc/src/libbsc/abis_nm_vty.c @@ -94,7 +94,7 @@ DEFUN(oml_class_inst, oml_class_inst_cmd, struct oml_node_state *oms; 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) { vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; @@ -128,7 +128,7 @@ DEFUN(oml_classnum_inst, oml_classnum_inst_cmd, struct oml_node_state *oms; 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) { vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c index 8325e29a7..72422a1d5 100644 --- a/openbsc/src/libbsc/abis_om2000_vty.c +++ b/openbsc/src/libbsc/abis_om2000_vty.c @@ -82,7 +82,7 @@ DEFUN(om2k_class_inst, om2k_class_inst_cmd, struct oml_node_state *oms; 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) { vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; @@ -122,7 +122,7 @@ DEFUN(om2k_classnum_inst, om2k_classnum_inst_cmd, struct oml_node_state *oms; 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) { vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; |