<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16839">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Trivial: code simplification, return early<br><br>This commit also, (for what it is worth) removes a<br>difference to the same file in openbsc, which I found<br>while looking for changes that affected SMPP delivery.<br>This is essentially a "forward-port" of [1]<br><br>[1] https://gerrit.osmocom.org/#/c/openbsc/+/3899/<br><br>Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e<br>---<br>M src/libmsc/gsm_04_11.c<br>1 file changed, 20 insertions(+), 20 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 367cc6f..ae19b27 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -442,29 +442,29 @@</span><br><span> </span><br><span> /* determine gsms->receiver based on dialled number */</span><br><span> gsms->receiver = vlr_subscr_find_by_msisdn(net->vlr, gsms->dst.addr, VSUB_USE_SMS_RECEIVER);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gsms->receiver) {</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef BUILD_SMPP</span><br><span style="color: hsl(0, 100%, 40%);">- /* Avoid a second look-up */</span><br><span style="color: hsl(0, 100%, 40%);">- if (smpp_route_smpp_first()) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);</span><br><span style="color: hsl(0, 100%, 40%);">- return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsms->receiver)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = smpp_try_deliver(gsms, msc_a);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRANS(trans, LOGL_ERROR, "SMS delivery error: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = GSM411_RP_CAUSE_MO_TEMP_FAIL;</span><br><span style="color: hsl(0, 100%, 40%);">- /* rc will be logged by gsm411_send_rp_error() */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- rc = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef BUILD_SMPP</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Avoid a second look-up */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (smpp_route_smpp_first()) {</span><br><span> rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED;</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%);">+ rc = smpp_try_deliver(gsms, msc_a);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS(trans, LOGL_ERROR, "SMS delivery error: %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = GSM411_RP_CAUSE_MO_TEMP_FAIL;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* rc will be logged by gsm411_send_rp_error() */</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16839">change 16839</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/+/16839"/><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: I350c19f5bb70b2656171c096334c2ee83f49df7e </div>
<div style="display:none"> Gerrit-Change-Number: 16839 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>