<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16994">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">csn1: Update M_NULL CSN_DESCR to match wireshark<br><br>Port from iwireshark.git commit cc6d4341e65ef2e8d8488fe0ac0f236ece0dd844.<br>It looks like it makes no difference to us now, but other EGPRS messages<br>may use it in the future.<br><br>Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8<br>---<br>M src/csn1.cpp<br>M src/csn1.h<br>M src/gsm_rlcmac.cpp<br>3 files changed, 6 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/16994/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/csn1.cpp b/src/csn1.cpp</span><br><span>index 6203a44..9ddb9c1 100644</span><br><span>--- a/src/csn1.cpp</span><br><span>+++ b/src/csn1.cpp</span><br><span>@@ -190,6 +190,7 @@</span><br><span> </span><br><span>       case CSN_NULL:</span><br><span>       { /* Empty member! */</span><br><span style="color: hsl(120, 100%, 40%);">+        bit_offset += pDescr->i;</span><br><span>         pDescr++;</span><br><span>         break;</span><br><span>       }</span><br><span>@@ -631,6 +632,7 @@</span><br><span> </span><br><span>           case CSN_NULL:</span><br><span>           { /* Empty member! */</span><br><span style="color: hsl(120, 100%, 40%);">+            bit_offset += pDescr->i;</span><br><span>             pDescr++;</span><br><span>             break;</span><br><span>           }</span><br><span>diff --git a/src/csn1.h b/src/csn1.h</span><br><span>index 1015e69..39e6625 100644</span><br><span>--- a/src/csn1.h</span><br><span>+++ b/src/csn1.h</span><br><span>@@ -592,8 +592,8 @@</span><br><span> #define M_PADDING_BITS(_STRUCT)\</span><br><span>         {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {(StreamSerializeFcn_t)0}}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define M_NULL(_STRUCT, _MEMBER)\</span><br><span style="color: hsl(0, 100%, 40%);">-        {CSN_NULL, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}}</span><br><span style="color: hsl(120, 100%, 40%);">+#define M_NULL(_STRUCT, _MEMBER, _SKIP_BITS)\</span><br><span style="color: hsl(120, 100%, 40%);">+        {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}}</span><br><span> </span><br><span> #define M_THIS_EXIST(_STRUCT)\</span><br><span>         {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {(StreamSerializeFcn_t)0}}</span><br><span>diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp</span><br><span>index 339279c..c1d3b97 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -605,7 +605,7 @@</span><br><span> static const</span><br><span> CSN_ChoiceElement_t SI13_PBCCH_Description_Channel[] =</span><br><span> {/* this one is used in SI13*/</span><br><span style="color: hsl(0, 100%, 40%);">-  {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy)},/*Default to BCCH carrier*/</span><br><span style="color: hsl(120, 100%, 40%);">+  {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy, 0)},/*Default to BCCH carrier*/</span><br><span>   {2, 0x01 , M_UINT(PBCCH_Description_t, u.ARFCN, 10)},</span><br><span>   {1, 0x01 , M_UINT(PBCCH_Description_t, u.MAIO, 6)},</span><br><span> };</span><br><span>@@ -3064,7 +3064,7 @@</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN        (Delete_All_Stored_Individual_Priorities_t)</span><br><span style="color: hsl(0, 100%, 40%);">-  M_NULL               (Delete_All_Stored_Individual_Priorities_t, dummy),</span><br><span style="color: hsl(120, 100%, 40%);">+  M_NULL               (Delete_All_Stored_Individual_Priorities_t, dummy, 0),</span><br><span> CSN_DESCR_END          (Delete_All_Stored_Individual_Priorities_t)</span><br><span> </span><br><span> static const</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16994">change 16994</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-pcu/+/16994"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 </div>
<div style="display:none"> Gerrit-Change-Number: 16994 </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>