From ba72f731c3e8cbeb698ec17beecf599c24dea1cc Mon Sep 17 00:00:00 2001 From: Graham Shanks Date: Wed, 21 Feb 2018 22:48:03 +0000 Subject: [PATCH] DIS: move modulation parameters to correct place in tree Move the modulation parameters record in the Transmitter PDU to its correct place in the tree, i.e. under the Transmitter PDU element instead of under the Encryption Key field. Change-Id: I77b379823d5a43bd943ffabac2d9fa050b19abcd Reviewed-on: https://code.wireshark.org/review/25972 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-dis.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index c21ef82d9d..54a10ed33a 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -6597,10 +6597,10 @@ static int dissect_DIS_PARSER_TRANSMITTER_PDU(tvbuff_t *tvb, packet_info *pinfo, switch(systemModulation) { case DIS_SYSTEM_MOD_CCTT_SINCGARS: - offset = dissect_DIS_FIELDS_MOD_PARAMS_CCTT_SINCGARS(tvb, sub_tree, offset); + offset = dissect_DIS_FIELDS_MOD_PARAMS_CCTT_SINCGARS(tvb, tree, offset); break; case DIS_SYSTEM_MOD_JTIDS_MIDS: - offset = dissect_DIS_FIELDS_MOD_PARAMS_JTIDS_MIDS(tvb, sub_tree, offset); + offset = dissect_DIS_FIELDS_MOD_PARAMS_JTIDS_MIDS(tvb, tree, offset); break; default: /* just dump what is available */ proto_tree_add_item(tree, hf_dis_mod_param_dump, tvb, offset, modulationParamLength, ENC_NA);