<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12519">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">transaction: drop meaningless ti_flag of trans_assign_trans_id()<br><br>According to GSM 04.07, the TI flag takes one bit and can be<br>either of the following:<br><br> '0'B - transaction is allocated by sender of a message,<br> '1'B - transaction is allocated by receiver of a message.<br><br>Since we store transaction ID in gsm_trans structure, we also store<br>TI flag (as a part of transaction ID), which in this context means:<br><br> '0'B - transaction is allocated by us (OsmoMSC),<br> '1'B - transaction is allocated by some MS.<br><br>In 100% cases, trans_assign_trans_id() is used to assign transaction IDs<br>to transactions allocated by us (i.e. OsmoMSC) for MT connections. And<br>there is no need to use it for MO transactions, because they basically<br>already do contain a valid transaction ID assigned by the MS.<br><br>Change-Id: Ie11999900b1789652ee078d34636dcda1e137eb0<br>---<br>M include/osmocom/msc/transaction.h<br>M src/libmsc/gsm_04_08_cc.c<br>M src/libmsc/gsm_04_11.c<br>M src/libmsc/gsm_09_11.c<br>M src/libmsc/transaction.c<br>5 files changed, 9 insertions(+), 14 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 36e9bc1..c5c740c 100644</span><br><span>--- a/include/osmocom/msc/transaction.h</span><br><span>+++ b/include/osmocom/msc/transaction.h</span><br><span>@@ -111,7 +111,7 @@</span><br><span> void trans_free(struct gsm_trans *trans);</span><br><span> </span><br><span> int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t protocol, uint8_t ti_flag);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t protocol);</span><br><span> struct gsm_trans *trans_has_conn(const struct ran_conn *conn);</span><br><span> void trans_conn_closed(const struct ran_conn *conn);</span><br><span> </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 93e136c..b84fd03 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>@@ -630,8 +630,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Get free transaction_id */</span><br><span style="color: hsl(0, 100%, 40%);">- trans_id = trans_assign_trans_id(trans->net, trans->vsub,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_CC, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans_id = trans_assign_trans_id(trans->net, trans->vsub, GSM48_PDISC_CC);</span><br><span> if (trans_id < 0) {</span><br><span> /* no free transaction ID */</span><br><span> rc = mncc_release_ind(trans->net, trans, trans->callref,</span><br><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index e63d1b6..ccb2610 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -1064,7 +1064,7 @@</span><br><span> LOGP(DLSMS, LOGL_INFO, "Going to send a MT SMS\n");</span><br><span> </span><br><span> /* Generate a new transaction ID */</span><br><span style="color: hsl(0, 100%, 40%);">- tid = trans_assign_trans_id(net, vsub, GSM48_PDISC_SMS, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ tid = trans_assign_trans_id(net, vsub, GSM48_PDISC_SMS);</span><br><span> if (tid == -1) {</span><br><span> LOGP(DLSMS, LOGL_ERROR, "No available transaction IDs\n");</span><br><span> return NULL;</span><br><span>diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c</span><br><span>index dca315d..08721d4 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -306,8 +306,7 @@</span><br><span> osmo_counter_inc(net->active_nc_ss);</span><br><span> </span><br><span> /* Assign transaction ID */</span><br><span style="color: hsl(0, 100%, 40%);">- tid = trans_assign_trans_id(trans->net,</span><br><span style="color: hsl(0, 100%, 40%);">- trans->vsub, GSM48_PDISC_NC_SS, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ tid = trans_assign_trans_id(trans->net, trans->vsub, GSM48_PDISC_NC_SS);</span><br><span> if (tid < 0) {</span><br><span> LOGP(DMM, LOGL_ERROR, "No free transaction ID\n");</span><br><span> /* TODO: inform HLR about this */</span><br><span>diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c</span><br><span>index 7c91c92..237191d 100644</span><br><span>--- a/src/libmsc/transaction.c</span><br><span>+++ b/src/libmsc/transaction.c</span><br><span>@@ -179,22 +179,19 @@</span><br><span> }</span><br><span> </span><br><span> /*! allocate an unused transaction ID for the given subscriber</span><br><span style="color: hsl(0, 100%, 40%);">- * in the given protocol using the ti_flag specified</span><br><span style="color: hsl(120, 100%, 40%);">+ * in the given protocol using TI flag = 0 (allocated by us).</span><br><span style="color: hsl(120, 100%, 40%);">+ * See GSM 04.07, section 11.2.3.1.3 "Transaction identifier".</span><br><span> * \param[in] net GSM network</span><br><span> * \param[in] subscr Subscriber for which to find ID</span><br><span> * \param[in] protocol Protocol for whihc to find ID</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] ti_flag FIXME</span><br><span> */</span><br><span> int trans_assign_trans_id(const struct gsm_network *net, const struct vlr_subscr *vsub,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t protocol, uint8_t ti_flag)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t protocol)</span><br><span> {</span><br><span> struct gsm_trans *trans;</span><br><span> unsigned int used_tid_bitmask = 0;</span><br><span> int i, j, h;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ti_flag)</span><br><span style="color: hsl(0, 100%, 40%);">- ti_flag = 0x8;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* generate bitmask of already-used TIDs for this (subscr,proto) */</span><br><span> llist_for_each_entry(trans, &net->trans_list, entry) {</span><br><span> if (trans->vsub != vsub ||</span><br><span>@@ -206,10 +203,10 @@</span><br><span> </span><br><span> /* find a new one, trying to go in a 'circular' pattern */</span><br><span> for (h = 6; h > 0; h--)</span><br><span style="color: hsl(0, 100%, 40%);">- if (used_tid_bitmask & (1 << (h | ti_flag)))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (used_tid_bitmask & (1 << h))</span><br><span> break;</span><br><span> for (i = 0; i < 7; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- j = ((h + i) % 7) | ti_flag;</span><br><span style="color: hsl(120, 100%, 40%);">+ j = (h + i) % 7;</span><br><span> if ((used_tid_bitmask & (1 << j)) == 0)</span><br><span> return j;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12519">change 12519</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/12519"/><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: Ie11999900b1789652ee078d34636dcda1e137eb0 </div>
<div style="display:none"> Gerrit-Change-Number: 12519 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: Vadim Yanitskiy <axilirator@gmail.com> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>