<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11565">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;">LCLS: explicitly check for mode before closing the loop<br><br>Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb<br>Related: OS#3659<br>---<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>1 file changed, 13 insertions(+), 11 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 a406643..a25faa4 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>@@ -238,7 +238,6 @@</span><br><span> </span><br><span> static void lcls_break_local_switching(struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        struct mgcp_conn_peer mdcx_info;</span><br><span> </span><br><span>         LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n",</span><br><span>               bsc_lcls_mode_name(conn->sccp.msc->lcls_mode));</span><br><span>@@ -249,11 +248,13 @@</span><br><span>                return;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   mdcx_info = (struct mgcp_conn_peer){</span><br><span style="color: hsl(0, 100%, 40%);">-            .port = conn->user_plane.msc_assigned_rtp_port,</span><br><span style="color: hsl(0, 100%, 40%);">-      };</span><br><span style="color: hsl(0, 100%, 40%);">-      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%);">-        lcls_mdcx(conn, &mdcx_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) {</span><br><span style="color: hsl(120, 100%, 40%);">+              struct mgcp_conn_peer mdcx_info = (struct mgcp_conn_peer){</span><br><span style="color: hsl(120, 100%, 40%);">+                    .port = conn->user_plane.msc_assigned_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+            };</span><br><span style="color: hsl(120, 100%, 40%);">+            osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr));</span><br><span style="color: hsl(120, 100%, 40%);">+              lcls_mdcx(conn, &mdcx_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span> }</span><br><span> </span><br><span> static bool lcls_enable_possible(struct gsm_subscriber_connection *conn)</span><br><span>@@ -579,7 +580,6 @@</span><br><span>         struct gsm_subscriber_connection *conn = fi->priv;</span><br><span>        struct gsm_subscriber_connection *conn_other = conn->lcls.other;</span><br><span>  const struct mgcp_conn_peer *other_mgw_info;</span><br><span style="color: hsl(0, 100%, 40%);">-    struct mgcp_conn_peer mdcx_info;</span><br><span> </span><br><span>         OSMO_ASSERT(conn_other);</span><br><span> </span><br><span>@@ -601,10 +601,12 @@</span><br><span>                 return;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   mdcx_info = *other_mgw_info;</span><br><span style="color: hsl(0, 100%, 40%);">-    /* Make sure the request doesn't want to use the other side's endpoint string. */</span><br><span style="color: hsl(0, 100%, 40%);">-       mdcx_info.endpoint[0] = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-      lcls_mdcx(conn, &mdcx_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) {</span><br><span style="color: hsl(120, 100%, 40%);">+              struct mgcp_conn_peer mdcx_info = *other_mgw_info;</span><br><span style="color: hsl(120, 100%, 40%);">+            /* Make sure the request doesn't want to use the other side's endpoint string. */</span><br><span style="color: hsl(120, 100%, 40%);">+             mdcx_info.endpoint[0] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+            lcls_mdcx(conn, &mdcx_info);</span><br><span style="color: hsl(120, 100%, 40%);">+      }</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/11565">change 11565</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/11565"/><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: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb </div>
<div style="display:none"> Gerrit-Change-Number: 11565 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@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: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>