<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11564">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCLS: move MGCP MDCX into separate function<br><br>Move code using MDCX via MGCP into separate function to make adding<br>alternative MDCX variants easier.<br><br>Change-Id: I5fafa3b12a39c83bdf64e16e192dd2454d069cf4<br>Related: OS#3659<br>---<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>1 file changed, 11 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>index b8bf601..e642976 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>@@ -227,6 +227,15 @@</span><br><span>  osmo_fsm_inst_dispatch(conn->lcls.fi, LCLS_EV_APPLY_CFG_CSC, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Close the loop for LCLS using MGCP */</span><br><span style="color: hsl(120, 100%, 40%);">+static inline void lcls_mdcx(const struct gsm_subscriber_connection *conn, struct mgcp_conn_peer *mdcx_info)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    mgcp_pick_codec(mdcx_info, conn->lchan, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, mdcx_info,</span><br><span style="color: hsl(120, 100%, 40%);">+                           NULL, 0, 0, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void lcls_break_local_switching(struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span>       struct mgcp_conn_peer mdcx_info;</span><br><span>@@ -242,11 +251,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, false);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc,</span><br><span style="color: hsl(0, 100%, 40%);">-                                MGCP_VERB_MDCX, &mdcx_info,</span><br><span style="color: hsl(0, 100%, 40%);">-                         NULL, 0, 0, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+    lcls_mdcx(conn, &mdcx_info);</span><br><span> }</span><br><span> </span><br><span> static bool lcls_enable_possible(struct gsm_subscriber_connection *conn)</span><br><span>@@ -596,10 +601,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, false);</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc,</span><br><span style="color: hsl(0, 100%, 40%);">-                                MGCP_VERB_MDCX, &mdcx_info,</span><br><span style="color: hsl(0, 100%, 40%);">-                         NULL, 0, 0, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+    lcls_mdcx(conn, &mdcx_info);</span><br><span> }</span><br><span> </span><br><span> static void lcls_locally_switched_wait_break_fn(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11564">change 11564</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/11564"/><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: I5fafa3b12a39c83bdf64e16e192dd2454d069cf4 </div>
<div style="display:none"> Gerrit-Change-Number: 11564 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>