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

split bsc_bootstrap_network() in alloc and config 

For patch clarity, keep some code dup to be removed in a subsequent patch. In
the same sense don't change the fact that mncc_sock_init()'s return value is
ignored.

The global gsm_network instance 'bsc_gsmnet' is basically only used by the VTY,
and a future patch will "hide" that global in a vty .c file. In a nutshell, I
want to

- first allocate a gsm_network,
- then initialize the VTY passing the gsm_network pointer,
- and then read the config file using the initialized VTY.

So far, bsc_bootstrap_network() allocates the gsm_network and reads the config
file right away, which only works by sharing the extern bsc_gsmnet pointer,
which I would like to uncouple.

Change-Id: I480a09a31a79766ad07b627dd5238b7e37f3be7a
This commit is contained in:
Neels Hofmeyr 2016-05-11 14:12:00 +02:00 committed by Harald Welte
parent 6a366055dd
commit e235441f73
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openbsc/include/openbsc/bss.h
View File

@ -6,7 +6,8 @@
struct msgb;
/* start and stop network */
extern int bsc_bootstrap_network(mncc_recv_cb_t mncc_recv, const char *cfg_file);
extern int bsc_network_alloc(mncc_recv_cb_t mncc_recv);
extern int bsc_network_configure(const char *cfg_file);
extern int bsc_shutdown_net(struct gsm_network *net);
/* register all supported BTS */

14
openbsc/src/libbsc/bsc_init.c
View File

@ -476,12 +476,8 @@ static int bootstrap_bts(struct gsm_bts *bts)
return 0;
}
int bsc_bootstrap_network(mncc_recv_cb_t mncc_recv, const char *config_file)
int bsc_network_alloc(mncc_recv_cb_t mncc_recv)
{
struct gsm_bts *bts;
int rc;
/* initialize our data structures */
bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, mncc_recv);
if (!bsc_gsmnet)
return -ENOMEM;
@ -489,6 +485,14 @@ int bsc_bootstrap_network(mncc_recv_cb_t mncc_recv, const char *config_file)
bsc_gsmnet->name_long = talloc_strdup(bsc_gsmnet, "OpenBSC");
bsc_gsmnet->name_short = talloc_strdup(bsc_gsmnet, "OpenBSC");
return 0;
}
int bsc_network_configure(const char *config_file)
{
struct gsm_bts *bts;
int rc;
rc = vty_read_config_file(config_file, NULL);
if (rc < 0) {
LOGP(DNM, LOGL_FATAL, "Failed to parse the config file: '%s'\n", config_file);

8
openbsc/src/osmo-bsc/osmo_bsc_main.c
View File

@ -220,8 +220,12 @@ int main(int argc, char **argv)
/* initialize SCCP */
sccp_set_log_area(DSCCP);
rc = bsc_bootstrap_network(NULL, config_file);
rc = bsc_network_alloc(NULL);
if (rc) {
fprintf(stderr, "Allocation failed. exiting.\n");
exit(1);
}
rc = bsc_network_configure(config_file);
if (rc < 0) {
fprintf(stderr, "Bootstrapping the network failed. exiting.\n");
exit(1);

21
openbsc/src/osmo-nitb/bsc_hack.c
View File

@ -285,15 +285,26 @@ int main(int argc, char **argv)
/* internal MNCC handler or MNCC socket? */
if (mncc_sock_path) {
rc = bsc_bootstrap_network(mncc_sock_from_cc, config_file);
if (rc >= 0)
mncc_sock_init(bsc_gsmnet, mncc_sock_path);
rc = bsc_network_alloc(mncc_sock_from_cc);
if (rc) {
fprintf(stderr, "Allocation failed. Exiting.\n");
exit(1);
}
mncc_sock_init(bsc_gsmnet, mncc_sock_path);
} else {
DEBUGP(DMNCC, "Using internal MNCC handler.\n");
rc = bsc_bootstrap_network(int_mncc_recv, config_file);
rc = bsc_network_alloc(int_mncc_recv);
if (rc) {
fprintf(stderr, "Allocation failed. Exiting.\n");
exit(1);
}
}
if (rc < 0)
rc = bsc_network_configure(config_file);
if (rc < 0) {
fprintf(stderr, "Reading config failed. Exiting.\n");
exit(1);
}
#ifdef BUILD_SMPP
smpp_openbsc_start(bsc_gsmnet);
#endif