<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12368">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abort assignment on Assignment Failure<br><br>If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx<br>FSM instance, so that the call gets torn down immediately. Before this, the<br>non-call would idle around without anything happening.<br><br>Related: OS#3236<br>Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore)<br>Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a<br>---<br>M include/osmocom/msc/msc_mgcp.h<br>M src/libmsc/msc_mgcp.c<br>M src/libmsc/osmo_msc.c<br>3 files changed, 24 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h</span><br><span>index f7cc932..304e967 100644</span><br><span>--- a/include/osmocom/msc/msc_mgcp.h</span><br><span>+++ b/include/osmocom/msc/msc_mgcp.h</span><br><span>@@ -60,5 +60,6 @@</span><br><span> int msc_mgcp_try_call_assignment(struct gsm_trans *trans);</span><br><span> int msc_mgcp_call_assignment(struct gsm_trans *trans);</span><br><span> int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr);</span><br><span style="color: hsl(120, 100%, 40%);">+int msc_mgcp_ass_fail(struct ran_conn *conn);</span><br><span> int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr);</span><br><span> int msc_mgcp_call_release(struct gsm_trans *trans);</span><br><span>diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c</span><br><span>index 4c17768..5b4ee26 100644</span><br><span>--- a/src/libmsc/msc_mgcp.c</span><br><span>+++ b/src/libmsc/msc_mgcp.c</span><br><span>@@ -1094,6 +1094,25 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Notify the MGCP context that Assignment failed.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This will end the "ringing" on the other call leg, and will usually result in L3 and conn release (i.e. when no other</span><br><span style="color: hsl(120, 100%, 40%);">+ * transactions are still pending, which is usually the case). */</span><br><span style="color: hsl(120, 100%, 40%);">+int msc_mgcp_ass_fail(struct ran_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_ctx *mgcp_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_ctx = conn->rtp.mgcp_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mgcp_ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSMSL(conn->fi, DMGCP, LOGL_ERROR, "Assignment failed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mgcp_ctx->fsm, EV_TEARDOWN_ERROR, mgcp_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Make the connection of a previously assigned call complete</span><br><span> * Parameter:</span><br><span> * trans: transaction context.</span><br><span>diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c</span><br><span>index 37c1d15..1a1ba3c 100644</span><br><span>--- a/src/libmsc/osmo_msc.c</span><br><span>+++ b/src/libmsc/osmo_msc.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <osmocom/msc/a_iface.h></span><br><span> #include <osmocom/msc/gsm_04_08.h></span><br><span> #include <osmocom/msc/gsm_04_11.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/msc_mgcp.h></span><br><span> </span><br><span> #include "../../bscconfig.h"</span><br><span> #ifdef BUILD_IU</span><br><span>@@ -123,7 +124,9 @@</span><br><span> /* Receive an ASSIGNMENT FAILURE from BSC */</span><br><span> void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSMSL(conn->fi, DRR, LOGL_ERROR, "Assignment Failure: cause=%u rr_cause=%u.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ cause, rr_cause ? *rr_cause : 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_mgcp_ass_fail(conn);</span><br><span> }</span><br><span> </span><br><span> /* Receive a CLASSMARK CHANGE from BSC */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12368">change 12368</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/12368"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a </div>
<div style="display:none"> Gerrit-Change-Number: 12368 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>