<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22685">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sndcp: Fix struct bit fields on big endian<br><br>Change-Id: I30014bf84e7a69fa3d85d542d03e41d56506beb7<br>---<br>M src/sgsn/gprs_sndcp.c<br>1 file changed, 17 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c</span><br><span>index 19d8712..b237bf9 100644</span><br><span>--- a/src/sgsn/gprs_sndcp.c</span><br><span>+++ b/src/sgsn/gprs_sndcp.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/endian.h></span><br><span> #include <osmocom/gprs/gprs_bssgp.h></span><br><span> </span><br><span> #include <osmocom/sgsn/debug.h></span><br><span>@@ -164,27 +165,43 @@</span><br><span> </span><br><span> /* Chapter 7.2: SN-PDU Formats */</span><br><span> struct sndcp_common_hdr {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span>         /* octet 1 */</span><br><span>        uint8_t nsapi:4;</span><br><span>     uint8_t more:1;</span><br><span>      uint8_t type:1;</span><br><span>      uint8_t first:1;</span><br><span>     uint8_t spare:1;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+  uint8_t spare:1, first:1, type:1, more:1, nsapi:4;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> /* PCOMP / DCOMP only exist in first fragment */</span><br><span> struct sndcp_comp_hdr {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span>       /* octet 2 */</span><br><span>        uint8_t pcomp:4;</span><br><span>     uint8_t dcomp:4;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+  uint8_t dcomp:4, pcomp:4;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> struct sndcp_udata_hdr {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span>   /* octet 3 */</span><br><span>        uint8_t npdu_high:4;</span><br><span>         uint8_t seg_nr:4;</span><br><span>    /* octet 4 */</span><br><span>        uint8_t npdu_low;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t seg_nr:4, npdu_high:4;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t npdu_low;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22685">change 22685</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-sgsn/+/22685"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I30014bf84e7a69fa3d85d542d03e41d56506beb7 </div>
<div style="display:none"> Gerrit-Change-Number: 22685 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>