<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10173">View Change</a></p><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 IANA as designated certain payload type numbers. However,<br>beond those payload type numbers may not necessarly apply. The RTP<br>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 shall be<br>used. Lets use those in order to signal the same payload type numbers as<br>we actually use in the RTP packets to the MGW.<br><br>Change-Id: I3373876bf5430130c6509be08b5f08e724c57c7a<br>Depends: osmo-mgw If176a3719dd9e888da16196d5fc0bdb53cc2a5f2<br>Related: OS#2728<br>Related: OS#3384<br>---<br>M include/osmocom/bsc/bsc_subscr_conn_fsm.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>3 files changed, 37 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/10173/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>index 9e56f6b..e458d7a 100644</span><br><span>--- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>+++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>@@ -71,4 +71,4 @@</span><br><span> /* Allocate a subscriber connection and its associated FSM */</span><br><span> struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void bsc_subscr_pick_codec(struct mgcp_conn_peer *conn_peer, struct gsm_subscriber_connection *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+void bsc_subscr_pick_codec(struct mgcp_conn_peer *conn_peer, struct gsm_subscriber_connection *conn, 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 66cdbba..b239fd0 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>@@ -36,6 +36,7 @@</span><br><span> #include <osmocom/bsc/penalty_timers.h></span><br><span> #include <osmocom/mgcp_client/mgcp_client_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> #define S(x) (1 << (x))</span><br><span> </span><br><span>@@ -122,8 +123,10 @@</span><br><span> </span><br><span> /* Depending on the channel mode and rate, set the codec type that is signalled</span><br><span> * towards the MGW. */</span><br><span style="color: hsl(0, 100%, 40%);">-void bsc_subscr_pick_codec(struct mgcp_conn_peer *conn_peer, struct gsm_subscriber_connection *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+void bsc_subscr_pick_codec(struct mgcp_conn_peer *conn_peer, struct gsm_subscriber_connection *conn, bool bss_side)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set up codec configuration */</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->codecs_len = 0;</span><br><span> switch (conn->user_plane.chan_mode) {</span><br><span> case GSM48_CMODE_SPEECH_V1:</span><br><span> if (conn->user_plane.full_rate)</span><br><span>@@ -143,6 +146,32 @@</span><br><span> default:</span><br><span> conn_peer->codecs_len = 0;</span><br><span> }</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) */</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bss_side) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (conn->user_plane.chan_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn->user_plane.full_rate) {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap[0].codec = CODEC_GSMHR_8000_1;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap[0].pt = RTP_PT_GSM_HALF;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap_len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap[0].codec = CODEC_GSMEFR_8000_1;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap[0].pt = RTP_PT_GSM_EFR;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap_len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap[0].codec = CODEC_AMR_8000_1;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap[0].pt = RTP_PT_AMR;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap_len = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_peer->ptmap_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Send data SCCP message through SCCP connection. All sigtran messages</span><br><span>@@ -439,7 +468,7 @@</span><br><span> /* A voice channel is requested, so we run down the</span><br><span> * mgcp-ass-mgcp state-chain (see FIXME above) */</span><br><span> memset(&conn_peer, 0, sizeof(conn_peer));</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_pick_codec(&conn_peer, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn, true);</span><br><span> conn_peer.call_id = conn->sccp.conn_id;</span><br><span> conn_peer.ptime = 20;</span><br><span> osmo_strlcpy(conn_peer.endpoint, get_mgw_ep_name(conn), sizeof(conn_peer.endpoint));</span><br><span>@@ -599,7 +628,7 @@</span><br><span> </span><br><span> /* Prepare parameters with the information we got during the assignment */</span><br><span> memset(&conn_peer, 0, sizeof(conn_peer));</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_pick_codec(&conn_peer, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn, true);</span><br><span> addr.s_addr = osmo_ntohl(lchan->abis_ip.bound_ip);</span><br><span> osmo_strlcpy(conn_peer.addr, inet_ntoa(addr), sizeof(conn_peer.addr));</span><br><span> conn_peer.port = lchan->abis_ip.bound_port;</span><br><span>@@ -666,7 +695,7 @@</span><br><span> /* Prepare parameters with the connection information we got</span><br><span> * with the assignment command */</span><br><span> memset(&conn_peer, 0, sizeof(conn_peer));</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_pick_codec(&conn_peer, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn, false);</span><br><span> conn_peer.call_id = conn->sccp.conn_id;</span><br><span> sin = (struct sockaddr_in *)&conn->user_plane.aoip_rtp_addr_remote;</span><br><span> conn_peer.port = osmo_ntohs(sin->sin_port);</span><br><span>@@ -791,7 +820,7 @@</span><br><span> /* Prepare parameters with the information we got during the</span><br><span> * handover procedure (via IPACC) */</span><br><span> memset(&conn_peer, 0, sizeof(conn_peer));</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_pick_codec(&conn_peer, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn, true);</span><br><span> addr.s_addr = osmo_ntohl(lchan->abis_ip.bound_ip);</span><br><span> osmo_strlcpy(conn_peer.addr, inet_ntoa(addr), sizeof(conn_peer.addr));</span><br><span> conn_peer.port = lchan->abis_ip.bound_port;</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 b197e66..8d990a9 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>@@ -244,7 +244,7 @@</span><br><span> memset(&peer, 0, sizeof(peer));</span><br><span> peer.port = htons(sin->sin_port);</span><br><span> osmo_strlcpy(peer.addr, inet_ntoa(sin->sin_addr), sizeof(peer.addr));</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_pick_codec(&peer, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&peer, conn, false);</span><br><span> mgcp_conn_modify(conn->user_plane.fi_msc, 0, &peer);</span><br><span> }</span><br><span> </span><br><span>@@ -564,7 +564,7 @@</span><br><span> memset(&peer, 0, sizeof(peer));</span><br><span> peer.port = htons(sin->sin_port);</span><br><span> osmo_strlcpy(peer.addr, inet_ntoa(sin->sin_addr), sizeof(peer.addr));</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_pick_codec(&peer, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&peer, conn, false);</span><br><span> mgcp_conn_modify(conn->user_plane.fi_msc, 0, &peer);</span><br><span> </span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10173">change 10173</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/10173"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3373876bf5430130c6509be08b5f08e724c57c7a </div>
<div style="display:none"> Gerrit-Change-Number: 10173 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>