<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16873">View Change</a></p><div style="white-space:pre-wrap">Approvals:
keith: Looks good to me, approved
pespin: Looks good to me, approved
fixeria: Verified
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc: SMS, Avoid premature RP-ACK to MS<br><br>There was one libmsc commit to openbsc that was<br>thus far missing in osmo-msc.<br><br>This commit completes the work on delayed response<br>from an ESME. Without this patch, the SMR sends<br>an RP-ACK to the mobile station, and subsequently a<br>DELIVER_SM_REPONSE from the ESME provokes either a second<br>RP-ACK, or an RP-ERROR; both of which result in<br>"unhandled at this state (IDLE)" from the SMR<br><br>After this patch, we have two things corrected:<br><br>1) RP-ERROR respects Deliver-SM error cause.<br>2) No more "unhandled as this state" error from the SMR<br><br>Extract from original commit message:<br>--------<br>libmsc: annotate esme route in the sms object from deliver_to_esme()<br><br>Annotate this esme route, so we can use it to return -EINPROGRESS to<br>skip sending premature RP-ACK to the mobile station, in case we're<br>handling sms routes through SMPP.<br>--------<br><br>Fixes: #OS4351<br>Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b<br>---<br>M src/libmsc/gsm_04_11.c<br>M src/libmsc/smpp_openbsc.c<br>2 files changed, 12 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index ae19b27..5c26929 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -629,6 +629,10 @@</span><br><span> </span><br><span> rc = sms_route_mt_sms(trans, gsms);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* This SMS got routed through SMPP and we are waiting on the response. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsms->smpp.esme) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINPROGRESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /*</span><br><span> * This SMS got routed through SMPP or no receiver exists.</span><br><span> * In any case, we store it in the database for further processing.</span><br><span>@@ -717,8 +721,10 @@</span><br><span> return gsm411_send_rp_ack(trans, rph->msg_ref);</span><br><span> else if (rc > 0)</span><br><span> return gsm411_send_rp_error(trans, rph->msg_ref, rc);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (rc == -EINPROGRESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> /* Receive a 04.11 RP-DATA message in accordance with Section 7.3.1.2 */</span><br><span>diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c</span><br><span>index 98b3b53..a79b252 100644</span><br><span>--- a/src/libmsc/smpp_openbsc.c</span><br><span>+++ b/src/libmsc/smpp_openbsc.c</span><br><span>@@ -773,6 +773,10 @@</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(!sms->smpp.esme);</span><br><span style="color: hsl(120, 100%, 40%);">+ smpp_esme_get(esme);</span><br><span style="color: hsl(120, 100%, 40%);">+ sms->smpp.esme = esme;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return smpp_cmd_enqueue(esme, vsub, sms,</span><br><span> deliver.sequence_number);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16873">change 16873</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/c/osmo-msc/+/16873"/><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-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b </div>
<div style="display:none"> Gerrit-Change-Number: 16873 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Pablo Neira Ayuso <pablo@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>