<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9940">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;">lcls: do not LCLS call legs with different codecs<br><br>It is theoretically possible to LCLS two legs that use different<br>codecs. However, this requires transcoding capabilities on the<br>local MGW. If the local MGW lacks transcoding features such a<br>local circuit should be avoided. Enabeling LCLS under such<br>coditions should be optional (VTY)<br><br>- Add check to avoid LCLS on different codec/rate<br>- Add VTY-Option to optionally override the check<br> (MGW is able to transcode)<br><br>Change-Id: I157549129a40c64364dc126f67195759e5f1d60f<br>Related: OS#1602<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>3 files changed, 36 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index 79d2eca..7ec3442 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -87,6 +87,7 @@</span><br><span> struct gsm_audio_support **audio_support;</span><br><span> int audio_length;</span><br><span> enum bsc_lcls_mode lcls_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool lcls_codec_mismatch_allow;</span><br><span> </span><br><span> /* ussd welcome text */</span><br><span> char *ussd_welcome_txt;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>index 4639c4e..6aeccb3 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,6 +274,18 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate</span><br><span style="color: hsl(120, 100%, 40%);">+ && conn->sccp.msc->lcls_codec_mismatch_allow == false) {</span><br><span style="color: hsl(120, 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%);">+ return false;</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%);">+ if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode</span><br><span style="color: hsl(120, 100%, 40%);">+ && conn->sccp.msc->lcls_codec_mismatch_allow == false) {</span><br><span style="color: hsl(120, 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%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index f6f1b8a..efa12e0 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -184,6 +184,11 @@</span><br><span> vty_out(vty, " lcls-mode %s%s", get_value_string(bsc_lcls_mode_names, msc->lcls_mode),</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc->lcls_codec_mismatch_allow)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " lcls-codec-mismatch allowed%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " lcls-codec-mismatch forbidden%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* write MGW configuration */</span><br><span> mgcp_client_config_write(vty, " ");</span><br><span> }</span><br><span>@@ -650,6 +655,23 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_net_msc_lcls_mismtch,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_net_msc_lcls_mismtch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "lcls-codec-mismatch (allowed|forbidden)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Allow 3GPP LCLS (Local Call, Local Switch) when call legs use different codec/rate\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Allow LCLS only only for calls that use the same codec/rate on both legs\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Do not Allow LCLS for calls that use a different codec/rate on both legs\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *data = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[0], "allowed") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ data->lcls_codec_mismatch_allow = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ data->lcls_codec_mismatch_allow = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</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> DEFUN(cfg_net_bsc_mid_call_text,</span><br><span> cfg_net_bsc_mid_call_text_cmd,</span><br><span> "mid-call-text .TEXT",</span><br><span>@@ -938,6 +960,7 @@</span><br><span> install_element(MSC_NODE, &cfg_net_msc_amr_5_15_cmd);</span><br><span> install_element(MSC_NODE, &cfg_net_msc_amr_4_75_cmd);</span><br><span> install_element(MSC_NODE, &cfg_net_msc_lcls_mode_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_net_msc_lcls_mismtch_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_acc_lst_name_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_no_acc_lst_name_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_bsc_addr_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9940">change 9940</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/9940"/><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: I157549129a40c64364dc126f67195759e5f1d60f </div>
<div style="display:none"> Gerrit-Change-Number: 9940 </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 </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>