diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2019-01-23 16:59:46 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2019-01-23 21:45:49 +0000 |
| commit | e35139533912890217259cf5dbec8d7388733f1a (patch) | |
| tree | 25a01c60ed2f0844f53a4644f17c27c7605fb1f8 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | 3c1342291f1e93c5fb1100f1aa6750db8e293ee4 (diff) | |
DCT2000: Add other NR RRC entry points.
Some of the PDU types needed for SA
were missing in earlier RRC versions.
Change-Id: Ida3b091fe91961cf3cd8e7476692d2467211b5fd
Reviewed-on: https://code.wireshark.org/review/31703
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 5a01987eff..19481247a1 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1029,6 +1029,15 @@ static void dissect_rrc_lte_nr(tvbuff_t *tvb, gint offset, if (lte_or_nr == LTE) { protocol_handle = find_dissector("lte_rrc.ul_ccch"); } + else { + if (tvb_captured_length_remaining(tvb, offset) == 6) { + protocol_handle = find_dissector("nr-rrc.ul.ccch"); + } + else { + /* Should be 8 bytes.. */ + protocol_handle = find_dissector("nr-rrc.ul.ccch1"); + } + } break; default: @@ -1051,11 +1060,17 @@ static void dissect_rrc_lte_nr(tvbuff_t *tvb, gint offset, if (lte_or_nr == LTE) { protocol_handle = find_dissector("lte_rrc.dl_ccch"); } + else { + protocol_handle = find_dissector("nr-rrc.dl.ccch"); + } break; case Channel_PCCH: if (lte_or_nr == LTE) { protocol_handle = find_dissector("lte_rrc.pcch"); } + else { + protocol_handle = find_dissector("nr-rrc.pcch"); + } break; case Channel_BCCH: if (bcch_transport == 1) { @@ -1070,6 +1085,9 @@ static void dissect_rrc_lte_nr(tvbuff_t *tvb, gint offset, if (lte_or_nr == LTE) { protocol_handle = find_dissector("lte_rrc.bcch_dl_sch"); } + else { + protocol_handle = find_dissector("nr-rrc.bcch.dl.sch"); + } } break; |