<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15955">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm: gsm_04_08.h: Allow accessing classmark2 as struct instead of uint32_t<br><br>New fields are put inside a union to keep backward compatibility with<br>potential older users of the struct.<br><br>Change-Id: I235635800c0de47b1e2b9ec9c7191418f6003554<br>---<br>M include/osmocom/gsm/protocol/gsm_04_08.h<br>1 file changed, 28 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/15955/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>index 68ec4e3..8370eca 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>@@ -889,13 +889,25 @@</span><br><span> #if OSMO_IS_LITTLE_ENDIAN</span><br><span>       uint8_t spare:4,</span><br><span>              key_seq:4;</span><br><span style="color: hsl(0, 100%, 40%);">-     uint32_t classmark2;</span><br><span style="color: hsl(120, 100%, 40%);">+  union {</span><br><span style="color: hsl(120, 100%, 40%);">+               uint32_t classmark2;  /* Backward compatibility */</span><br><span style="color: hsl(120, 100%, 40%);">+            struct {</span><br><span style="color: hsl(120, 100%, 40%);">+                      uint8_t cm2_len;</span><br><span style="color: hsl(120, 100%, 40%);">+                      struct gsm48_classmark2 cm2;</span><br><span style="color: hsl(120, 100%, 40%);">+          };</span><br><span style="color: hsl(120, 100%, 40%);">+    };</span><br><span>   uint8_t mi_len;</span><br><span>      uint8_t mi[0];</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span> /* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span>       uint8_t key_seq:4, spare:4;</span><br><span style="color: hsl(0, 100%, 40%);">-     uint32_t classmark2;</span><br><span style="color: hsl(120, 100%, 40%);">+  union {</span><br><span style="color: hsl(120, 100%, 40%);">+               uint32_t classmark2;  /* Backward compatibility */</span><br><span style="color: hsl(120, 100%, 40%);">+            struct {</span><br><span style="color: hsl(120, 100%, 40%);">+                      uint8_t cm2_len;</span><br><span style="color: hsl(120, 100%, 40%);">+                      struct gsm48_classmark2 cm2;</span><br><span style="color: hsl(120, 100%, 40%);">+          };</span><br><span style="color: hsl(120, 100%, 40%);">+    };</span><br><span>   uint8_t mi_len;</span><br><span>      uint8_t mi[0];</span><br><span> #endif</span><br><span>@@ -1027,15 +1039,26 @@</span><br><span> #if OSMO_IS_LITTLE_ENDIAN</span><br><span>      uint8_t cm_service_type : 4,</span><br><span>                  cipher_key_seq  : 4;</span><br><span style="color: hsl(0, 100%, 40%);">-   /* length + 3 bytes */</span><br><span style="color: hsl(0, 100%, 40%);">-  uint32_t classmark;</span><br><span style="color: hsl(120, 100%, 40%);">+   union {</span><br><span style="color: hsl(120, 100%, 40%);">+               uint32_t classmark;  /* Backward compatibility */</span><br><span style="color: hsl(120, 100%, 40%);">+             struct {</span><br><span style="color: hsl(120, 100%, 40%);">+                      uint8_t cm2_len;</span><br><span style="color: hsl(120, 100%, 40%);">+                      struct gsm48_classmark2 classmark2;</span><br><span style="color: hsl(120, 100%, 40%);">+           };</span><br><span style="color: hsl(120, 100%, 40%);">+    };</span><br><span>   uint8_t mi_len;</span><br><span>      uint8_t mi[0];</span><br><span>       /* optional priority level */</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span> /* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span>        uint8_t cipher_key_seq:4, cm_service_type:4;</span><br><span style="color: hsl(0, 100%, 40%);">-    uint32_t classmark;</span><br><span style="color: hsl(120, 100%, 40%);">+   union {</span><br><span style="color: hsl(120, 100%, 40%);">+               uint32_t classmark;  /* Backward compatibility */</span><br><span style="color: hsl(120, 100%, 40%);">+             struct {</span><br><span style="color: hsl(120, 100%, 40%);">+                      uint8_t cm2_len;</span><br><span style="color: hsl(120, 100%, 40%);">+                      struct gsm48_classmark2 classmark2;</span><br><span style="color: hsl(120, 100%, 40%);">+           };</span><br><span style="color: hsl(120, 100%, 40%);">+    };</span><br><span>   uint8_t mi_len;</span><br><span>      uint8_t mi[0];</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/15955">change 15955</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/libosmocore/+/15955"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I235635800c0de47b1e2b9ec9c7191418f6003554 </div>
<div style="display:none"> Gerrit-Change-Number: 15955 </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-MessageType: newchange </div>