<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17491">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
neels: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">main: exit on mutually exclusive codecs settings<br><br>Refuse to start with mutually exclusive codec settings, unless<br>allow-unusable-timeslots is set in the network section of the config.<br>The checks were already implemented and fill the error log if the config<br>is invalid.<br><br>Related: OS#3739<br>Change-Id: I3ccfc3b0a8641400cb97a23b24d7ed92d2ad25cd<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>3 files changed, 28 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 040e36d..5afc2cf 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1608,6 +1608,9 @@</span><br><span> </span><br><span> /* Remote BSS Cell Identifier Lists */</span><br><span> struct neighbor_ident_list *neighbor_bss_cells;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Don't refuse to start with mutually exclusive codec settings */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool allow_unusable_timeslots;</span><br><span> };</span><br><span> </span><br><span> struct gsm_audio_support {</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index dd157c0..39adb21 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1092,6 +1092,9 @@</span><br><span> meas_scenario, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmnet->allow_unusable_timeslots)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " allow-unusable-timeslots%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -5209,6 +5212,17 @@</span><br><span> return osmo_tdef_vty_set_cmd(vty, net->T_defs, argv);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_net_allow_unusable_timeslots, cfg_net_allow_unusable_timeslots_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "allow-unusable-timeslots",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Don't refuse to start with mutually exclusive codec settings\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = gsmnet_from_vty(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ net->allow_unusable_timeslots = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Configuration contains 'allow-unusable-timeslots'. OsmoBSC will start up even if the"</span><br><span style="color: hsl(120, 100%, 40%);">+ " configuration has unusable codec settings!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> extern int bsc_vty_init_extra(void);</span><br><span> </span><br><span> int bsc_vty_init(struct gsm_network *network)</span><br><span>@@ -5254,6 +5268,7 @@</span><br><span> install_element(GSMNET_NODE, &cfg_net_meas_feed_dest_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_meas_feed_scenario_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_timer_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSMNET_NODE, &cfg_net_allow_unusable_timeslots_cmd);</span><br><span> </span><br><span> install_element_ve(&bsc_show_net_cmd);</span><br><span> install_element_ve(&show_bts_cmd);</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 66310b3..bf68c9b 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>@@ -902,8 +902,16 @@</span><br><span> }</span><br><span> </span><br><span> rc = check_codec_pref(&bsc_gsmnet->bsc_data->mscs);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "Configuration contains mutually exclusive codec settings -- check configuration!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Configuration contains mutually exclusive codec settings -- check"</span><br><span style="color: hsl(120, 100%, 40%);">+ " configuration!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bsc_gsmnet->allow_unusable_timeslots) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "You should really fix that! However, you can prevent OsmoBSC from"</span><br><span style="color: hsl(120, 100%, 40%);">+ " stopping here by setting 'allow-unusable-timeslots' in the 'network'"</span><br><span style="color: hsl(120, 100%, 40%);">+ " section of the config.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) {</span><br><span> if (osmo_bsc_msc_init(msc) != 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17491">change 17491</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/+/17491"/><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: I3ccfc3b0a8641400cb97a23b24d7ed92d2ad25cd </div>
<div style="display:none"> Gerrit-Change-Number: 17491 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>