<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13698">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">common/oml.c: refactor OML msgb allocation in oml_tx_attr_resp()<br><br>There is no need to allocate a new OML message buffer before<br>handing the list of requested attributes.<br><br>Change-Id: Ib8c1f77aad784b6f5cbe888a5139d7afb456924d<br>---<br>M src/common/oml.c<br>1 file changed, 5 insertions(+), 5 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/98/13698/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 80d424f..df85fbe 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -255,16 +255,13 @@</span><br><span> static int oml_tx_attr_resp(struct gsm_bts *bts, const struct abis_om_fom_hdr *foh, const uint8_t *attr,</span><br><span>                             uint16_t attr_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct msgb *nmsg = oml_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *nmsg;</span><br><span>   uint8_t resp[MAX_VERSION_LENGTH * attr_len * 2]; /* heuristic for Attribute Response Info space requirements */</span><br><span>      int len;</span><br><span> </span><br><span>         LOGP(DOML, LOGL_INFO, "%s Tx Get Attribute Response\n",</span><br><span>         get_value_string(abis_nm_obj_class_names, foh->obj_class));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!nmsg)</span><br><span style="color: hsl(0, 100%, 40%);">-              return -NM_NACK_CANT_PERFORM;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>        switch (foh->obj_class) {</span><br><span>         case NM_OC_BTS:</span><br><span>              len = handle_attrs_bts(resp, bts, attr, attr_len);</span><br><span>@@ -280,10 +277,13 @@</span><br><span> </span><br><span>       if (len < 0) {</span><br><span>            LOGP(DOML, LOGL_ERROR, "Tx Get Attribute Response FAILED with %d\n", len);</span><br><span style="color: hsl(0, 100%, 40%);">-            msgb_free(nmsg);</span><br><span>             return len;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ nmsg = oml_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!nmsg)</span><br><span style="color: hsl(120, 100%, 40%);">+            return -NM_NACK_CANT_PERFORM;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      /* §9.4.64 Get Attribute Response Info */</span><br><span>   msgb_tl16v_put(nmsg, NM_ATT_GET_ARI, len, resp);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13698">change 13698</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/13698"/><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: Ib8c1f77aad784b6f5cbe888a5139d7afb456924d </div>
<div style="display:none"> Gerrit-Change-Number: 13698 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>