<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12868">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
Max: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OML: Reduce code duplication in down_mom/down_fom<br><br>Simply use a "mo" variable on the stack rather than having duplicate<br>but otherwise identical calls to oml_tx_failure_event_rep()<br><br>Change-Id: Ibe6c79e95405b13d041047549d2ffa39aa355eb2<br>---<br>M src/common/oml.c<br>1 file changed, 10 insertions(+), 18 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 313ff96..ad8ab81 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -1089,6 +1089,7 @@</span><br><span> {</span><br><span> struct abis_om_fom_hdr *foh = msgb_l3(msg);</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_abis_mo *mo = &bts->mo;</span><br><span> int ret;</span><br><span> </span><br><span> if (msgb_l2len(msg) < sizeof(*foh)) {</span><br><span>@@ -1136,16 +1137,10 @@</span><br><span> break;</span><br><span> default:</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%);">- oml_tx_failure_event_rep(&trx->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(0, 100%, 40%);">- "unknown Formatted O&M "</span><br><span style="color: hsl(0, 100%, 40%);">- "msg_type 0x%02x",</span><br><span style="color: hsl(0, 100%, 40%);">- foh->msg_type);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(0, 100%, 40%);">- "unknown Formatted O&M "</span><br><span style="color: hsl(0, 100%, 40%);">- "msg_type 0x%02x",</span><br><span style="color: hsl(0, 100%, 40%);">- foh->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx)</span><br><span style="color: hsl(120, 100%, 40%);">+ mo = &trx->mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(mo, OSMO_EVT_MAJ_UKWN_MSG, "unknown Formatted O&M "</span><br><span style="color: hsl(120, 100%, 40%);">+ "msg_type 0x%02x", 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>@@ -1371,6 +1366,7 @@</span><br><span> static int down_mom(struct gsm_bts *bts, struct msgb *msg)</span><br><span> {</span><br><span> struct abis_om_hdr *oh = msgb_l2(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_abis_mo *mo = &bts->mo;</span><br><span> struct abis_om_fom_hdr *foh;</span><br><span> struct gsm_bts_trx *trx;</span><br><span> uint8_t idstrlen = oh->data[0];</span><br><span>@@ -1414,14 +1410,10 @@</span><br><span> break;</span><br><span> default:</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%);">- oml_tx_failure_event_rep(&trx->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(0, 100%, 40%);">- "unknown Manufacturer O&M msg_type 0x%02x",</span><br><span style="color: hsl(0, 100%, 40%);">- foh->msg_type);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(0, 100%, 40%);">- "unknown Manufacturer O&M msg_type 0x%02x",</span><br><span style="color: hsl(0, 100%, 40%);">- foh->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx)</span><br><span style="color: hsl(120, 100%, 40%);">+ mo = &trx->mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(mo, OSMO_EVT_MAJ_UKWN_MSG, "unknown Manufacturer O&M "</span><br><span style="color: hsl(120, 100%, 40%);">+ "msg_type 0x%02x", 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12868">change 12868</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/12868"/><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: Ibe6c79e95405b13d041047549d2ffa39aa355eb2 </div>
<div style="display:none"> Gerrit-Change-Number: 12868 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>