<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26328">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_nm: use struct sdp_firmware from libosmocore<br><br>abis_nm locally declares its own struct for the ipaccess firmware<br>header, even though libosmocore defines it as well. Lets use the<br>definition from libosmocore.<br><br>Change-Id: I69cb45fc40bd20ea2533cc8cd6a68363b59cc408<br>---<br>M src/osmo-bsc/abis_nm.c<br>1 file changed, 6 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/26328/1</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 aeb4ba3..1c21bc2 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -51,6 +51,7 @@</span><br><span> #include <osmocom/bsc/bts.h></span><br><span> #include <osmocom/bsc/nm_common_fsm.h></span><br><span> #include <osmocom/gsm/bts_features.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/ipaccess.h></span><br><span> </span><br><span> #define OM_ALLOC_SIZE           1024</span><br><span> #define OM_HEADROOM_SIZE        128</span><br><span>@@ -1342,13 +1343,6 @@</span><br><span>         return abis_nm_sendmsg(sw->bts, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct sdp_firmware {</span><br><span style="color: hsl(0, 100%, 40%);">-  char magic[4];</span><br><span style="color: hsl(0, 100%, 40%);">-  char more_magic[4];</span><br><span style="color: hsl(0, 100%, 40%);">-     unsigned int header_length;</span><br><span style="color: hsl(0, 100%, 40%);">-     unsigned int file_length;</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int parse_sdp_header(struct abis_nm_sw *sw)</span><br><span> {</span><br><span>      const struct gsm_abis_mo *mo = &sw->bts->mo;</span><br><span>@@ -1368,13 +1362,15 @@</span><br><span>     }</span><br><span> </span><br><span>        if (firmware_header.more_magic[0] != 0x10 ||</span><br><span style="color: hsl(0, 100%, 40%);">-        firmware_header.more_magic[1] != 0x02 ||</span><br><span style="color: hsl(0, 100%, 40%);">-        firmware_header.more_magic[2] != 0x00 ||</span><br><span style="color: hsl(0, 100%, 40%);">-        firmware_header.more_magic[3] != 0x00) {</span><br><span style="color: hsl(120, 100%, 40%);">+      firmware_header.more_magic[1] != 0x02) {</span><br><span>                 LOGPMO(mo, DNM, LOGL_ERROR, "The more magic number is wrong.\n");</span><br><span>          return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (firmware_header.more_more_magic != 0x0000) {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGPMO(mo, DNM, LOGL_ERROR, "The more more magic number is wrong.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+              return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> </span><br><span>        if (fstat(sw->fd, &stat) == -1) {</span><br><span>             LOGPMO(mo, DNM, LOGL_ERROR, "Could not stat the file.\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26328">change 26328</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/c/osmo-bsc/+/26328"/><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-Change-Id: I69cb45fc40bd20ea2533cc8cd6a68363b59cc408 </div>
<div style="display:none"> Gerrit-Change-Number: 26328 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>