<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10905">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;">LCLS: fix codec mismatch detection<br><br>gsm_subscriber_connection.user_plane.chan_mode and .full_rate were unused<br>since and forgotten to be removed in:<br><br>commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991<br>Date   Mon May 14 18:14:15 2018 +0200<br>"large refactoring: use FSMs for lchans; add inter-BSC HO"<br><br>Instead of above unused struct members, use lchan->{full_rate,tch_mode}.<br><br>When not explicitly allowed via VTY settings, the LCLS mechanisms will<br>avoid to locally switch connections with different codecs/rates. For<br>example GSM HR and GSM FR would not be locally switched.<br><br>Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb<br>Related: OS#1602<br>---<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>index 6aeccb3..00c3296 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>@@ -274,15 +274,15 @@</span><br><span>                return false;</span><br><span>        }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate</span><br><span style="color: hsl(120, 100%, 40%);">+     if (conn->lchan->type != conn->lcls.other->lchan->type</span><br><span>            && conn->sccp.msc->lcls_codec_mismatch_allow == false) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel rate)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+               LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (channel type)\n");</span><br><span>               return false;</span><br><span>        }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode</span><br><span style="color: hsl(120, 100%, 40%);">+     if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode</span><br><span>            && conn->sccp.msc->lcls_codec_mismatch_allow == false) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel mode)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+               LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismatch (TCH-Mode)\n");</span><br><span>           return false;</span><br><span>        }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10905">change 10905</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/10905"/><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: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb </div>
<div style="display:none"> Gerrit-Change-Number: 10905 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: 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: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>