cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

[mgcp] Move mgcp init into the main method...

This commit is contained in:
Holger Hans Peter Freyther 2010-03-30 12:43:53 +02:00
parent a087c4e75d
commit 9d24578812
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openbsc/src/mgcp/mgcp_main.c
View File

@ -40,6 +40,8 @@
#include <openbsc/mgcp.h> #include <openbsc/mgcp.h>
#include <openbsc/telnet_interface.h> #include <openbsc/telnet_interface.h>
#include <vty/command.h>
#include "../../bscconfig.h" #include "../../bscconfig.h"
/* this is here for the vty... it will never be called */ /* this is here for the vty... it will never be called */
@ -74,7 +76,7 @@ static void print_help()
printf(" -c --config-file filename The config file to use.\n"); printf(" -c --config-file filename The config file to use.\n");
} }
static void print_version() static void print_mgcp_version()
{ {
printf("%s\n\n", openbsc_version); printf("%s\n\n", openbsc_version);
printf("%s", openbsc_copyright); printf("%s", openbsc_copyright);
@ -105,7 +107,7 @@ static void handle_options(int argc, char** argv)
config_file = talloc_strdup(tall_bsc_ctx, optarg); config_file = talloc_strdup(tall_bsc_ctx, optarg);
break; break;
case 'V': case 'V':
print_version(); print_mgcp_version();
exit(0); exit(0);
break; break;
default: default:
@ -235,3 +237,14 @@ int main(int argc, char** argv)
return 0; return 0;
} }
struct gsm_network;
int bsc_vty_init(struct gsm_network *dummy)
{
cmd_init(1);
vty_init();
mgcp_vty_init();
return 0;
}

10
openbsc/src/mgcp/mgcp_vty.c
View File

@ -327,13 +327,3 @@ int mgcp_parse_config(const char *config_file, struct mgcp_config *cfg)
return !!g_cfg->forward_ip; return !!g_cfg->forward_ip;
} }
struct gsm_network;
int bsc_vty_init(struct gsm_network *dummy)
{
cmd_init(1);
vty_init();
mgcp_vty_init();
return 0;
}