osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Mathieson 2019-01-23 16:59:46 +00:00
parent 3c1342291f
commit e351395339
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-catapult-dct2000.c
View File

@ -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;