diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-05 00:47:31 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-05 03:17:03 +0100 |
| commit | 37f188752dc09300f0741a2544cc88fa142465fe (patch) | |
| tree | a54fffec386a1edc3f7f00bb7020c193697c498a | |
| parent | 619ecd95e02772c1e083c4b241f0e5dbe90d9b00 (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.c | 9 |
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..443405646 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 use the internal MNCC by default, may be changed later 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) { |