summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-pres.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-pres.c
parent46fc6f5d397219889a1355da09573dfbc7d800ac (diff)
downloadwireshark-f8500f39e29b001d609c01f7c265d6458d7f2b15.tar.gz
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-pres.c')
-rw-r--r--epan/dissectors/packet-pres.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index 5d028d625e..8fce786f18 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -277,7 +277,7 @@ register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, const char *oid)
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
if (conversation) {
- pco->idx = conversation->index;
+ pco->idx = conversation->conv_index;
} else {
pco->idx = 0;
}
@@ -318,7 +318,7 @@ find_oid_by_pres_ctx_id(packet_info *pinfo, guint32 idx)
conversation=find_conversation (pinfo->num, &pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
if (conversation) {
- pco.idx = conversation->index;
+ pco.idx = conversation->conv_index;
} else {
pco.idx = 0;
}