<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17044">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_rlcmac: Enhance dissection of PSI1<br><br>Port of wireshark.git 7e9411fee3a101b53693210f7a38789fd4c70ba2.<br><br>Ported-by: Pau Espin Pedrol <pespin@sysmocom.de><br>Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212<br>---<br>M src/gsm_rlcmac.cpp<br>M src/gsm_rlcmac.h<br>2 files changed, 39 insertions(+), 26 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/44/17044/1</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 ed7c745..5889471 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -576,8 +576,8 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(GPRS_Cell_Options_t)</span><br><span> M_UINT (GPRS_Cell_Options_t, NMO, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT_OFFSET(GPRS_Cell_Options_t, T3168, 3, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT_OFFSET(GPRS_Cell_Options_t, T3192, 3, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (GPRS_Cell_Options_t, T3168, 3),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (GPRS_Cell_Options_t, T3192, 3),</span><br><span> M_UINT (GPRS_Cell_Options_t, DRX_TIMER_MAX, 3),</span><br><span> M_BIT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE),</span><br><span> M_BIT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE),</span><br><span>@@ -4167,12 +4167,18 @@</span><br><span> </span><br><span> </span><br><span> /*< Packet System Information Type 1 message content >*/</span><br><span style="color: hsl(120, 100%, 40%);">+CSN_DESCR_BEGIN(PSI1_AdditionsR6_t)</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_AdditionsR6_t, LB_MS_TXPWR_MAX_CCH, 5),</span><br><span style="color: hsl(120, 100%, 40%);">+CSN_DESCR_END (PSI1_AdditionsR6_t)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const</span><br><span style="color: hsl(0, 100%, 40%);">-CSN_DESCR_BEGIN(PSI1_AdditionsR99_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_AdditionsR99_t, MSCR, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_AdditionsR99_t, SGSNR, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1),</span><br><span style="color: hsl(0, 100%, 40%);">-CSN_DESCR_END (PSI1_AdditionsR99_t)</span><br><span style="color: hsl(120, 100%, 40%);">+CSN_DESCR_BEGIN (PSI1_AdditionsR99_t)</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_AdditionsR99_t, MSCR, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_AdditionsR99_t, SGSNR, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_NEXT_EXIST_OR_NULL (PSI1_AdditionsR99_t, Exist_AdditionsR6, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_TYPE (PSI1_AdditionsR99_t, AdditionsR6, PSI1_AdditionsR6_t),</span><br><span style="color: hsl(120, 100%, 40%);">+CSN_DESCR_END (PSI1_AdditionsR99_t)</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(PCCCH_Organization_t)</span><br><span>@@ -4185,26 +4191,26 @@</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(PSI1_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, MESSAGE_TYPE, 6),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, PAGE_MODE, 2),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, MESSAGE_TYPE, 6),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, PAGE_MODE, 2),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, PSI_COUNT_LR, 6),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, PSI_COUNT_LR, 6),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, PSI_COUNT_HR, 4),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, PSI_COUNT_HR, 4),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, MEASUREMENT_ORDER, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PSI1_t, PSI_STATUS_IND, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, MEASUREMENT_ORDER, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSI1_t, PSI_STATUS_IND, 1),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- M_NEXT_EXIST (PSI1_t, Exist_AdditionsR99, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_NEXT_EXIST_OR_NULL (PSI1_t, Exist_AdditionsR99, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t),</span><br><span> </span><br><span> M_PADDING_BITS(PSI1_t),</span><br><span> CSN_DESCR_END (PSI1_t)</span><br><span>diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h</span><br><span>index 90c5bfd..b05483c 100644</span><br><span>--- a/src/gsm_rlcmac.h</span><br><span>+++ b/src/gsm_rlcmac.h</span><br><span>@@ -2492,9 +2492,16 @@</span><br><span> </span><br><span> typedef struct</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 MSCR;</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 SGSNR;</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 BandIndicator;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 LB_MS_TXPWR_MAX_CCH;</span><br><span style="color: hsl(120, 100%, 40%);">+} PSI1_AdditionsR6_t;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+typedef struct</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 MSCR;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 SGSNR;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 BandIndicator;</span><br><span style="color: hsl(120, 100%, 40%);">+ gboolean Exist_AdditionsR6;</span><br><span style="color: hsl(120, 100%, 40%);">+ PSI1_AdditionsR6_t AdditionsR6;</span><br><span> } PSI1_AdditionsR99_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/+/17044">change 17044</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/+/17044"/><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: I89d488c1f349c556e40a9d13895b1309d5140212 </div>
<div style="display:none"> Gerrit-Change-Number: 17044 </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>