<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12901">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Max: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">transaction: clarify magic 0xff transaction ID<br><br>Change-Id: I2d3a6334f49989bedbb1430d26ffad8b61dfd873<br>---<br>M include/osmocom/msc/transaction.h<br>M src/libmsc/gsm_04_08_cc.c<br>M src/libmsc/gsm_09_11.c<br>M src/libmsc/transaction.c<br>4 files changed, 8 insertions(+), 4 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 c5c740c..5e8d637 100644</span><br><span>--- a/include/osmocom/msc/transaction.h</span><br><span>+++ b/include/osmocom/msc/transaction.h</span><br><span>@@ -9,6 +9,9 @@</span><br><span> #include <osmocom/gsm/gsm0411_smc.h></span><br><span> #include <osmocom/gsm/gsm0411_smr.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Used for late TID assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRANS_ID_UNASSIGNED 0xff</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum bridge_state {</span><br><span> BRIDGE_STATE_NONE,</span><br><span> BRIDGE_STATE_LOOPBACK_PENDING,</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 b84fd03..98c2aa3 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>@@ -617,7 +617,7 @@</span><br><span> gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));</span><br><span> </span><br><span> /* transaction id must not be assigned */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trans->transaction_id != 0xff) { /* unasssigned */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trans->transaction_id != TRANS_ID_UNASSIGNED) {</span><br><span> DEBUGP(DCC, "TX Setup with assigned transaction. "</span><br><span> "This is not allowed!\n");</span><br><span> /* Temporarily out of order */</span><br><span>@@ -1928,7 +1928,8 @@</span><br><span> GSM48_CC_CAUSE_DEST_OOO);</span><br><span> }</span><br><span> /* Create transaction */</span><br><span style="color: hsl(0, 100%, 40%);">- trans = trans_alloc(net, vsub, GSM48_PDISC_CC, 0xff, data->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ trans = trans_alloc(net, vsub, GSM48_PDISC_CC,</span><br><span style="color: hsl(120, 100%, 40%);">+ TRANS_ID_UNASSIGNED, data->callref);</span><br><span> if (!trans) {</span><br><span> LOGP(DCC, LOGL_ERROR, "No memory for trans.\n");</span><br><span> vlr_subscr_put(vsub);</span><br><span>diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c</span><br><span>index 08721d4..d2ad0b7 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -296,7 +296,7 @@</span><br><span> </span><br><span> /* Allocate a new transaction */</span><br><span> trans = trans_alloc(net, vsub, GSM48_PDISC_NC_SS,</span><br><span style="color: hsl(0, 100%, 40%);">- 0xff, gsup_msg->session_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRANS_ID_UNASSIGNED, gsup_msg->session_id);</span><br><span> if (!trans) {</span><br><span> LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n");</span><br><span> return NULL;</span><br><span>diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c</span><br><span>index 237191d..23880aa 100644</span><br><span>--- a/src/libmsc/transaction.c</span><br><span>+++ b/src/libmsc/transaction.c</span><br><span>@@ -196,7 +196,7 @@</span><br><span> llist_for_each_entry(trans, &net->trans_list, entry) {</span><br><span> if (trans->vsub != vsub ||</span><br><span> trans->protocol != protocol ||</span><br><span style="color: hsl(0, 100%, 40%);">- trans->transaction_id == 0xff)</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->transaction_id == TRANS_ID_UNASSIGNED)</span><br><span> continue;</span><br><span> used_tid_bitmask |= (1 << trans->transaction_id);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12901">change 12901</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/12901"/><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: I2d3a6334f49989bedbb1430d26ffad8b61dfd873 </div>
<div style="display:none"> Gerrit-Change-Number: 12901 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: 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: Vadim Yanitskiy <axilirator@gmail.com> </div>