<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12399">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move trans->assignment_done to cc.assignment_started<br><br>The flag is set to true when an assignment has been started, and it is only<br>relevant for a CC transaction. So fix naming and place in cc struct.<br><br>Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and<br>I0ba216b737909e92080a722db26e3577726c63cb/<br><br>Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f<br>---<br>M include/osmocom/msc/transaction.h<br>M src/libmsc/msc_mgcp.c<br>2 files changed, 4 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/99/12399/1</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 0760c07..74eaf60 100644</span><br><span>--- a/include/osmocom/msc/transaction.h</span><br><span>+++ b/include/osmocom/msc/transaction.h</span><br><span>@@ -52,9 +52,6 @@</span><br><span>     /* bearer capabilities (rate and codec) */</span><br><span>   struct gsm_mncc_bearer_cap bearer_cap;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      /* status of the assignment, true when done */</span><br><span style="color: hsl(0, 100%, 40%);">-  bool assignment_done;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>        /* if true, TCH_RTP_CREATE is sent after the</span><br><span>          * assignment is done */</span><br><span>     bool tch_rtp_create;</span><br><span>@@ -71,6 +68,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 assignment_started;</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/msc_mgcp.c b/src/libmsc/msc_mgcp.c</span><br><span>index 5a8ee79..8e2e7a9 100644</span><br><span>--- a/src/libmsc/msc_mgcp.c</span><br><span>+++ b/src/libmsc/msc_mgcp.c</span><br><span>@@ -951,7 +951,7 @@</span><br><span>      .event_names = msc_mgcp_fsm_evt_names,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Try to invoke call assignment and set trans->assignment_done flag if invoked.</span><br><span style="color: hsl(120, 100%, 40%);">+/* Try to invoke call assignment and set trans->cc.assignment_started flag if invoked.</span><br><span>  * This is relevant for already ongoing calls -- scenario:</span><br><span>  *  - subscriber is in an active voice call,</span><br><span>  *  - another call is coming in.</span><br><span>@@ -960,10 +960,10 @@</span><br><span> int msc_mgcp_try_call_assignment(struct gsm_trans *trans)</span><br><span> {</span><br><span>   struct ran_conn *conn = trans->conn;</span><br><span style="color: hsl(0, 100%, 40%);">- if (trans->assignment_done)</span><br><span style="color: hsl(120, 100%, 40%);">+        if (trans->cc.assignment_started)</span><br><span>                 return 0;</span><br><span>    LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n");</span><br><span style="color: hsl(0, 100%, 40%);">-       trans->assignment_done = true;</span><br><span style="color: hsl(120, 100%, 40%);">+     trans->cc.assignment_started = true;</span><br><span>      return msc_mgcp_call_assignment(trans);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12399">change 12399</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/12399"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f </div>
<div style="display:none"> Gerrit-Change-Number: 12399 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>