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

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
This commit is contained in:
Neels Hofmeyr 2018-12-05 00:47:31 +01:00 committed by Harald Welte
parent a2ed9b50c6
commit fb153cbf8c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osmo-msc/msc_main.c
View File

@ -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) {