<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11243">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">codec_pref: check codec configuration before start<br><br>In networks with a couple of different BTSs it may be likely that one<br>accidently sets up a codec configuration (codec-support)) that will be<br>mutually exclusive towards the codec configuration for the MSC<br>(codec-list). We need a check that validates the configuration before<br>start to catch such configuration flaws quickly.<br><br>- Add a check that checks each MSC codec-list against each BTS<br> codec-support setting.<br><br>Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38<br>Related: OS#3625<br>---<br>M include/osmocom/bsc/codec_pref.h<br>M src/osmo-bsc/codec_pref.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>3 files changed, 33 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/codec_pref.h b/include/osmocom/bsc/codec_pref.h</span><br><span>index 3085ad4..d62d29f 100644</span><br><span>--- a/include/osmocom/bsc/codec_pref.h</span><br><span>+++ b/include/osmocom/bsc/codec_pref.h</span><br><span>@@ -21,3 +21,5 @@</span><br><span> void gen_bss_supported_codec_list(struct gsm0808_speech_codec_list *scl,</span><br><span> const struct bsc_msc_data *msc,</span><br><span> const struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int check_codec_pref(struct llist_head *mscs);</span><br><span>diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c</span><br><span>index afecaa3..0f0ffa5 100644</span><br><span>--- a/src/osmo-bsc/codec_pref.c</span><br><span>+++ b/src/osmo-bsc/codec_pref.c</span><br><span>@@ -348,3 +348,29 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Visit the codec settings for the MSC and for each BTS in order to make sure</span><br><span style="color: hsl(120, 100%, 40%);">+ * that the configuration does not contain any combinations that lead into a</span><br><span style="color: hsl(120, 100%, 40%);">+ * mutually exclusive codec configuration (empty intersection).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] mscs list head of the msc list.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, -1 in case an invalid setting is found. */</span><br><span style="color: hsl(120, 100%, 40%);">+int check_codec_pref(struct llist_head *mscs)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_speech_codec_list scl;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(msc, mscs, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bts, &msc->network->bts_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gen_bss_supported_codec_list(&scl, msc, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (scl.len <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_FATAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "codec-support of BTS %u does not intersect with codec-list of MSC %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, msc->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -1;</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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</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 468b58e..67fccd3 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>@@ -59,6 +59,7 @@</span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/bsc/chan_alloc.h></span><br><span> #include <osmocom/bsc/e1_config.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/codec_pref.h></span><br><span> </span><br><span> #include <osmocom/mgcp_client/mgcp_client.h></span><br><span> </span><br><span>@@ -881,6 +882,10 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rc = check_codec_pref(&bsc_gsmnet->bsc_data->mscs);</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 configuration!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</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> LOGP(DNAT, LOGL_ERROR, "Failed to start up. Exiting.\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11243">change 11243</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/11243"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ice827896bab1a2330741e0fccc731a04f1a07d38 </div>
<div style="display:none"> Gerrit-Change-Number: 11243 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@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: dexter <pmaier@sysmocom.de> </div>