aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-atalk.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2016-06-23 17:51:41 +0200
committerAnders Broman <a.broman58@gmail.com>2016-06-26 06:03:14 +0000
commitf8500f39e29b001d609c01f7c265d6458d7f2b15 (patch)
tree7fd2593a2f911238bd05cd7140a111fc0e2fe657 /epan/dissectors/packet-atalk.c
parent46fc6f5d397219889a1355da09573dfbc7d800ac (diff)
conversation: rename shadow variable
Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 Reviewed-on: https://code.wireshark.org/review/16104 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-atalk.c')
-rw-r--r--epan/dissectors/packet-atalk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 3a5ca57dfb..f7b9a23e21 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -746,7 +746,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
if (atp_defragment) {
asp_request_key request_key;
- request_key.conversation = conversation->index;
+ request_key.conversation = conversation->conv_index;
memcpy(request_key.src, (!aspinfo.reply)?pinfo->src.data:pinfo->dst.data, 4);
request_key.seq = aspinfo.seq;
@@ -994,7 +994,7 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo, struct aspinfo *aspinfo)
conversation = find_or_create_conversation(pinfo);
- request_key.conversation = conversation->index;
+ request_key.conversation = conversation->conv_index;
memcpy(request_key.src, (!aspinfo->reply)?pinfo->src.data:pinfo->dst.data, 4);
request_key.seq = aspinfo->seq;