<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26185">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_bsc_main: separate checks from bootstrap_bts<br><br>The function bootstrap_bts does a few checks before it does the actual<br>initialization. To make the code more modular, lets split the function<br>into two functions, check_bts and bootstrap_bts. Also be sure that we<br>print the BTS number when the check failes.<br><br>Change-Id: Id2b26f147d2f35e156e2da8ee58d2bbbb93de4ac<br>Related: SYS#5369<br>---<br>M src/osmo-bsc/osmo_bsc_main.c<br>1 file changed, 11 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/26185/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index a39c109..11db260 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -436,10 +436,9 @@</span><br><span>      return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int bootstrap_bts(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+static int check_bts(struct gsm_bts *bts)</span><br><span> {</span><br><span>      struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">-        unsigned int n = 0;</span><br><span> </span><br><span>      if (!bts->model)</span><br><span>          return -EFAULT;</span><br><span>@@ -484,6 +483,13 @@</span><br><span>               }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void bootstrap_bts(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     unsigned int n = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        /* Control Channel Description is set from vty/config */</span><br><span> </span><br><span>         /* Determine the value of CCCH_CONF. Is TS0/C0 combined? */</span><br><span>@@ -510,8 +516,6 @@</span><br><span> </span><br><span>        /* Initialize the BTS state */</span><br><span>       gsm_bts_sm_mo_reset(bts->site_mgr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  return 0;</span><br><span> }</span><br><span> </span><br><span> static int bsc_network_configure(const char *config_file)</span><br><span>@@ -535,11 +539,12 @@</span><br><span>      osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL);</span><br><span> </span><br><span>      llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-         rc = bootstrap_bts(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+              rc = check_bts(bts);</span><br><span>                 if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        LOGP(DNM, LOGL_FATAL, "Error bootstrapping BTS\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                 LOGP(DNM, LOGL_FATAL, "(bts=%u) cannot bootstrap BTS, invalid BTS configuration\n", bts->nr);</span><br><span>                   return rc;</span><br><span>           }</span><br><span style="color: hsl(120, 100%, 40%);">+             bootstrap_bts(bts);</span><br><span>          rc = e1_reconfig_bts(bts);</span><br><span>           if (rc < 0) {</span><br><span>                     LOGP(DNM, LOGL_FATAL, "Error enabling E1 input driver\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26185">change 26185</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/c/osmo-bsc/+/26185"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id2b26f147d2f35e156e2da8ee58d2bbbb93de4ac </div>
<div style="display:none"> Gerrit-Change-Number: 26185 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>