From 9c2cbc842acbd05ca6c42750cef52e81eb246bdd Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Tue, 26 Jul 2022 11:56:02 +0000 Subject: [PATCH] PDCP_NR: Show direction in more sequence analysis expert output --- epan/dissectors/packet-pdcp-nr.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c index 20a334fc11..0094edfc89 100644 --- a/epan/dissectors/packet-pdcp-nr.c +++ b/epan/dissectors/packet-pdcp-nr.c @@ -120,9 +120,11 @@ static int ett_pdcp_nr_sequence_analysis = -1; static int ett_pdcp_report_bitmap = -1; static int ett_pdcp_security = -1; -static expert_field ei_pdcp_nr_sequence_analysis_wrong_sequence_number = EI_INIT; +static expert_field ei_pdcp_nr_sequence_analysis_wrong_sequence_number_ul = EI_INIT; +static expert_field ei_pdcp_nr_sequence_analysis_wrong_sequence_number_dl = EI_INIT; static expert_field ei_pdcp_nr_reserved_bits_not_zero = EI_INIT; -static expert_field ei_pdcp_nr_sequence_analysis_sn_repeated = EI_INIT; +static expert_field ei_pdcp_nr_sequence_analysis_sn_repeated_ul = EI_INIT; +static expert_field ei_pdcp_nr_sequence_analysis_sn_repeated_dl = EI_INIT; static expert_field ei_pdcp_nr_sequence_analysis_sn_missing_ul = EI_INIT; static expert_field ei_pdcp_nr_sequence_analysis_sn_missing_dl = EI_INIT; static expert_field ei_pdcp_nr_digest_wrong = EI_INIT; @@ -908,7 +910,10 @@ static void addBearerSequenceInfo(pdcp_sequence_report_in_frame *p, ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_nr_sequence_analysis_repeated, tvb, 0, 0, TRUE); proto_item_set_generated(ti); - expert_add_info_format(pinfo, ti, &ei_pdcp_nr_sequence_analysis_sn_repeated, + expert_add_info_format(pinfo, ti, + (p_pdcp_nr_info->direction == PDCP_NR_DIRECTION_UPLINK) ? + &ei_pdcp_nr_sequence_analysis_sn_repeated_ul : + &ei_pdcp_nr_sequence_analysis_sn_repeated_dl, "PDCP SN (%u) repeated for %s for UE %u (%s-%u)", p->firstSN, val_to_str_const(p_pdcp_nr_info->direction, direction_vals, "Unknown"), @@ -921,7 +926,10 @@ static void addBearerSequenceInfo(pdcp_sequence_report_in_frame *p, default: /* Incorrect sequence number */ - expert_add_info_format(pinfo, ti_expected_sn, &ei_pdcp_nr_sequence_analysis_wrong_sequence_number, + expert_add_info_format(pinfo, ti_expected_sn, + (p_pdcp_nr_info->direction == PDCP_NR_DIRECTION_UPLINK) ? + &ei_pdcp_nr_sequence_analysis_wrong_sequence_number_ul : + &ei_pdcp_nr_sequence_analysis_wrong_sequence_number_dl, "Wrong Sequence Number for %s on UE %u (%s-%u) - got %u, expected %u", val_to_str_const(p_pdcp_nr_info->direction, direction_vals, "Unknown"), p_pdcp_nr_info->ueid, @@ -2974,8 +2982,10 @@ void proto_register_pdcp_nr(void) static ei_register_info ei[] = { { &ei_pdcp_nr_sequence_analysis_sn_missing_ul, { "pdcp-nr.sequence-analysis.sn-missing-ul", PI_SEQUENCE, PI_WARN, "UL PDCP SNs missing", EXPFILL }}, { &ei_pdcp_nr_sequence_analysis_sn_missing_dl, { "pdcp-nr.sequence-analysis.sn-missing-dl", PI_SEQUENCE, PI_WARN, "DL PDCP SNs missing", EXPFILL }}, - { &ei_pdcp_nr_sequence_analysis_sn_repeated, { "pdcp-nr.sequence-analysis.sn-repeated", PI_SEQUENCE, PI_WARN, "PDCP SN repeated", EXPFILL }}, - { &ei_pdcp_nr_sequence_analysis_wrong_sequence_number, { "pdcp-nr.sequence-analysis.wrong-sequence-number", PI_SEQUENCE, PI_WARN, "Wrong Sequence Number", EXPFILL }}, + { &ei_pdcp_nr_sequence_analysis_sn_repeated_ul, { "pdcp-nr.sequence-analysis.sn-repeated-ul", PI_SEQUENCE, PI_WARN, "UL PDCP SNs repeated", EXPFILL }}, + { &ei_pdcp_nr_sequence_analysis_sn_repeated_dl, { "pdcp-nr.sequence-analysis.sn-repeated-dl", PI_SEQUENCE, PI_WARN, "DL PDCP SNs repeated", EXPFILL }}, + { &ei_pdcp_nr_sequence_analysis_wrong_sequence_number_ul, { "pdcp-nr.sequence-analysis.wrong-sequence-number-ul", PI_SEQUENCE, PI_WARN, "UL Wrong Sequence Number", EXPFILL }}, + { &ei_pdcp_nr_sequence_analysis_wrong_sequence_number_dl, { "pdcp-nr.sequence-analysis.wrong-sequence-number-dl", PI_SEQUENCE, PI_WARN, "DL Wrong Sequence Number", EXPFILL }}, { &ei_pdcp_nr_reserved_bits_not_zero, { "pdcp-nr.reserved-bits-not-zero", PI_MALFORMED, PI_ERROR, "Reserved bits not zero", EXPFILL }}, { &ei_pdcp_nr_digest_wrong, { "pdcp-nr.maci-wrong", PI_SEQUENCE, PI_ERROR, "MAC-I doesn't match expected value", EXPFILL }}, { &ei_pdcp_nr_unknown_udp_framing_tag, { "pdcp-nr.unknown-udp-framing-tag", PI_UNDECODED, PI_WARN, "Unknown UDP framing tag, aborting dissection", EXPFILL }},