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

DCT2000: Call nas-5gs dissector 

Change-Id: Iddca3571097210a7a0e090b506538bbf8ec64c07
Reviewed-on: https://code.wireshark.org/review/31040
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
This commit is contained in:
Martin Mathieson 2018-12-13 20:34:46 +00:00
parent c3eb293048
commit b6e13a3d84
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2375,7 +2375,8 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
else if ((strcmp(protocol_name, "nas_rrc_r8_lte") == 0) ||
(strcmp(protocol_name, "nas_rrc_r9_lte") == 0) ||
(strcmp(protocol_name, "nas_rrc_r10_lte") == 0) ||
(strcmp(protocol_name, "nas_rrc_r13_lte") == 0)) {
(strcmp(protocol_name, "nas_rrc_r13_lte") == 0) ||
(strcmp(protocol_name, "nas_rrc_r15_5gnr") == 0)) {
gboolean nas_body_found = TRUE;
guint8 opcode = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_catapult_dct2000_lte_nas_rrc_opcode,
@ -2430,10 +2431,15 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
break;
}
/* Look up dissector if if looks right */
/* Look up dissector if it looks right */
if (nas_body_found) {
offset += 2; /* L3 tag + len */
protocol_handle = find_dissector("nas-eps");
if (strcmp(protocol_name, "nas_rrc_r15_5gnr") == 0) {
protocol_handle = find_dissector("nas-5gs");
}
else {
protocol_handle = find_dissector("nas-eps");
}
}
}