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
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 07e4c8b..157d5ae 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -545,11 +545,9 @@
/* 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 @@
/* 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) {