diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-23 16:10:09 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-23 15:29:09 +0000 |
| commit | dd5f3c96c300688cb996e52c163fb3f5a614706c (patch) | |
| tree | 9064350977ad0f4448dcb820772ccd9831e1516b /epan/dissectors/asn1/lte-rrc | |
| parent | 45db2fbe1e00eff087b01b4b69450d3e7d013185 (diff) | |
LTE RRC: fix display of info column when receiving a BR SIB
Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0
Reviewed-on: https://code.wireshark.org/review/16098
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/lte-rrc')
| -rw-r--r-- | epan/dissectors/asn1/lte-rrc/lte-rrc.cnf | 14 | ||||
| -rw-r--r-- | epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c | 14 |
2 files changed, 25 insertions, 3 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index d06d1b29cc..16cd043740 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -1285,19 +1285,26 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) #.FN_HDR SystemInformation - col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation [ "); + if (private_data_get_bcch_dl_sch_msg_br(actx) == FALSE) { + col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation [ "); + } #.FN_BODY SystemInformation %(DEFAULT_BODY)s - col_append_str(actx->pinfo->cinfo, COL_INFO, "]"); + if (private_data_get_bcch_dl_sch_msg_br(actx) == FALSE) { + col_append_str(actx->pinfo->cinfo, COL_INFO, "]"); + } #.FN_HDR SystemInformationBlockType1 - col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1"); + if (private_data_get_bcch_dl_sch_msg_br(actx) == FALSE) { + col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1"); + } #.FN_HDR SystemInformation-BR-r13 + private_data_set_bcch_dl_sch_msg_br(actx, TRUE); col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BR-r13 [ "); #.FN_BODY SystemInformation-BR-r13 @@ -1307,6 +1314,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) #.FN_HDR SystemInformationBlockType1-BR-r13 + private_data_set_bcch_dl_sch_msg_br(actx, TRUE); col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1-BR-r13"); #.FN_HDR SystemInformationBlockType2 diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c index 7917f64599..4771f3dd11 100644 --- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c @@ -2383,6 +2383,7 @@ typedef struct lte_rrc_private_data_t pdcp_security_info_t pdcp_security; meas_capabilities_item_band_mappings_t meas_capabilities_item_band_mappings; simult_pucch_pusch_cell_type cell_type; + gboolean bcch_dl_sch_msg_br; } lte_rrc_private_data_t; /* Helper function to get or create a struct that will be actx->private_data */ @@ -2558,6 +2559,19 @@ static void private_data_set_simult_pucch_pusch_cell_type(asn1_ctx_t *actx, simu private_data->cell_type = cell_type; } +/* Is top message a BCCH DL-SCH BR */ +static gboolean private_data_get_bcch_dl_sch_msg_br(asn1_ctx_t *actx) +{ + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return private_data->bcch_dl_sch_msg_br; +} + +static void private_data_set_bcch_dl_sch_msg_br(asn1_ctx_t *actx, gboolean is_br) +{ + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + private_data->bcch_dl_sch_msg_br = is_br; +} + /*****************************************************************************/ |