<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11551">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: move mode check into separate function<br><br>Before closing or breaking the loop in LCLS we do preliminary<br>checks. To facilitate adding new LCLS modes it's restructured as<br>follows:<br><br>* move check into dedicated static function<br>* explicitly check for MGW mode in endpoint check<br>* check for mode mismatch<br><br>Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c<br>Related: OS#3659<br>---<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>1 file changed, 25 insertions(+), 8 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 a25faa4..81daaf0 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,26 @@</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%);">+static inline bool lcls_check_toggle_allowed(const struct gsm_subscriber_connection *conn, bool enable)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->lcls.other &&</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->sccp.msc->lcls_mode != conn->lcls.other->sccp.msc->lcls_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSM(conn->lcls.fi, "FIXME: LCLS connection mode mismatch: %s != %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(bsc_lcls_mode_names, conn->sccp.msc->lcls_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(bsc_lcls_mode_names, conn->lcls.other->sccp.msc->lcls_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP && !conn->user_plane.mgw_endpoint_ci_msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot %s LCLS without MSC-side MGCP FSM\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ enable ? "enable" : "disable");</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Close the loop for LCLS using MGCP */</span><br><span> static inline void lcls_mdcx(const struct gsm_subscriber_connection *conn, struct mgcp_conn_peer *mdcx_info)</span><br><span> {</span><br><span>@@ -242,11 +262,8 @@</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> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!conn->user_plane.mgw_endpoint_ci_msc) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot disable LCLS without MSC-side MGCP FSM\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lcls_check_toggle_allowed(conn, false))</span><br><span> return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) {</span><br><span> struct mgcp_conn_peer mdcx_info = (struct mgcp_conn_peer){</span><br><span>@@ -583,12 +600,12 @@</span><br><span> </span><br><span> OSMO_ASSERT(conn_other);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lcls_check_toggle_allowed(conn, true))</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS(%s)\n",</span><br><span> bsc_lcls_mode_name(conn->sccp.msc->lcls_mode));</span><br><span style="color: hsl(0, 100%, 40%);">- if (!conn->user_plane.mgw_endpoint_ci_msc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!conn_other->user_plane.mgw_endpoint_ci_msc) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n");</span><br><span> return;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11551">change 11551</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/11551"/><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: I32ba232ad802625d97a0ad9d0511edc6ac7f251c </div>
<div style="display:none"> Gerrit-Change-Number: 11551 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </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-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>