<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9747">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: set codec info when performing MGW operation<br><br>While GSCON is setting the codec info when operating on the MGW, LCLS<br>is not doing that yet. This means that the MDCX messages that are<br>sent by LCLS do not contain any payload type and also no ptime or<br>rtpmap fields. This also causes the following TTCN3 tests to fail:<br><br>TC_lcls_connect_break<br>TC_lcls_connect_clear<br>TC_lcls_gcr_bway_connect<br>TC_lcls_gcr_bway_dont_connect_csc<br><br>- Make mgcp_pick_codec() public as bsc_subscr_pick_codec()<br>- use bsc_subscr_pick_codec() to set codec info in osmo_bsc_lcls.c<br><br>Change-Id: I383d55fa602cda0926dd701ee517a299db578260<br>Closes: OS#3358<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, 10 insertions(+), 6 deletions(-)<br><br></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 e8226f4..9e56f6b 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>@@ -66,6 +66,9 @@</span><br><span> </span><br><span> struct gsm_subscriber_connection;</span><br><span> struct gsm_network;</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_conn_peer;</span><br><span> </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 style="color: hsl(120, 100%, 40%);">+</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);</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 0f3d9d2..66cdbba 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>@@ -122,8 +122,7 @@</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%);">-static void mgcp_pick_codec(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_conn_peer *conn_peer)</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)</span><br><span> {</span><br><span> switch (conn->user_plane.chan_mode) {</span><br><span> case GSM48_CMODE_SPEECH_V1:</span><br><span>@@ -440,7 +439,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%);">- mgcp_pick_codec(conn, &conn_peer);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn);</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>@@ -600,7 +599,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%);">- mgcp_pick_codec(conn, &conn_peer);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn);</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>@@ -667,7 +666,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%);">- mgcp_pick_codec(conn, &conn_peer);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn);</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>@@ -792,7 +791,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%);">- mgcp_pick_codec(conn, &conn_peer);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_pick_codec(&conn_peer, conn);</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 c2b0760..b197e66 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,6 +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(120, 100%, 40%);">+ bsc_subscr_pick_codec(&peer, conn);</span><br><span> mgcp_conn_modify(conn->user_plane.fi_msc, 0, &peer);</span><br><span> }</span><br><span> </span><br><span>@@ -563,6 +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(120, 100%, 40%);">+ bsc_subscr_pick_codec(&peer, conn);</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/9747">change 9747</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/9747"/><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: I383d55fa602cda0926dd701ee517a299db578260 </div>
<div style="display:none"> Gerrit-Change-Number: 9747 </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>