diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-10 13:40:19 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-09-26 02:25:46 +0200 |
| commit | 43d86bfc94969ac9738ce398d13bd0a974e90df0 (patch) | |
| tree | 2f3dd58004da98b6b6893b4e0b5a52854568be78 | |
| parent | c13e68774215c4156925e8a2012fcb9169cf70b2 (diff) | |
mscsplit: bsc_vty_init(): decouple from global bsc_gsmnet
Add an explicit gsm_network pointer instead of using the bsc_gsmnet global.
This allows passing a gsm_network struct from the main() scope, which helps to
decouple libmsc from libbsc.
Change-Id: I9e2c0d9c18d4cebb5efb71565ad84df2bc2e0251
| -rw-r--r-- | openbsc/include/openbsc/vty.h | 2 | ||||
| -rw-r--r-- | openbsc/src/libbsc/bsc_vty.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-nitb/bsc_hack.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/vty.h b/openbsc/include/openbsc/vty.h index bc30e2357..78e87f04f 100644 --- a/openbsc/include/openbsc/vty.h +++ b/openbsc/include/openbsc/vty.h @@ -43,7 +43,7 @@ extern int bsc_vty_is_config_node(struct vty *vty, int node); extern void bsc_replace_string(void *ctx, char **dst, const char *newstr); struct log_info; -int bsc_vty_init(const struct log_info *cat); +int bsc_vty_init(const struct log_info *cat, struct gsm_network *network); int bsc_vty_init_extra(void); #endif diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 01eec2331..cdcc011fb 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -4028,7 +4028,7 @@ DEFUN(pdch_act, pdch_act_cmd, extern int bsc_vty_init_extra(void); -int bsc_vty_init(const struct log_info *cat) +int bsc_vty_init(const struct log_info *cat, struct gsm_network *network) { cfg_ts_pchan_cmd.string = vty_cmd_string_from_valstr(tall_bsc_ctx, diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 3594a5b5a..2ee5fb44e 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -204,7 +204,7 @@ int main(int argc, char **argv) /* This needs to precede handle_options() */ vty_info.copyright = openbsc_copyright; vty_init(&vty_info); - bsc_vty_init(&log_info); + bsc_vty_init(&log_info, bsc_gsmnet); bsc_msg_lst_vty_init(tall_bsc_ctx, &access_lists, BSC_NODE); ctrl_vty_init(tall_bsc_ctx); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 3708bc2f1..706e5074e 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -1329,7 +1329,7 @@ int bsc_nat_vty_init(struct bsc_nat *nat) /* called by the telnet interface... we have our own init above */ -int bsc_vty_init(const struct log_info *cat) +int bsc_vty_init(const struct log_info *cat, struct gsm_network *network) { logging_vty_add_cmds(cat); return 0; diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c index 67efe4ff2..8e1ddaecd 100644 --- a/openbsc/src/osmo-nitb/bsc_hack.c +++ b/openbsc/src/osmo-nitb/bsc_hack.c @@ -271,7 +271,7 @@ int main(int argc, char **argv) /* This needs to precede handle_options() */ vty_init(&vty_info); - bsc_vty_init(&log_info); + bsc_vty_init(&log_info, bsc_gsmnet); ctrl_vty_init(tall_bsc_ctx); #ifdef BUILD_SMPP |