<p>Keith Whyte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10870">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix handling of odd pchans in bts_supports_cm()<br><br>Convert the if-cascade to a switch().<br><br>For any unexpected pchan kind, reject the chan mode immediately instead of<br>going on to invoke gsm_bts_has_feature on feature = _NUM_BTS_FEAT, and log the<br>error.<br><br>Tweaked-by: neels<br>Change-Id: Ieaded9258554b15fcc4b7f05d5a8847175b7962f<br>---<br>M src/common/bts.c<br>1 file changed, 11 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index bec611c..c251fdd 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -704,7 +704,8 @@</span><br><span> </span><br><span>         /* Before the requested pchan/cm combination can be checked, we need to</span><br><span>       * convert it to a feature identifier we can check */</span><br><span style="color: hsl(0, 100%, 40%);">-   if (pchan == GSM_PCHAN_TCH_F) {</span><br><span style="color: hsl(120, 100%, 40%);">+       switch (pchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+      case GSM_PCHAN_TCH_F:</span><br><span>                switch(cm) {</span><br><span>                 case GSM48_CMODE_SPEECH_V1:</span><br><span>                  feature = BTS_FEAT_SPEECH_F_V1;</span><br><span>@@ -719,7 +720,9 @@</span><br><span>                        /* Invalid speech codec type => Not supported! */</span><br><span>                         return 0;</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       } else if (pchan == GSM_PCHAN_TCH_H) {</span><br><span style="color: hsl(120, 100%, 40%);">+                break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      case GSM_PCHAN_TCH_H:</span><br><span>                switch(cm) {</span><br><span>                 case GSM48_CMODE_SPEECH_V1:</span><br><span>                  feature = BTS_FEAT_SPEECH_H_V1;</span><br><span>@@ -731,6 +734,12 @@</span><br><span>                       /* Invalid speech codec type => Not supported! */</span><br><span>                         return 0;</span><br><span>            }</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      default:</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DRSL, LOGL_ERROR, "BTS %u: unhandled pchan %s when checking mode %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                     bts->nr, gsm_pchan_name(pchan), gsm48_chan_mode_name(cm));</span><br><span style="color: hsl(120, 100%, 40%);">+            return 0;</span><br><span>    }</span><br><span> </span><br><span>        /* Check if the feature is supported by this BTS */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10870">change 10870</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/10870"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ieaded9258554b15fcc4b7f05d5a8847175b7962f </div>
<div style="display:none"> Gerrit-Change-Number: 10870 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: Keith Whyte <keith@rhizomatica.org> </div>