<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12865">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OML: Don't overwrite MO instance before oml_tx_failure_event_rep()<br><br>In Change-Id Ic163bcfb6361a8ebd39e0bc0f238ef51e2cb214e we introduced<br>several additional calls to oml_tx_failure_event_rep() during OML<br>messaeg processing.  However, for some reason, we *overwrite* the<br>bts_nt/trx_nr/ts_nr of the TRX MO.  This is clearly wrong.  The<br>"address" of a managed object doesn't change at runtime!<br><br>Change-Id: Idfb80ccd6dd485d52dc006867fae3dde3fb005f3<br>---<br>M src/common/oml.c<br>1 file changed, 1 insertion(+), 11 deletions(-)<br><br></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 6952d75..6d8bc4b 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -1078,12 +1078,8 @@</span><br><span>                                                                                   foh->msg_type));</span><br><span>              LOGPC(DOML, LOGL_ERROR, "\n");</span><br><span>             trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-            if (trx) {</span><br><span style="color: hsl(0, 100%, 40%);">-                      trx->mo.obj_inst.bts_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                 trx->mo.obj_inst.trx_nr = foh->obj_inst.trx_nr;</span><br><span style="color: hsl(0, 100%, 40%);">-                   trx->mo.obj_inst.ts_nr = 0xff;</span><br><span style="color: hsl(120, 100%, 40%);">+             if (trx)</span><br><span>                     mo = &trx->mo;</span><br><span style="color: hsl(0, 100%, 40%);">-           }</span><br><span>            oml_tx_failure_event_rep(mo, OSMO_EVT_MAJ_UKWN_MSG, form, foh->obj_inst.bts_nr,</span><br><span>                                    get_value_string(abis_nm_msgtype_names, foh->msg_type));</span><br><span> </span><br><span>@@ -1103,9 +1099,6 @@</span><br><span>             LOGP(DOML, LOGL_NOTICE, "Formatted O&M message too short\n");</span><br><span>          trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);</span><br><span>                 if (trx) {</span><br><span style="color: hsl(0, 100%, 40%);">-                      trx->mo.obj_inst.bts_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                 trx->mo.obj_inst.trx_nr = foh->obj_inst.trx_nr;</span><br><span style="color: hsl(0, 100%, 40%);">-                   trx->mo.obj_inst.ts_nr = 0xff;</span><br><span>                    oml_tx_failure_event_rep(&trx->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span>                                              "Formatted O&M message too short");</span><br><span>           }</span><br><span>@@ -1150,9 +1143,6 @@</span><br><span>                    foh->msg_type);</span><br><span>           trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);</span><br><span>                 if (trx) {</span><br><span style="color: hsl(0, 100%, 40%);">-                      trx->mo.obj_inst.bts_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                 trx->mo.obj_inst.trx_nr = foh->obj_inst.trx_nr;</span><br><span style="color: hsl(0, 100%, 40%);">-                   trx->mo.obj_inst.ts_nr = 0xff;</span><br><span>                    oml_tx_failure_event_rep(&trx->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span>                                              "unknown Formatted O&M "</span><br><span>                                               "msg_type 0x%02x",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12865">change 12865</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/12865"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Idfb80ccd6dd485d52dc006867fae3dde3fb005f3 </div>
<div style="display:none"> Gerrit-Change-Number: 12865 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.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: Pau Espin Pedrol <pespin@sysmocom.de> </div>