diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-06-23 17:51:41 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-26 06:03:14 +0000 |
| commit | f8500f39e29b001d609c01f7c265d6458d7f2b15 (patch) | |
| tree | 7fd2593a2f911238bd05cd7140a111fc0e2fe657 /epan/dissectors/packet-enip.c | |
| parent | 46fc6f5d397219889a1355da09573dfbc7d800ac (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-enip.c')
| -rw-r--r-- | epan/dissectors/packet-enip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index dce48f2275..7278233580 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -2278,7 +2278,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, */ request_key->session_handle = GPOINTER_TO_UINT(conversation); request_key->sender_context = trans_id; - request_key->conversation = conversation->index; + request_key->conversation = conversation->conv_index; } @@ -2713,7 +2713,7 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data request_key.type = EPDT_UNKNOWN; request_key.session_handle = tvb_get_letohl( tvb, 4 ); request_key.sender_context = tvb_get_letoh64( tvb, 12 ); - request_key.conversation = conversation->index; + request_key.conversation = conversation->conv_index; encap_data_length = tvb_get_letohs( tvb, 2 ); enip_tree = NULL; |