<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13094">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;">lchan_fsm: make sure multi rate configuration is valid<br><br>When gsm48_mr_cfg_from_gsm0808_sc_cfg() is used to generate the AMR<br>multirate configuration IE, make sure that lchan allocation fails in<br>cases where the multirate configuration IE can not be generated.<br><br>Change-Id: Icd3e5674b10b8ae223c0d13ae33fc9ae7e8a8a18<br>Depends: libosmocore I6fd7f4073b84093742c322752f2fd878d1071e15<br>Related: SYS#4470<br>---<br>M src/osmo-bsc/lchan_fsm.c<br>1 file changed, 6 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 8b4cf6d..0c54efb 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -539,7 +539,12 @@</span><br><span>       }</span><br><span> </span><br><span>        if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) {</span><br><span style="color: hsl(0, 100%, 40%);">-             gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0);</span><br><span style="color: hsl(120, 100%, 40%);">+              if (gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 lchan_fail("Can not determine multirate configuration, S15-S0 (%04x) are ambiguous!\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                                info->s15_s0);</span><br><span style="color: hsl(120, 100%, 40%);">+                  return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>          if (lchan_mr_config(lchan, &mr_conf) < 0) {</span><br><span>                   lchan_fail("Can not generate multirate configuration IE\n");</span><br><span>                       return;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13094">change 13094</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/13094"/><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: Icd3e5674b10b8ae223c0d13ae33fc9ae7e8a8a18 </div>
<div style="display:none"> Gerrit-Change-Number: 13094 </div>
<div style="display:none"> Gerrit-PatchSet: 10 </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>