<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12129">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Stefan Sperling: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc_main: mncc: move mncc socket decision to after read_cfg<br><br>First step towards allowing to configure the MNCC socket path by config file.<br><br>Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee<br><br>Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805<br>---<br>M src/osmo-msc/msc_main.c<br>1 file changed, 4 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c</span><br><span>index 07e4c8b..157d5ae 100644</span><br><span>--- a/src/osmo-msc/msc_main.c</span><br><span>+++ b/src/osmo-msc/msc_main.c</span><br><span>@@ -545,11 +545,9 @@</span><br><span>   /* Parse options */</span><br><span>  handle_options(argc, argv);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate global gsm_network struct; choose socket/internal MNCC */</span><br><span style="color: hsl(0, 100%, 40%);">-   msc_network = msc_network_alloc(tall_msc_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">-                                   msc_cmdline_config.mncc_sock_path?</span><br><span style="color: hsl(0, 100%, 40%);">-                                              mncc_sock_from_cc</span><br><span style="color: hsl(0, 100%, 40%);">-                                               : int_mncc_recv);</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Allocate global gsm_network struct.</span><br><span style="color: hsl(120, 100%, 40%);">+         * At first set the internal MNCC as default, may be changed below according to cfg or cmdline option. */</span><br><span style="color: hsl(120, 100%, 40%);">+     msc_network = msc_network_alloc(tall_msc_ctx, int_mncc_recv);</span><br><span>        if (!msc_network)</span><br><span>            return -ENOMEM;</span><br><span> </span><br><span>@@ -577,6 +575,7 @@</span><br><span> </span><br><span>        /* Initialize MNCC socket if appropriate */</span><br><span>  if (msc_cmdline_config.mncc_sock_path) {</span><br><span style="color: hsl(120, 100%, 40%);">+              msc_network->mncc_recv = mncc_sock_from_cc;</span><br><span>               rc = mncc_sock_init(msc_network,</span><br><span>                                 msc_cmdline_config.mncc_sock_path);</span><br><span>              if (rc) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12129">change 12129</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12129"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 </div>
<div style="display:none"> Gerrit-Change-Number: 12129 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>