diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-04 14:51:00 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-04 14:45:20 +0000 |
commit | 2a9cab649e90f85cc7b40440ad211438c8bb212f (patch) | |
tree | 537d6aba9eae304c41b7e23acdac89ca008bde30 /epan/dissectors/asn1/lte-rrc | |
parent | ab39fac52ea7448fd03ffe6d7d98947393b224c5 (diff) |
LTE RRC: add MBMS SIB messages to info column
Change-Id: Id238182ab19c9490d0e1cab852338fafdc2e1b66
Reviewed-on: https://code.wireshark.org/review/23385
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 | 24 | ||||
-rw-r--r-- | epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c | 12 |
2 files changed, 25 insertions, 11 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index 67adc854e8..adbe79922d 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -1330,26 +1330,26 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) #.FN_HDR SystemInformation - if (private_data_get_bcch_dl_sch_msg_br(actx) == FALSE) { + if (private_data_get_bcch_dl_sch_msg(actx) == FALSE) { col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformation ["); } #.FN_BODY SystemInformation %(DEFAULT_BODY)s - if (private_data_get_bcch_dl_sch_msg_br(actx) == FALSE) { + if (private_data_get_bcch_dl_sch_msg(actx) == FALSE) { col_append_str(actx->pinfo->cinfo, COL_INFO, " ]"); } #.FN_HDR SystemInformationBlockType1 - if (private_data_get_bcch_dl_sch_msg_br(actx) == FALSE) { + if (private_data_get_bcch_dl_sch_msg(actx) == FALSE) { col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformationBlockType1"); } #.FN_HDR SystemInformation-BR-r13 - private_data_set_bcch_dl_sch_msg_br(actx, TRUE); + private_data_set_bcch_dl_sch_msg(actx, TRUE); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformation-BR-r13 ["); #.FN_BODY SystemInformation-BR-r13 @@ -1359,9 +1359,23 @@ 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); + private_data_set_bcch_dl_sch_msg(actx, TRUE); col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformationBlockType1-BR-r13"); +#.FN_HDR SystemInformation-MBMS-r14 + + private_data_set_bcch_dl_sch_msg(actx, TRUE); + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformation-MBMS-r14 ["); + +#.FN_BODY SystemInformation-MBMS-r14 + +%(DEFAULT_BODY)s + col_append_str(actx->pinfo->cinfo, COL_INFO, " ]"); + +#.FN_HDR SystemInformationBlockType1-MBMS-r14 + + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformationBlockType1-MBMS-r14"); + #.FN_HDR SystemInformationBlockType2 col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB2"); 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 7b4ddbd655..ccbb88d179 100644 --- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c @@ -2593,7 +2593,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; + gboolean bcch_dl_sch_msg; } lte_rrc_private_data_t; /* Helper function to get or create a struct that will be actx->private_data */ @@ -2769,17 +2769,17 @@ 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) +/* Is top message a BCCH DL-SCH BR/MBMS */ +static gboolean private_data_get_bcch_dl_sch_msg(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; + return private_data->bcch_dl_sch_msg; } -static void private_data_set_bcch_dl_sch_msg_br(asn1_ctx_t *actx, gboolean is_br) +static void private_data_set_bcch_dl_sch_msg(asn1_ctx_t *actx, gboolean is_bcch_dl_sch) { 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; + private_data->bcch_dl_sch_msg = is_bcch_dl_sch; } /*****************************************************************************/ |