This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17044 ) Change subject: gsm_rlcmac: Enhance dissection of PSI1 ...................................................................... gsm_rlcmac: Enhance dissection of PSI1 Port of wireshark.git 7e9411fee3a101b53693210f7a38789fd4c70ba2. Ported-by: Pau Espin Pedrol <pespin at sysmocom.de> Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 39 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index ed7c745..5889471 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -576,8 +576,8 @@ static const CSN_DESCR_BEGIN(GPRS_Cell_Options_t) M_UINT (GPRS_Cell_Options_t, NMO, 2), - M_UINT_OFFSET(GPRS_Cell_Options_t, T3168, 3, 1), - M_UINT_OFFSET(GPRS_Cell_Options_t, T3192, 3, 1), + M_UINT (GPRS_Cell_Options_t, T3168, 3), + M_UINT (GPRS_Cell_Options_t, T3192, 3), M_UINT (GPRS_Cell_Options_t, DRX_TIMER_MAX, 3), M_BIT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE), M_BIT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE), @@ -4167,12 +4167,18 @@ /*< Packet System Information Type 1 message content >*/ +CSN_DESCR_BEGIN(PSI1_AdditionsR6_t) + M_UINT (PSI1_AdditionsR6_t, LB_MS_TXPWR_MAX_CCH, 5), +CSN_DESCR_END (PSI1_AdditionsR6_t) + static const -CSN_DESCR_BEGIN(PSI1_AdditionsR99_t) - M_UINT (PSI1_AdditionsR99_t, MSCR, 1), - M_UINT (PSI1_AdditionsR99_t, SGSNR, 1), - M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1), -CSN_DESCR_END (PSI1_AdditionsR99_t) +CSN_DESCR_BEGIN (PSI1_AdditionsR99_t) + M_UINT (PSI1_AdditionsR99_t, MSCR, 1), + M_UINT (PSI1_AdditionsR99_t, SGSNR, 1), + M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1), + M_NEXT_EXIST_OR_NULL (PSI1_AdditionsR99_t, Exist_AdditionsR6, 1), + M_TYPE (PSI1_AdditionsR99_t, AdditionsR6, PSI1_AdditionsR6_t), +CSN_DESCR_END (PSI1_AdditionsR99_t) static const CSN_DESCR_BEGIN(PCCCH_Organization_t) @@ -4185,26 +4191,26 @@ static const CSN_DESCR_BEGIN(PSI1_t) - M_UINT (PSI1_t, MESSAGE_TYPE, 6), - M_UINT (PSI1_t, PAGE_MODE, 2), + M_UINT (PSI1_t, MESSAGE_TYPE, 6), + M_UINT (PSI1_t, PAGE_MODE, 2), - M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3), - M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4), - M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4), - M_UINT (PSI1_t, PSI_COUNT_LR, 6), + M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3), + M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4), + M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4), + M_UINT (PSI1_t, PSI_COUNT_LR, 6), - M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1), - M_UINT (PSI1_t, PSI_COUNT_HR, 4), + M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1), + M_UINT (PSI1_t, PSI_COUNT_HR, 4), - M_UINT (PSI1_t, MEASUREMENT_ORDER, 1), - M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t), - M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t), - M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t), - M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t), - M_UINT (PSI1_t, PSI_STATUS_IND, 1), + M_UINT (PSI1_t, MEASUREMENT_ORDER, 1), + M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t), + M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t), + M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t), + M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t), + M_UINT (PSI1_t, PSI_STATUS_IND, 1), - M_NEXT_EXIST (PSI1_t, Exist_AdditionsR99, 1), - M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t), + M_NEXT_EXIST_OR_NULL (PSI1_t, Exist_AdditionsR99, 1), + M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t), M_PADDING_BITS(PSI1_t), CSN_DESCR_END (PSI1_t) diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 90c5bfd..b05483c 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -2492,9 +2492,16 @@ typedef struct { - guint8 MSCR; - guint8 SGSNR; - guint8 BandIndicator; + guint8 LB_MS_TXPWR_MAX_CCH; +} PSI1_AdditionsR6_t; + +typedef struct +{ + guint8 MSCR; + guint8 SGSNR; + guint8 BandIndicator; + gboolean Exist_AdditionsR6; + PSI1_AdditionsR6_t AdditionsR6; } PSI1_AdditionsR99_t; typedef struct -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212 Gerrit-Change-Number: 17044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200128/2c21ee19/attachment.htm>