summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-05-11 14:12:00 +0200
committerHarald Welte <laforge@gnumonks.org>2016-12-02 12:09:15 +0000
commite235441f73a6baf1b43da9dde3cb6828ced9d1fe (patch)
tree32f46ba437f4b92bb817631fc7cab5e9a2280a57
parent6a366055dd9fcdea537ae2752458c02cf7433357 (diff)
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
-rw-r--r--openbsc/include/openbsc/bss.h3
-rw-r--r--openbsc/src/libbsc/bsc_init.c14
-rw-r--r--openbsc/src/osmo-bsc/osmo_bsc_main.c8
-rw-r--r--openbsc/src/osmo-nitb/bsc_hack.c21
4 files changed, 33 insertions, 13 deletions
diff --git a/openbsc/include/openbsc/bss.h b/openbsc/include/openbsc/bss.h
index d73776f03..9f16bf7d7 100644
--- a/openbsc/include/openbsc/bss.h
+++ b/openbsc/include/openbsc/bss.h
@@ -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 */
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index 917dd73c4..9e913d639 100644
--- a/openbsc/src/libbsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
@@ -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);
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c
index daab55b0e..b6b1ae16e 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_main.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c
@@ -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);
diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c
index 552ab4f61..ccd3b7436 100644
--- a/openbsc/src/osmo-nitb/bsc_hack.c
+++ b/openbsc/src/osmo-nitb/bsc_hack.c
@@ -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