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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nanobts: use libosmocore's osmo_store*() for OML attr. patching<br><br>This slightly simplifies things by making endianness more obvious and<br>removing abstraction.<br><br>Change-Id: I28cfb09f224072db9889a89923a3da15a6070e2a<br>---<br>M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c<br>1 file changed, 3 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>index d674c18..be40410 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>@@ -25,15 +25,6 @@</span><br><span> #include <osmocom/bsc/abis_nm.h></span><br><span> #include <osmocom/bsc/gsm_timers.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void patch_16(uint8_t *data, const uint16_t val)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-     memcpy(data, &val, sizeof(val));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void patch_32(uint8_t *data, const uint32_t val)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   memcpy(data, &val, sizeof(val));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span> </span><br><span> struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts)</span><br><span> {</span><br><span>@@ -213,11 +204,11 @@</span><br><span>     msgb_tl16v_put(msgb, NM_ATT_IPACC_NSVCI, 2, buf);</span><br><span> </span><br><span>        /* remote udp port */</span><br><span style="color: hsl(0, 100%, 40%);">-   patch_16(&buf[0], htons(bts->gprs.nsvc[0].remote_port));</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_store16be(bts->gprs.nsvc[0].remote_port, &buf[0]);</span><br><span>       /* remote ip address */</span><br><span style="color: hsl(0, 100%, 40%);">- patch_32(&buf[2], htonl(bts->gprs.nsvc[0].remote_ip));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store32be(bts->gprs.nsvc[0].remote_ip, &buf[2]);</span><br><span>         /* local udp port */</span><br><span style="color: hsl(0, 100%, 40%);">-    patch_16(&buf[6], htons(bts->gprs.nsvc[0].local_port));</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_store16be(bts->gprs.nsvc[0].local_port, &buf[6]);</span><br><span>        msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_LINK_CFG, 8, buf);</span><br><span> </span><br><span>  return msgb;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13418">change 13418</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/13418"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I28cfb09f224072db9889a89923a3da15a6070e2a </div>
<div style="display:none"> Gerrit-Change-Number: 13418 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>