<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12519">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">transaction: drop unused ti_flag<br><br>The ti_flag parameter in trans_assign_trans_id() is undocumented and<br>unused. It's unclear what was the initial intention for it so let's just<br>drop it to avoid confusion.<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, 8 insertions(+), 12 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/19/12519/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 6e67f39..2826af7 100644</span><br><span>--- a/include/osmocom/msc/transaction.h</span><br><span>+++ b/include/osmocom/msc/transaction.h</span><br><span>@@ -110,7 +110,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 be9a451..b91fbc8 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>@@ -631,7 +631,7 @@</span><br><span> </span><br><span> /* Get free transaction_id */</span><br><span> 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%);">+ 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 788a0a9..96eaa30 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -1005,7 +1005,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 3ee6e92..0461e79 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -308,7 +308,7 @@</span><br><span> </span><br><span> /* Assign transaction ID */</span><br><span> 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%);">+ 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 f62d6b4..5b29a7a 100644</span><br><span>--- a/src/libmsc/transaction.c</span><br><span>+++ b/src/libmsc/transaction.c</span><br><span>@@ -176,22 +176,18 @@</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</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>@@ -203,10 +199,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: newchange </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: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>