<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10287">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;">gscon: use BSS-common payload types on BSS side<br><br>In cases where a codec has no fixed (IANA) payload type number, a<br>dynamically coosen payload type number is used. For the route between<br>BSC and MSC 3GPP as designated certain payload type numbers. However,<br>beond that, those payload type numbers may not necessarly apply. The<br>RTP communication between BTS and BSC still might run on a completely<br>different payload type number.<br><br>libosmo-netif contains a header file which payload type numbers<br>shall be used. Lets use those in order to signal the same payload type<br>numbers as we actually use in the RTP packets to the MGW.<br><br>Change-Id: I507a1b1446c8f140b2950d73cf737797604c1ac3<br>Related: OS#2728<br>Related: OS#3384<br>---<br>M include/osmocom/bsc/mgw_endpoint_fsm.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>M src/osmo-bsc/mgw_endpoint_fsm.c<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>5 files changed, 37 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/mgw_endpoint_fsm.h b/include/osmocom/bsc/mgw_endpoint_fsm.h</span><br><span>index 34fdcb7..e264a3c 100644</span><br><span>--- a/include/osmocom/bsc/mgw_endpoint_fsm.h</span><br><span>+++ b/include/osmocom/bsc/mgw_endpoint_fsm.h</span><br><span>@@ -56,4 +56,4 @@</span><br><span> const char *mgcp_conn_peer_name(const struct mgcp_conn_peer *info);</span><br><span> </span><br><span> enum mgcp_codecs chan_mode_to_mgcp_codec(enum gsm48_chan_mode chan_mode, bool full_rate);</span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side);</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index fd3c293..81fe9f6 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -491,7 +491,7 @@</span><br><span> .call_id = conn->sccp.conn_id,</span><br><span> .ptime = 20,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_pick_codec(&mgw_info, for_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_pick_codec(&mgw_info, for_lchan, false);</span><br><span> </span><br><span> rc = osmo_strlcpy(mgw_info.addr, addr, sizeof(mgw_info.addr));</span><br><span> if (rc <= 0 || rc >= sizeof(mgw_info.addr)) {</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index f7efc1b..2cc9a78 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -157,7 +157,7 @@</span><br><span> if (lchan->conn)</span><br><span> crcx_info.call_id = lchan->conn->sccp.conn_id;</span><br><span> crcx_info.ptime = 20;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_pick_codec(&crcx_info, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_pick_codec(&crcx_info, lchan, true);</span><br><span> </span><br><span> mgw_endpoint_ci_request(lchan->mgw_endpoint_ci_bts, MGCP_VERB_CRCX, &crcx_info,</span><br><span> fi, LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE, LCHAN_RTP_EV_MGW_ENDPOINT_ERROR,</span><br><span>@@ -406,7 +406,7 @@</span><br><span> .port = to_lchan->abis_ip.bound_port,</span><br><span> .ptime = 20,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_pick_codec(&mdcx_info, to_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_pick_codec(&mdcx_info, to_lchan, true);</span><br><span> </span><br><span> addr.s_addr = ntohl(to_lchan->abis_ip.bound_ip);</span><br><span> addr_str = inet_ntoa(addr);</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 18e9dcf..fc49886 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>@@ -26,6 +26,7 @@</span><br><span> </span><br><span> #include <osmocom/core/fsm.h></span><br><span> #include <osmocom/core/byteswap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/rtp.h></span><br><span> </span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/gsm_timers.h></span><br><span>@@ -730,10 +731,31 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+int chan_mode_to_mgcp_bss_pt(enum mgcp_codecs codec)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (codec) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_GSMHR_8000_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RTP_PT_GSM_HALF;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_GSMEFR_8000_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RTP_PT_GSM_EFR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_8000_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RTP_PT_AMR;</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%);">+ /* Not an error, we just leave it to libosmo-mgcp-client to</span><br><span style="color: hsl(120, 100%, 40%);">+ * decide over the PT. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side)</span><br><span> {</span><br><span> enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->tch_mode,</span><br><span> lchan->type == GSM_LCHAN_TCH_H? false : true);</span><br><span style="color: hsl(120, 100%, 40%);">+ int custom_pt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (codec < 0) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span> "Unable to determine MGCP codec type for %s in chan-mode %s\n",</span><br><span>@@ -744,4 +766,12 @@</span><br><span> </span><br><span> verb_info->codecs[0] = codec;</span><br><span> verb_info->codecs_len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Setup custom payload types (only for BSS side and when required) */</span><br><span style="color: hsl(120, 100%, 40%);">+ custom_pt = chan_mode_to_mgcp_bss_pt(codec);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bss_side && custom_pt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->ptmap[0].codec = codec;</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->ptmap[0].pt = custom_pt;</span><br><span style="color: hsl(120, 100%, 40%);">+ verb_info->ptmap_len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</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 0482661..4639c4e 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>@@ -242,7 +242,7 @@</span><br><span> .port = conn->user_plane.msc_assigned_rtp_port,</span><br><span> };</span><br><span> osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr));</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_pick_codec(&mdcx_info, conn->lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_pick_codec(&mdcx_info, conn->lchan, false);</span><br><span> </span><br><span> mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc,</span><br><span> MGCP_VERB_MDCX, &mdcx_info,</span><br><span>@@ -573,7 +573,7 @@</span><br><span> mdcx_info = *other_mgw_info;</span><br><span> /* Make sure the request doesn't want to use the other side's endpoint string. */</span><br><span> mdcx_info.endpoint[0] = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_pick_codec(&mdcx_info, conn->lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_pick_codec(&mdcx_info, conn->lchan, false);</span><br><span> mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc,</span><br><span> MGCP_VERB_MDCX, &mdcx_info,</span><br><span> NULL, 0, 0, NULL);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10287">change 10287</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/10287"/><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: I507a1b1446c8f140b2950d73cf737797604c1ac3 </div>
<div style="display:none"> Gerrit-Change-Number: 10287 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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 </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>