From f8500f39e29b001d609c01f7c265d6458d7f2b15 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Thu, 23 Jun 2016 17:51:41 +0200 Subject: conversation: rename shadow variable Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 Reviewed-on: https://code.wireshark.org/review/16104 Reviewed-by: Anders Broman --- epan/dissectors/packet-dcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-dcm.c') diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 612e36163e..587d36e9c3 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6682,7 +6682,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ DISSECTOR_ASSERT(conv); - reassembly_id = (((conv->index) & 0x00FFFFFF) << 8) + pdv->pctx_id; + reassembly_id = (((conv->conv_index) & 0x00FFFFFF) << 8) + pdv->pctx_id; head = fragment_add_seq_next(&dcm_pdv_reassembly_table, tvb, offset, pinfo, reassembly_id, NULL, -- cgit v1.2.3