<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16217">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix duplicate SMS when SMPP returns to same MSC<br><br>Change-Id: I8c9b61dc05bda6f2b09cbc1890de1f2702f7abc8<br>---<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/gsm_04_11.c<br>2 files changed, 15 insertions(+), 4 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/16217/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index bcee213..736d563 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -292,6 +292,7 @@</span><br><span>      } gsm411;</span><br><span> </span><br><span>        struct {</span><br><span style="color: hsl(120, 100%, 40%);">+              bool ongoing;</span><br><span>                struct osmo_esme *esme;</span><br><span>              uint32_t sequence_nr;</span><br><span>                int transaction_mode;</span><br><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index 367cc6f..186144c 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -272,9 +272,12 @@</span><br><span> </span><br><span> static int gsm340_rx_sms_submit(struct gsm_trans *trans, struct gsm_sms *gsms)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    if (db_sms_store(gsms) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          LOG_TRANS(trans, LOGL_ERROR, "Failed to store SMS in Database\n");</span><br><span style="color: hsl(0, 100%, 40%);">-            return GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER;</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!gsms->smpp.ongoing) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOG_TRANS(trans, LOGL_NOTICE, "SMS Store %llu\n", gsms->id);</span><br><span style="color: hsl(120, 100%, 40%);">+             if (db_sms_store(gsms) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        LOG_TRANS(trans, LOGL_ERROR, "Failed to store SMS in Database\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                  return GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER;</span><br><span style="color: hsl(120, 100%, 40%);">+           }</span><br><span>    }</span><br><span>    /* dispatch a signal to tell higher level about it */</span><br><span>        send_signal(S_SMS_SUBMITTED, NULL, gsms, 0);</span><br><span>@@ -424,10 +427,17 @@</span><br><span>          * delivery of the SMS.</span><br><span>       */</span><br><span>  if (smpp_route_smpp_first()) {</span><br><span style="color: hsl(120, 100%, 40%);">+                /* In case the ESME returns the SMS to this MSC, another entry for this SMS will be created (as usual</span><br><span style="color: hsl(120, 100%, 40%);">+          * for incoming SMPP requests). However, this code path soon also adds a DB entry, which would create</span><br><span style="color: hsl(120, 100%, 40%);">+          * duplicate entries, which would send the SMS twice. Avoid that by marking as SMPP ongoing to skip db */</span><br><span style="color: hsl(120, 100%, 40%);">+             gsms->smpp.ongoing = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>              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(120, 100%, 40%);">+          if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) {</span><br><span>                       /* unknown subscriber, try local */</span><br><span style="color: hsl(120, 100%, 40%);">+                   gsms->smpp.ongoing = false;</span><br><span>                       goto try_local;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span>            if (rc < 0) {</span><br><span>                     LOG_TRANS(trans, LOGL_ERROR, "SMS delivery error: %d\n", rc);</span><br><span>                      rc = GSM411_RP_CAUSE_MO_TEMP_FAIL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16217">change 16217</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/+/16217"/><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: I8c9b61dc05bda6f2b09cbc1890de1f2702f7abc8 </div>
<div style="display:none"> Gerrit-Change-Number: 16217 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>