<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12396">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;">cosmetics in msc_mgcp_call_release()<br><br>Use local variables instead of writing trans->conn-> all the time.<br><br>Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and<br>I0ba216b737909e92080a722db26e3577726c63cb/<br><br>Change-Id: I99717b3b72a9d7cbc95455ea25b2018ec1755308<br>---<br>M src/libmsc/msc_mgcp.c<br>1 file changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c</span><br><span>index 71f36b3..6170c10 100644</span><br><span>--- a/src/libmsc/msc_mgcp.c</span><br><span>+++ b/src/libmsc/msc_mgcp.c</span><br><span>@@ -1143,26 +1143,29 @@</span><br><span> int msc_mgcp_call_release(struct gsm_trans *trans)</span><br><span> {</span><br><span>         struct mgcp_ctx *mgcp_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct ran_conn *conn = trans->conn;</span><br><span> </span><br><span>  OSMO_ASSERT(trans);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!trans->conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!conn) {</span><br><span>                 LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid conn, call release failed\n",</span><br><span>                  vlr_subscr_name(trans->vsub));</span><br><span>               return -EINVAL;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (!trans->conn->rtp.mgcp_ctx) {</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>             LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid mgcp context, call release failed.\n",</span><br><span>                 vlr_subscr_name(trans->vsub));</span><br><span>               return -EINVAL;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (!trans->conn->rtp.mgcp_ctx->fsm) {</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!mgcp_ctx->fsm) {</span><br><span>             LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) no FSM, call release failed\n",</span><br><span>                vlr_subscr_name(trans->vsub));</span><br><span>               return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   mgcp_ctx = trans->conn->rtp.mgcp_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+   LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) Call release: tearing down MGW endpoint\n",</span><br><span style="color: hsl(120, 100%, 40%);">+        trans->transaction_id, vlr_subscr_name(trans->vsub));</span><br><span> </span><br><span>         /* Inform the FSM that as soon as it reaches ST_HALT it may free</span><br><span>      * all context information immediately */</span><br><span>@@ -1176,10 +1179,7 @@</span><br><span>    * overwriting the context pointer with NULL. The FSM will now</span><br><span>        * take care for a graceful shutdown and when done it will free</span><br><span>       * all related context information */</span><br><span style="color: hsl(0, 100%, 40%);">-   trans->conn->rtp.mgcp_ctx = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) call release initiated\n",</span><br><span style="color: hsl(0, 100%, 40%);">-        vlr_subscr_name(trans->vsub));</span><br><span style="color: hsl(120, 100%, 40%);">+        conn->rtp.mgcp_ctx = NULL;</span><br><span> </span><br><span>    return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12396">change 12396</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/12396"/><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: I99717b3b72a9d7cbc95455ea25b2018ec1755308 </div>
<div style="display:none"> Gerrit-Change-Number: 12396 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>