aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-12-05 00:47:31 +0100
committerHarald Welte <laforge@gnumonks.org>2018-12-05 19:35:11 +0000
commitfb153cbf8cb5e81e851f8dca5a0e466ab6c76cde (patch)
tree9c65de1ffb74d42eae0699676d3ce3b26e919207
parenta2ed9b50c6b97fc09e298ca01d6e31c291f56121 (diff)
msc_main: mncc: move mncc socket decision to after read_cfg
First step towards allowing to configure the MNCC socket path by config file. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805
-rw-r--r--src/osmo-msc/msc_main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 07e4c8b8a..157d5ae56 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -545,11 +545,9 @@ int main(int argc, char **argv)
/* Parse options */
handle_options(argc, argv);
- /* Allocate global gsm_network struct; choose socket/internal MNCC */
- msc_network = msc_network_alloc(tall_msc_ctx,
- msc_cmdline_config.mncc_sock_path?
- mncc_sock_from_cc
- : int_mncc_recv);
+ /* Allocate global gsm_network struct.
+ * At first set the internal MNCC as default, may be changed below according to cfg or cmdline option. */
+ msc_network = msc_network_alloc(tall_msc_ctx, int_mncc_recv);
if (!msc_network)
return -ENOMEM;
@@ -577,6 +575,7 @@ int main(int argc, char **argv)
/* Initialize MNCC socket if appropriate */
if (msc_cmdline_config.mncc_sock_path) {
+ msc_network->mncc_recv = mncc_sock_from_cc;
rc = mncc_sock_init(msc_network,
msc_cmdline_config.mncc_sock_path);
if (rc) {