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
This commit is contained in:
parent
c13e687742
commit
43d86bfc94
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue