<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13521">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;">abis_nm.c: use abis_nm_ipa_magic from libosmocore<br><br>Change-Id: I051ae0550b5375a141e1bd4b3383a54302da83e1<br>---<br>M src/osmo-bsc/abis_nm.c<br>1 file changed, 4 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index 33535a4..a9b5aa5 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -2690,10 +2690,6 @@</span><br><span>     return abis_nm_sendmsg(bts, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* ip.access nanoBTS specific commands */</span><br><span style="color: hsl(0, 100%, 40%);">-static const char ipaccess_magic[] = "com.ipaccess";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int abis_nm_rx_ipacc(struct msgb *msg)</span><br><span> {</span><br><span>      struct in_addr addr;</span><br><span>@@ -2706,7 +2702,7 @@</span><br><span> </span><br><span>     foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      if (strncmp((char *)&oh->data[1], ipaccess_magic, idstrlen)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strncmp((char *)&oh->data[1], abis_nm_ipa_magic, idstrlen)) {</span><br><span>             LOGPFOH(DNM, LOGL_ERROR, foh, "id string is not com.ipaccess !?!\n");</span><br><span>              return -EINVAL;</span><br><span>      }</span><br><span>@@ -2819,9 +2815,9 @@</span><br><span>    oh->mdisc = ABIS_OM_MDISC_MANUF;</span><br><span> </span><br><span>      /* add the ip.access magic */</span><br><span style="color: hsl(0, 100%, 40%);">-   data = msgb_put(msg, sizeof(ipaccess_magic)+1);</span><br><span style="color: hsl(0, 100%, 40%);">- *data++ = sizeof(ipaccess_magic);</span><br><span style="color: hsl(0, 100%, 40%);">-       memcpy(data, ipaccess_magic, sizeof(ipaccess_magic));</span><br><span style="color: hsl(120, 100%, 40%);">+ data = msgb_put(msg, sizeof(abis_nm_ipa_magic)+1);</span><br><span style="color: hsl(120, 100%, 40%);">+    *data++ = sizeof(abis_nm_ipa_magic);</span><br><span style="color: hsl(120, 100%, 40%);">+  memcpy(data, abis_nm_ipa_magic, sizeof(abis_nm_ipa_magic));</span><br><span> </span><br><span>      /* fill the 12.21 FOM header */</span><br><span>      foh = (struct abis_om_fom_hdr *) msgb_put(msg, sizeof(*foh));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13521">change 13521</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/13521"/><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: I051ae0550b5375a141e1bd4b3383a54302da83e1 </div>
<div style="display:none"> Gerrit-Change-Number: 13521 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </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>