diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2018-12-13 20:34:46 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2018-12-13 21:11:31 +0000 |
| commit | b6e13a3d84af89cb4615f0f69c82db5dc5c2d48b (patch) | |
| tree | e205892ab7b293c5483f03ddb53c1a939fa92352 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | c3eb293048ad1a4c012dc9386a0a9dfb55206a26 (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 6298a3b5ae..74da4c1521 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -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"); + } } } |