[PATCH] bsc: change bsc_vty_init to take logging categories as parameter

[Pablo Neira Ayuso]

This change is required to finish the integration of the VTY and
the per-application logging categories that provides:

"vty: integration with logging framework"

in libosmocore.

It has been tested with osmo-nitb. The other just compiled tested.
---
 openbsc/include/openbsc/vty.h         |    3 ++-
 openbsc/src/libbsc/bsc_vty.c          |    4 ++--
 openbsc/src/osmo-bsc/osmo_bsc_main.c  |    2 +-
 openbsc/src/osmo-bsc_mgcp/mgcp_main.c |    2 +-
 openbsc/src/osmo-nitb/bsc_hack.c      |    2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openbsc/include/openbsc/vty.h b/openbsc/include/openbsc/vty.h
index 516c8c2..ded2e15 100644
--- a/openbsc/include/openbsc/vty.h
+++ b/openbsc/include/openbsc/vty.h
@@ -40,7 +40,8 @@ enum bsc_vty_node {
 extern int bsc_vty_is_config_node(struct vty *vty, int node);
 extern void bsc_replace_string(void *ctx, char **dst, const char *newstr);
 
-int bsc_vty_init(void);
+struct log_info;
+int bsc_vty_init(const struct log_info *cat);
 int bsc_vty_init_extra(void);
 
 #endif
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 1afaed3..d74543d 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -2650,7 +2650,7 @@ DEFUN(pdch_act, pdch_act_cmd,
 extern int bsc_vty_init_extra(void);
 extern const char *openbsc_copyright;
 
-int bsc_vty_init(void)
+int bsc_vty_init(const struct log_info *cat)
 {
        install_element_ve(&show_net_cmd);
        install_element_ve(&show_bts_cmd);
@@ -2666,7 +2666,7 @@ int bsc_vty_init(void)
 
        install_element_ve(&show_paging_cmd);
 
-       logging_vty_add_cmds();
+       logging_vty_add_cmds(cat);
        install_element(CFG_LOG_NODE, &logging_fltr_imsi_cmd);
 
        install_element(CONFIG_NODE, &cfg_net_cmd);
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c 
b/openbsc/src/osmo-bsc/osmo_bsc_main.c
index b5f64ab..3ec7020 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_main.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c
@@ -196,7 +196,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();
+       bsc_vty_init(&log_info);
 
        /* parse options */
        handle_options(argc, argv);
diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c 
b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
index c8d9a62..419c3ed 100644
--- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
+++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
 
        vty_info.copyright = openbsc_copyright;
        vty_init(&vty_info);
-       logging_vty_add_cmds();
+       logging_vty_add_cmds(&log_info);
        mgcp_vty_init();
 
        handle_options(argc, argv);
diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c
index 357ec7a..9ea1879 100644
--- a/openbsc/src/osmo-nitb/bsc_hack.c
+++ b/openbsc/src/osmo-nitb/bsc_hack.c
@@ -251,7 +251,7 @@ int main(int argc, char **argv)
 
        /* This needs to precede handle_options() */
        vty_init(&vty_info);
-       bsc_vty_init();
+       bsc_vty_init(&log_info);
 
        /* parse options */
        handle_options(argc, argv);