<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12867">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: send proper OML alert in case of errors<br><br>Change-Id: I5b19b82a4874617c7c584cf3eac55eb9c756710a<br>---<br>M src/common/oml.c<br>1 file changed, 15 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/12867/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 82d12c7..6d44710 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -1411,8 +1411,15 @@</span><br><span>             ret = oml_ipa_set_attr(bts, msg);</span><br><span>            break;</span><br><span>       default:</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DOML, LOGL_INFO, "Manufacturer Formatted O&M msg_type 0x%02x\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                     foh->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+            trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+          if (trx) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    oml_tx_failure_event_rep(&trx->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(120, 100%, 40%);">+                                               "unknown Manufacturer O&M msg_type 0x%02x",</span><br><span style="color: hsl(120, 100%, 40%);">+                                             foh->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+           } else</span><br><span style="color: hsl(120, 100%, 40%);">+                        oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(120, 100%, 40%);">+                                               "unknown Manufacturer O&M msg_type 0x%02x",</span><br><span style="color: hsl(120, 100%, 40%);">+                                             foh->msg_type);</span><br><span>          ret = oml_fom_ack_nack(msg, NM_NACK_MSGTYPE_INVAL);</span><br><span>  }</span><br><span> </span><br><span>@@ -1435,7 +1442,8 @@</span><br><span>        switch (oh->mdisc) {</span><br><span>      case ABIS_OM_MDISC_FOM:</span><br><span>              if (msgb_l2len(msg) < sizeof(*oh)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 LOGP(DOML, LOGL_NOTICE, "Formatted O&M message too short\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                   oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(120, 100%, 40%);">+                                              "Formatted O&M message too short\n");</span><br><span>                  ret = -EIO;</span><br><span>                  break;</span><br><span>               }</span><br><span>@@ -1443,15 +1451,16 @@</span><br><span>          break;</span><br><span>       case ABIS_OM_MDISC_MANUF:</span><br><span>            if (msgb_l2len(msg) < sizeof(*oh)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 LOGP(DOML, LOGL_NOTICE, "Manufacturer O&M message too short\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                        oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(120, 100%, 40%);">+                                              "Manufacturer O&M message too short\n");</span><br><span>                       ret = -EIO;</span><br><span>                  break;</span><br><span>               }</span><br><span>            ret = down_mom(bts, msg);</span><br><span>            break;</span><br><span>       default:</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DOML, LOGL_NOTICE, "unknown OML msg_discr 0x%02x\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                     oh->mdisc);</span><br><span style="color: hsl(120, 100%, 40%);">+                oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(120, 100%, 40%);">+                                       "unknown O&M msg_disc 0x%02x\n", oh->mdisc);</span><br><span>               ret = -EINVAL;</span><br><span>       }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12867">change 12867</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/12867"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5b19b82a4874617c7c584cf3eac55eb9c756710a </div>
<div style="display:none"> Gerrit-Change-Number: 12867 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>