aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-04-27 01:30:24 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-05-02 14:04:11 +0200
commit5c4386c6928d65252eaf327044aae63b5dfbc01e (patch)
tree98db8ccd44585c5ace17a67cbe3f6c77e834a18f
parentfc68c83ddbda55fc2aaa908a3a6a6fca2af71761 (diff)
cscn: (re-)add SMPP initialization
Remove legacy code from the original NITB version -- the SMPP init functions have since been refactored in 1b0e5540dba697c9cf213e4f0aebc4baaf1618cb. Add SMPP initialization in the refactored version: call the alloc_init before reading config file, and call start with the global network struct after config is read.
-rw-r--r--openbsc/src/osmo-cscn/cscn_main.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/openbsc/src/osmo-cscn/cscn_main.c b/openbsc/src/osmo-cscn/cscn_main.c
index dd1fc36f..4fe646b7 100644
--- a/openbsc/src/osmo-cscn/cscn_main.c
+++ b/openbsc/src/osmo-cscn/cscn_main.c
@@ -364,6 +364,12 @@ int main(int argc, char **argv)
xsc_vty_init(cscn_network);
cscn_vty_init();
bsc_vty_init_extra();
+
+#ifdef BUILD_SMPP
+ if (smpp_openbsc_alloc_init(tall_cscn_ctx) < 0)
+ return -1;
+#endif
+
rc = vty_read_config_file(cscn_cmdline_config.config_file, NULL);
if (rc < 0) {
LOGP(DNM, LOGL_FATAL, "Failed to parse the config file: '%s'\n",
@@ -397,17 +403,13 @@ int main(int argc, char **argv)
libosmo_abis_init(tall_cscn_ctx);
bts_init();
-
-
-#ifdef BUILD_SMPP
- if (smpp_openbsc_init(tall_cscn_ctx, 0) < 0)
- return -1;
#endif
-
#ifdef BUILD_SMPP
- smpp_openbsc_set_net(cscn_network);
+ smpp_openbsc_start(cscn_network);
#endif
+
+#if 0
bsc_api_init(cscn_network, msc_bsc_api()); // pobably not.
#endif