<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11917">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/transaction: introduce trans_find_by_sm_rp_mr()<br><br>According to GSM TS 04.11, section 8.2.3, the RP Message Reference<br>is a mandatory field for all messages on the SM-RL (SM Relay Layer),<br>that is used to link an RP-ACK or RP-ERROR message to the associated<br>(preceding) RP-DATA or RP-SMMA message transfer attempt.<br><br>This change extends the transaction state structure with SM-RP-MR,<br>and introduces a new function for matching transactions within a<br>given connection by this reference.<br><br>Change-Id: Ice47c37ecef4416e65ecee8931d946c915316791<br>---<br>M include/osmocom/msc/transaction.h<br>M src/libmsc/transaction.c<br>2 files changed, 27 insertions(+), 0 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/17/11917/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 b7d7971..762eeea 100644</span><br><span>--- a/include/osmocom/msc/transaction.h</span><br><span>+++ b/include/osmocom/msc/transaction.h</span><br><span>@@ -76,6 +76,9 @@</span><br><span> struct gsm411_smc_inst smc_inst;</span><br><span> struct gsm411_smr_inst smr_inst;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* SM-RP-MR, Message Reference (see GSM TS 04.11, section 8.2.3) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sm_rp_mr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gsm_sms *sms;</span><br><span> } sms;</span><br><span> struct {</span><br><span>@@ -99,6 +102,8 @@</span><br><span> uint8_t proto, uint8_t trans_id);</span><br><span> struct gsm_trans *trans_find_by_callref(struct gsm_network *net,</span><br><span> uint32_t callref);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sm_rp_mr);</span><br><span> </span><br><span> struct gsm_trans *trans_alloc(struct gsm_network *net,</span><br><span> struct vlr_subscr *vsub,</span><br><span>diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c</span><br><span>index be14420..c5c8bd4 100644</span><br><span>--- a/src/libmsc/transaction.c</span><br><span>+++ b/src/libmsc/transaction.c</span><br><span>@@ -73,6 +73,28 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Find a transaction by SM-RP-MR (RP Message Reference)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] conn Connection in whihc we want to find transaction</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] sm_rp_mr RP Message Reference (see GSM TS 04.11, section 8.2.3)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns Matching transaction, if any</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sm_rp_mr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = conn->network;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_subscr *vsub = conn->vsub;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_trans *trans;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(trans, &net->trans_list, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trans->vsub == vsub &&</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->protocol == GSM48_PDISC_SMS &&</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->sms.sm_rp_mr == sm_rp_mr)</span><br><span style="color: hsl(120, 100%, 40%);">+ return trans;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Allocate a new transaction and add it to network list</span><br><span> * \param[in] net Netwokr in which we allocate transaction</span><br><span> * \param[in] subscr Subscriber for which we allocate transaction</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11917">change 11917</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/11917"/><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: Ice47c37ecef4416e65ecee8931d946c915316791 </div>
<div style="display:none"> Gerrit-Change-Number: 11917 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Ivan Kluchnikov <kluchnikovi@gmail.com> </div>