<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13199">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;">AMR: Signal usage of octet-aligned or bandwith-efficient mode to MSC<br><br>MGCP/SDP provides fmtp parameters in order to signal which of the two<br>available AMR framing modes (octet-aligned or bandwith-efficient) should<br>be used on the link between BSS and core network. osmo-bsc currently<br>does not set up this mode which means that the RTP packets from the BTS<br>are forwared without inspection/modification, which may lead to<br>malfunction when a BTS is using a framing mode that is not supported by<br>the other end.<br><br>- Add VTY option to setup the framing mode<br>- Generate related fmtp parameters in SDP<br><br>Depends: osmo-mgw I622c01874b25f5049d4f59eb8157e0ea3cbe16ba<br>Change-Id: If6d40b2407b87aad2227ea7f15533ef01a3771b3<br>Related OS#3807<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/mgw_endpoint_fsm.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>3 files changed, 43 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 5202174..debd240 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>@@ -79,6 +79,7 @@</span><br><span> </span><br><span> /* audio codecs */</span><br><span> struct gsm48_multi_rate_conf amr_conf;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool amr_octet_aligned;</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>diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c</span><br><span>index fc49886..5462914 100644</span><br><span>--- a/src/osmo-bsc/mgw_endpoint_fsm.c</span><br><span>+++ b/src/osmo-bsc/mgw_endpoint_fsm.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_msc_data.h></span><br><span> </span><br><span> #define LOG_CI(ci, level, fmt, args...) do { \</span><br><span> if (!ci || !ci->mgwep) \</span><br><span>@@ -774,4 +775,22 @@</span><br><span> verb_info->ptmap[0].pt = custom_pt;</span><br><span> verb_info->ptmap_len = 1;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* AMR requires additional parameters to be set up (framing mode) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param_present = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param.amr_octet_aligned_present = true;</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 (bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: At the moment all BTSs we support are using the</span><br><span style="color: hsl(120, 100%, 40%);">+ * octet-aligned payload format. However, in the future</span><br><span style="color: hsl(120, 100%, 40%);">+ * we may support BTSs that are using bandwith-efficient</span><br><span style="color: hsl(120, 100%, 40%);">+ * format. In this case we will have to add functionality</span><br><span style="color: hsl(120, 100%, 40%);">+ * that distinguishes by the BTS model which mode to use. */</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param.amr_octet_aligned = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->param.amr_octet_aligned = lchan->conn->sccp.msc->amr_octet_aligned;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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 6e3d1c1..78196cf 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>@@ -100,6 +100,11 @@</span><br><span> WRITE_AMR(vty, msc, "5_15k", m5_15);</span><br><span> WRITE_AMR(vty, msc, "4_75k", m4_75);</span><br><span> #undef WRITE_AMR</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc->amr_octet_aligned)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " amr-payload octet-aligned%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, " amr-payload bandwith-efficient%s", VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> static void write_msc(struct vty *vty, struct bsc_msc_data *msc)</span><br><span>@@ -952,6 +957,23 @@</span><br><span> ALIAS_DEPRECATED(cfg_net_msc_dest, cfg_net_msc_no_dest_cmd,</span><br><span> "no dest A.B.C.D <1-65000> <0-255>", NO_STR LEGACY_STR "-\n" "-\n" "-\n");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_net_msc_amr_octet_align,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_net_msc_amr_octet_align_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-payload (octet-aligned|bandwith-efficient",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set AMR payload framing mode\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "payload fields aligned on octet boundaries\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "payload fields packed (AoIP)\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], "octet-aligned") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ data->amr_octet_aligned = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (strcmp(argv[0], "bandwith-efficient") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ data->amr_octet_aligned = 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> int bsc_vty_init_extra(void)</span><br><span> {</span><br><span> struct gsm_network *net = bsc_gsmnet;</span><br><span>@@ -996,6 +1018,7 @@</span><br><span> install_element(MSC_NODE, &cfg_net_msc_amr_5_90_cmd);</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 style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_net_msc_amr_octet_align_cmd);</span><br><span> install_element(MSC_NODE, &cfg_net_msc_lcls_mode_cmd);</span><br><span> 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13199">change 13199</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/13199"/><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: If6d40b2407b87aad2227ea7f15533ef01a3771b3 </div>
<div style="display:none"> Gerrit-Change-Number: 13199 </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>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>