<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/15849">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">send MNCC REL only if MNCC has actually started<br><br>Change-Id: I07b2b6c0ee33f5d3e0a060c10cf36d5c7c9f0d9b<br>---<br>M include/osmocom/msc/transaction.h<br>M src/libmsc/gsm_04_08_cc.c<br>2 files changed, 9 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h</span><br><span>index cab0030..61d8c1a 100644</span><br><span>--- a/include/osmocom/msc/transaction.h</span><br><span>+++ b/include/osmocom/msc/transaction.h</span><br><span>@@ -103,6 +103,7 @@</span><br><span>                     struct osmo_timer_list timer;</span><br><span>                        struct osmo_timer_list timer_guard;</span><br><span>                  struct gsm_mncc msg;    /* stores setup/disconnect/release message */</span><br><span style="color: hsl(120, 100%, 40%);">+                 bool mncc_initiated;    /* Whether an MNCC Release is necessary on failure */</span><br><span>                } cc;</span><br><span>                struct {</span><br><span>                     struct gsm411_smc_inst smc_inst;</span><br><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index a90ddce..792ab61 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -244,6 +244,9 @@</span><br><span>      memcpy(data, mncc, sizeof(struct gsm_mncc));</span><br><span> </span><br><span>     cc_tx_to_mncc(net, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+      /* trans may be NULL when sending an MNCC error reply upon an invalid MNCC request */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trans)</span><br><span style="color: hsl(120, 100%, 40%);">+            trans->cc.mncc_initiated = true;</span><br><span> </span><br><span>      return 0;</span><br><span> }</span><br><span>@@ -278,9 +281,10 @@</span><br><span>                        gsm48_cc_tx_release(trans, &rel);</span><br><span>                }</span><br><span>            /* Ressource unavailable */</span><br><span style="color: hsl(0, 100%, 40%);">-             mncc_release_ind(trans->net, trans, trans->callref,</span><br><span style="color: hsl(0, 100%, 40%);">-                                GSM48_CAUSE_LOC_PRN_S_LU,</span><br><span style="color: hsl(0, 100%, 40%);">-                               GSM48_CC_CAUSE_RESOURCE_UNAVAIL);</span><br><span style="color: hsl(120, 100%, 40%);">+            if (trans->cc.mncc_initiated)</span><br><span style="color: hsl(120, 100%, 40%);">+                      mncc_release_ind(trans->net, trans, trans->callref,</span><br><span style="color: hsl(120, 100%, 40%);">+                                      GSM48_CAUSE_LOC_PRN_S_LU,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     GSM48_CC_CAUSE_RESOURCE_UNAVAIL);</span><br><span>           /* This is a final freeing of the transaction. The MNCC release may have triggered the</span><br><span>                * T308 release timer, but we don't have the luxury of graceful CC Release here. */</span><br><span>              gsm48_stop_cc_timer(trans);</span><br><span>@@ -1981,6 +1985,7 @@</span><br><span>  LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s\n", get_mncc_name(msg->msg_type));</span><br><span> </span><br><span>   gsm48_start_guard_timer(trans);</span><br><span style="color: hsl(120, 100%, 40%);">+       trans->cc.mncc_initiated = true;</span><br><span> </span><br><span>      if (trans->msc_a)</span><br><span>                 msc_a = trans->msc_a;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/15849">change 15849</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/c/osmo-msc/+/15849"/><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-Change-Id: I07b2b6c0ee33f5d3e0a060c10cf36d5c7c9f0d9b </div>
<div style="display:none"> Gerrit-Change-Number: 15849 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>