<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17049">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_rlcmac: add dissection of NAS container<br><br>Port from wireshark.git 575e4df4aa3392ffd09ca372859573f09f0a5c57<br><br>Ported-by: Pau Espin Pedrol <pespin@sysmocom.de><br>Change-Id: I2a05a057b6f441364502a96f9f34872c7e251a36<br>---<br>M src/gsm_rlcmac.cpp<br>M src/gsm_rlcmac.h<br>2 files changed, 20 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp</span><br><span>index 39f328d..4550c47 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -4024,10 +4024,16 @@</span><br><span> CSN_DESCR_END (PHO_TimingAdvance_t)</span><br><span> </span><br><span> static const</span><br><span style="color: hsl(0, 100%, 40%);">-CSN_DESCR_BEGIN(NAS_Container_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (NAS_Container_t, NAS_ContainerLength, 7),</span><br><span style="color: hsl(0, 100%, 40%);">- M_VAR_ARRAY (NAS_Container_t, NAS_Container, NAS_ContainerLength, 0),</span><br><span style="color: hsl(0, 100%, 40%);">-CSN_DESCR_END (NAS_Container_t)</span><br><span style="color: hsl(120, 100%, 40%);">+CSN_DESCR_BEGIN(NAS_Container_For_PS_HO_t)</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, NAS_ContainerLength, 7),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, Spare_1a, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, Spare_1b, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, Spare_1c, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, Old_XID, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, Spare_1e, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, Type_of_Ciphering_Algo, 3),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NAS_Container_For_PS_HO_t, IOV_UI_value, 32),</span><br><span style="color: hsl(120, 100%, 40%);">+CSN_DESCR_END (NAS_Container_For_PS_HO_t)</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(PS_HandoverTo_UTRAN_Payload_t)</span><br><span>@@ -4080,7 +4086,7 @@</span><br><span> M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, PHO_RadioResources, PHO_RadioResources_t),</span><br><span> </span><br><span> M_NEXT_EXIST (PS_HandoverTo_A_GB_ModePayload_t, Exist_NAS_Container, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, NAS_Container, NAS_Container_t),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, NAS_Container, NAS_Container_For_PS_HO_t),</span><br><span> CSN_DESCR_END (PS_HandoverTo_A_GB_ModePayload_t)</span><br><span> </span><br><span> static const</span><br><span>diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h</span><br><span>index b05483c..461fda3 100644</span><br><span>--- a/src/gsm_rlcmac.h</span><br><span>+++ b/src/gsm_rlcmac.h</span><br><span>@@ -415,7 +415,6 @@</span><br><span> #define MAX_ALLOCATION_BITMAP_LENGTH 128 /* max length of Fixed Allocation bitmap in BITS (2^7) */</span><br><span> #define MAX_VAR_LENGTH_BITMAP_LENGTH 176 /* max length ever possible for variable length fixed allocation bitmap */</span><br><span> #define MAX_RRC_CONTAINER_LENGTH 255</span><br><span style="color: hsl(0, 100%, 40%);">-#define MAX_NAS_CONTAINER_LENGTH 127</span><br><span> </span><br><span> </span><br><span> typedef struct</span><br><span>@@ -4693,8 +4692,14 @@</span><br><span> typedef struct</span><br><span> {</span><br><span> guint8 NAS_ContainerLength;</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 NAS_Container[MAX_NAS_CONTAINER_LENGTH];</span><br><span style="color: hsl(0, 100%, 40%);">-} NAS_Container_t;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 Spare_1a;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 Spare_1b;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 Spare_1c;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 Old_XID;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 Spare_1e;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 Type_of_Ciphering_Algo;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 IOV_UI_value;</span><br><span style="color: hsl(120, 100%, 40%);">+} NAS_Container_For_PS_HO_t;</span><br><span> </span><br><span> typedef struct</span><br><span> {</span><br><span>@@ -4740,7 +4745,7 @@</span><br><span> {</span><br><span> PHO_RadioResources_t PHO_RadioResources;</span><br><span> guint8 Exist_NAS_Container;</span><br><span style="color: hsl(0, 100%, 40%);">- NAS_Container_t NAS_Container;</span><br><span style="color: hsl(120, 100%, 40%);">+ NAS_Container_For_PS_HO_t NAS_Container;</span><br><span> } PS_HandoverTo_A_GB_ModePayload_t;</span><br><span> </span><br><span> typedef struct</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17049">change 17049</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/+/17049"/><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: I2a05a057b6f441364502a96f9f34872c7e251a36 </div>
<div style="display:none"> Gerrit-Change-Number: 17049 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>