<p>Keith Whyte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12602">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Don't deliver alert notifications to an ESME that<br>is not yet bound.<br><br>We create a new ESME in smsc->esme_list on establishment<br>of a TCP connection, yet we do not know the system id or<br>anything else, until the ESME identifies and authenticates.<br>So do not send alert notifications until we know the<br>bind status (and system_id)<br><br>Change-Id: I0e5d55d3fb6ac46d253902df2fe304e1b0fc8bbf<br>---<br>M openbsc/src/libmsc/smpp_openbsc.c<br>M openbsc/src/libmsc/smpp_smsc.c<br>M openbsc/src/libmsc/smpp_smsc.h<br>3 files changed, 10 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c</span><br><span>index f463e1c..67b2a66 100644</span><br><span>--- a/openbsc/src/libmsc/smpp_openbsc.c</span><br><span>+++ b/openbsc/src/libmsc/smpp_openbsc.c</span><br><span>@@ -279,6 +279,11 @@</span><br><span>          /* we currently send an alert notification to each ESME that is</span><br><span>               * connected, and do not require a (non-existant) delivery</span><br><span>            * pending flag to be set before. */</span><br><span style="color: hsl(120, 100%, 40%);">+          if (!esme->bind_flags) {</span><br><span style="color: hsl(120, 100%, 40%);">+                   LOGP(DSMPP, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+                        "ESME is not (yet) bound, skipping alert\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                       continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span>            if (!esme->acl->alert_notifications) {</span><br><span>                         LOGP(DSMPP, LOGL_DEBUG,</span><br><span>                      "[%s] is not set to receive Alert Notifications\n", esme->system_id);</span><br><span>diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c</span><br><span>index 35097b4..1cee3fe 100644</span><br><span>--- a/openbsc/src/libmsc/smpp_smsc.c</span><br><span>+++ b/openbsc/src/libmsc/smpp_smsc.c</span><br><span>@@ -49,11 +49,6 @@</span><br><span>         memset(str, 0, sizeof(*str));                   \</span><br><span>    rc = smpp34_unpack(type, str, data, len)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum emse_bind {</span><br><span style="color: hsl(0, 100%, 40%);">-    ESME_BIND_RX = 0x01,</span><br><span style="color: hsl(0, 100%, 40%);">-    ESME_BIND_TX = 0x02,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> const struct value_string smpp_status_strs[] = {</span><br><span>   { ESME_ROK,             "No Error" },</span><br><span>      { ESME_RINVMSGLEN,      "Message Length is invalid" },</span><br><span>diff --git a/openbsc/src/libmsc/smpp_smsc.h b/openbsc/src/libmsc/smpp_smsc.h</span><br><span>index 2398201..ad1af76 100644</span><br><span>--- a/openbsc/src/libmsc/smpp_smsc.h</span><br><span>+++ b/openbsc/src/libmsc/smpp_smsc.h</span><br><span>@@ -19,6 +19,11 @@</span><br><span> #define MODE_7BIT 7</span><br><span> #define MODE_8BIT  8</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum esme_bind {</span><br><span style="color: hsl(120, 100%, 40%);">+       ESME_BIND_RX = 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+  ESME_BIND_TX = 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum esme_read_state {</span><br><span>         READ_ST_IN_LEN = 0,</span><br><span>  READ_ST_IN_MSG = 1,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12602">change 12602</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/12602"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0e5d55d3fb6ac46d253902df2fe304e1b0fc8bbf </div>
<div style="display:none"> Gerrit-Change-Number: 12602 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </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: Keith Whyte <keith@rhizomatica.org> </div>